Browse Source

提交下单页面

caojunjie 4 years ago
parent
commit
97fb6df254

BIN
src/assets/noShipping.png


+ 1 - 1
src/router/index.js

@@ -48,7 +48,7 @@ export default new Router({
       }
     },{
       path: '/contractPlacing/index',
-      name: 'contractPlacing',
+      name: '/contractPlacing/index',
       component: () => import(/* webpackChunkName: "about" */ '../views/contractPlacing/index'),
       meta: {
         keepAlive: true,

File diff suppressed because it is too large
+ 588 - 221
src/views/contractPlacing/index.vue


+ 70 - 40
src/views/inquiryAndOrder/index.vue

@@ -16,7 +16,7 @@
       </el-menu>
     </div>
     <div class="outermost">
-      <div v-if="selection === '1'">
+      <div v-if="activeIndex2 === '1'">
         <el-input placeholder="请输入发货地址">
           <template slot="prepend">发货地址</template>
           <el-button slot="append" icon="el-icon-d-caret" @click="whether = !whether">
@@ -41,7 +41,7 @@
         <button style="width: 400px;height: 0;border: none;padding: 0;"></button>
         <button style="width: 400px;height: 0;border: none;padding: 0;"></button>
       </div>
-      <div v-if="selection === '2'">
+      <div v-if="activeIndex2 === '2'">
         <el-input placeholder="请输入发货地址">
           <template slot="prepend">发货地址</template>
           <el-button slot="append" icon="el-icon-d-caret" @click="whether = !whether">
@@ -63,7 +63,7 @@
         <button style="width: 400px;height: 0;border: none;padding: 0;"></button>
         <button style="width: 400px;height: 0;border: none;padding: 0;"></button>
       </div>
-      <div v-if="selection === '3'">
+      <div v-if="activeIndex2 === '3'">
         <el-input placeholder="请输入起运港口">
           <template slot="prepend">起运港口</template>
         </el-input>
@@ -85,9 +85,12 @@
         <button style="width: 400px;height: 0;border: none;padding: 0;"></button>
         <button style="width: 400px;height: 0;border: none;padding: 0;"></button>
       </div>
-      <div v-if="selection === '4'">
+      <div v-if="activeIndex2 === '4'">
         <div style="width: 400px;align-items: center;display: flex;">
-          <el-button disabled style="border: 1px solid #DCDFE6;color:#95989d;background-color: #f5f7fa;border-top-right-radius:0;border-bottom-right-radius:0">起运港口</el-button>
+          <el-button disabled
+                     style="border: 1px solid #DCDFE6;color:#95989d;background-color: #f5f7fa;border-top-right-radius:0;border-bottom-right-radius:0">
+            起运港口
+          </el-button>
           <el-select
             v-model="portToPort.fPortofloadid"
             filterable
@@ -110,15 +113,17 @@
         </div>
 
         <div style="width: 400px;align-items: center;display: flex;">
-          <el-button disabled style="border: 1px solid #DCDFE6;color:#95989d;background-color: #f5f7fa;border-top-right-radius:0;border-bottom-right-radius:0">目的港口</el-button>
+          <el-button disabled
+                     style="border: 1px solid #DCDFE6;color:#95989d;background-color: #f5f7fa;border-top-right-radius:0;border-bottom-right-radius:0">
+            目的港口
+          </el-button>
           <el-select
-            v-model="portToPort.fPortofloadid"
+            v-model="portToPort.fDistinationid"
             filterable
             remote
             @change="handleQuery"
             style="width: 100%;"
             class="elSelect"
-            :remote-method="handleQuery"
             placeholder="请输入模糊查找目的港口"
           >
             <el-scrollbar>
@@ -131,9 +136,9 @@
             </el-scrollbar>
           </el-select>
         </div>
-<!--        <el-input placeholder="请输入目的港口" v-model="portToPort.fDistinationid">-->
-<!--          <template slot="prepend">目的港口</template>-->
-<!--        </el-input>-->
+        <!--        <el-input placeholder="请输入目的港口" v-model="portToPort.fDistinationid">-->
+        <!--          <template slot="prepend">目的港口</template>-->
+        <!--        </el-input>-->
         <el-input placeholder="请输入货物名称">
           <template slot="prepend">货物名称</template>
         </el-input>
@@ -144,7 +149,9 @@
         <button class="stealthbutton"></button>
       </div>
       <div>
-        <el-button type="primary" v-if="activeIndex2 === '1'||activeIndex2 === '2'||activeIndex2 === '3'" disabled>船期查询</el-button>
+        <el-button type="primary" v-if="activeIndex2 === '1'||activeIndex2 === '2'||activeIndex2 === '3'" disabled>
+          船期查询
+        </el-button>
         <el-button type="primary" @click="schedule" v-else>船期查询</el-button>
       </div>
       <el-divider>查询船期</el-divider>
@@ -154,11 +161,11 @@
       </div>
       <div style="width: 100%;" v-for="(item,index) in detailedList" :key="index">
         <div
-             style="width: 100%;padding: 10px;margin-left: -10px;display: flex;justify-content: space-around;border: 1px solid #E8E8E8;box-shadow: 0 2px 7px 0 rgba(71,71,71,.2);">
+          style="width: 100%;padding: 10px;margin-left: -10px;display: flex;justify-content: space-around;border: 1px solid #E8E8E8;box-shadow: 0 2px 7px 0 rgba(71,71,71,.2);">
           <div style="width: 50%;line-height: 40px;">
             <div
               style="background-color: #f10724;width: 80px;margin-top: 15px;margin-right: 5px;margin-left: 5px;height: 30px;line-height: 30px;border-radius: 20px;color: #ffffff;float: left">
-              {{item.portofloadidName}}
+              {{ item.portofloadidName }}
             </div>
             <div style="width: 40px;height: 60px;float: left">
               <div style="width: 100%;height: 30px;">
@@ -170,7 +177,7 @@
             </div>
             <div
               style="background-color: #f10724;width: 80px;margin-top: 15px;margin-right: 5px;margin-left: 5px;height: 30px;line-height: 30px;border-radius: 20px;color: #ffffff;float: left">
-              {{item.portoftransshipmentName}}
+              {{ item.portoftransshipmentName }}
             </div>
             <div style="width: 40px;height: 60px;float: left">
               <div style="width: 100%;height: 30px;">
@@ -182,17 +189,17 @@
             </div>
             <div
               style="background-color: #f10724;width: 80px;margin-top: 15px;margin-right: 5px;margin-left: 5px;height: 30px;line-height: 30px;border-radius: 20px;color: #ffffff;float: left">
-              {{item.portofdischargeidName}}
+              {{ item.portofdischargeidName }}
             </div>
           </div>
           <div
             style="width: 25%;margin: 0 auto;display: flex;align-items: center;justify-content: center;border-left: 1px solid #E8E8E8">
             <div>
               <span style="color: #999999">全程运输时长:</span>
-              <span style="font-weight:bold">{{item.fDays}}天</span>
+              <span style="font-weight:bold">{{ item.fDays }}天</span>
               <br>
               <span style="color: #999999">单证有效时间:</span>
-              <span style="font-weight:bold">{{item.closing}}天</span>
+              <span style="font-weight:bold">{{ item.closing }}天</span>
             </div>
           </div>
           <div style="width: 30%;border-left: 1px solid #E8E8E8;display:flex;justify-content: space-around">
@@ -200,7 +207,7 @@
               <div>20GP</div>
               <div style="color:#bc1920 ">
                 <span>¥</span>
-                <span style="font-size: 20px;">{{item.twenty}}</span>
+                <span style="font-size: 20px;">{{ item.twenty }}</span>
                 <span>起</span>
               </div>
             </div>
@@ -222,12 +229,14 @@
             </div>
           </div>
           <div class="query">
-            <el-button type="primary" @click="item.introduction = !item.introduction">{{item.introduction === false?'查看船期':'关闭列表'}}</el-button>
+            <el-button type="primary" @click="item.introduction = !item.introduction">
+              {{ item.introduction === false ? '查看船期' : '关闭列表' }}
+            </el-button>
           </div>
         </div>
         <div style="width: 98%;background-color: #99a9bf;margin: 0 auto" v-if="item.introduction === true">
           <div style="float: left;padding: 5px;color:#ffffff;">
-            <span>{{item.portofloadidName}}</span>
+            <span>{{ item.portofloadidName }}</span>
             <span>{{ item.portofdischargeidName }}</span>
           </div>
@@ -267,7 +276,7 @@
               </el-table-column>
               <el-table-column
                 label="操作">
-                <el-button type="primary">订舱</el-button>
+                <el-button type="primary" @click="placeAnOrder">订舱</el-button>
               </el-table-column>
             </el-table>
           </div>
@@ -285,14 +294,14 @@ export default {
   name: 'inquiryAndOrder',
   data() {
     return {
-      fMblnoOptions:[],
-      portToPort:{
-        fPortofloadid:'',
-        fDistinationid:'',
-        fEta:'',
-        portofloadidName:''
+      fMblnoOptions: [],
+      portToPort: {
+        fPortofloadid: '',
+        fDistinationid: '',
+        fEta: '',
+        portofloadidName: ''
       },
-      detailedList:[],
+      detailedList: [],
       value1: '',
       selection: '1',
       whether: false,
@@ -304,18 +313,18 @@ export default {
         region: '',
         type: ''
       },
-      list:[],
+      list: [],
       tableData: []
     };
   },
   methods: {
     handleSelect(key, keyPath) {
       this.whether = false;
-      this.activeIndex2 = key
+      this.activeIndex2 = key;
       console.log(key, keyPath);
       this.selection = key;
     },
-    schedule(){
+    schedule() {
       console.log(this.detailedList);
       // v-if="selection === '1'"
       // switch (this.selection){
@@ -330,22 +339,43 @@ export default {
       //   default:
       //     break
       // }
+      request({
+        url: '/shipping/voyage/freightList',
+        method: 'get',
+        params: this.portToPort
+      }).then(res => {
+          // console.log(res);
+          this.detailedList = [];
+          this.list = res.data.rows;
+          res.data.rows.map(((item, index) => {
+            this.detailedList.push(Object.assign({}, item, { introduction: false }));
+          }));
+          // console.log(this.detailedList);
+        })
+        .catch(err => {
+          console.log(err);
+        });
     },
-    handleQuery(){
+    placeAnOrder(){
+      this.$router.push({ path: '/contractPlacing/index'});
+    },
+    handleQuery() {
       // this.fMblnoOptions
       request({
         url: '/shipping/address/selectPortName',
         method: 'get',
         params: {
-          fName:this.portToPort.fPortofloadid
+          fName: this.portToPort.fPortofloadid
         }
-      }).then(res => {
-        console.log(res);
-        this.fMblnoOptions = res.data.rows
-        console.log(this.fMblnoOptions);
-      }).catch(err => {
-        console.log(err);
       })
+        .then(res => {
+          console.log(res);
+          this.fMblnoOptions = res.data.rows;
+          console.log(this.fMblnoOptions);
+        })
+        .catch(err => {
+          console.log(err);
+        });
     }
   }
 };

+ 67 - 34
src/views/management/myorder.vue

@@ -36,7 +36,8 @@
         </el-menu-item>
       </el-menu>
     </div>
-    <div style="width: 80%;border: 1px solid #f7f7f7;background: #FFFFFF;box-shadow: 0px 4px 13px 0px rgba(200, 200, 200, 0.44);margin-bottom: 20px">
+    <div
+      style="width: 80%;border: 1px solid #f7f7f7;background: #FFFFFF;box-shadow: 0px 4px 13px 0px rgba(200, 200, 200, 0.44);margin-bottom: 20px">
       <el-menu
         :default-active="activeIndex"
         class="el-menu-demo"
@@ -55,13 +56,13 @@
       </el-menu>
       <div style="width: 100%;display:flex;justify-content: space-around;">
         <div style="width: 20%;">
-          <el-input placeholder="订舱单"></el-input>
-          <el-input placeholder="船名"></el-input>
-          <el-input placeholder="箱号"></el-input>
+          <el-input placeholder="订舱单" v-model="filterAll.fBillno"></el-input>
+          <el-input placeholder="船名" v-model="filterAll.vslidName"></el-input>
+          <el-input placeholder="箱号" v-model="filterAll.boxNumber"></el-input>
         </div>
         <div style="width: 20%;">
-          <el-input placeholder="收货人"></el-input>
-          <el-input placeholder="航次"></el-input>
+          <el-input placeholder="收货人" v-model="filterAll.fConsigneername"></el-input>
+          <el-input placeholder="航次" v-model="filterAll.voyidName"></el-input>
           <el-input placeholder="条数"></el-input>
         </div>
         <div style="width: 50%;">
@@ -71,9 +72,9 @@
             <el-input placeholder="目的港" style="width: 45%;"></el-input>
           </div>
           <div style="display:flex;justify-content: space-between;">
-            <el-input placeholder="创建开始时间" style="width: 45%;"></el-input>
+            <el-input placeholder="创建开始时间" style="width: 45%;" v-model="filterAll.startTime"></el-input>
             <span style="margin-top: 20px">至</span>
-            <el-input placeholder="创建结束时间" style="width: 45%;"></el-input>
+            <el-input placeholder="创建结束时间" style="width: 45%;" v-model="filterAll.endTime"></el-input>
           </div>
           <div style="display:flex;justify-content: space-between;">
             <el-input placeholder="单据有效期结束" style="width: 45%;"></el-input>
@@ -83,7 +84,9 @@
         </div>
       </div>
       <div style="width: 100%;display:flex;justify-content: space-between;">
-        <div style="display: flex;align-items: center;padding-left: 20px"><el-checkbox v-model="checked">全选</el-checkbox></div>
+        <div style="display: flex;align-items: center;padding-left: 20px">
+          <!--          <el-checkbox v-model="checked">全选</el-checkbox>-->
+        </div>
         <div style="margin-right: 20px">
           <el-button type="success" plain>装箱单下载</el-button>
           <el-dropdown>
@@ -113,57 +116,87 @@
               <el-dropdown-item>虎门提重</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
-          <el-button type="primary" icon="el-icon-search">查询</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
         </div>
       </div>
-      <div style="margin-top: 20px;background: #FFFFFF;box-shadow: 0px 4px 13px 0px rgba(200, 200, 200, 0.44);padding-top: 20px;">
+      <div
+        style="margin-top: 20px;background: #FFFFFF;box-shadow: 0px 4px 13px 0px rgba(200, 200, 200, 0.44);padding-top: 20px;"
+        v-for="(item,index) in dataList" :key="index">
         <div style="left: 10px;display: flex;justify-content: space-between;border-bottom: 2px solid #EEEFEE;">
           <div style="display: flex;padding-left:10px;">
             <!-- `checked` 为 true 或 false -->
-            <el-checkbox v-model="checked" style="margin-top: -8px">
-              <span>单箱合计:</span>
-              <span>1990元</span>
-            </el-checkbox>
+            <!--            <el-checkbox v-model="checked" style="margin-top: -8px">-->
+            <!--            </el-checkbox>-->
+            <span style="margin-top: -14px">单箱合计:<span>0元</span></span>
           </div>
           <div style="display: flex;flex-direction: column;align-items: flex-end;margin-right: -10px">
-            <div style="width:100px;background-color: red;height:30px;line-height: 30px;color: #fff;border-radius: 50px 0 0 50px;margin-top: -20px">已驳回</div>
-            <div style="width: 0px;height: 0px;border-color: #DA0000 white white #DA0000;border-width: 4px 4px 4px 4px;border-style: solid;margin-top:-2px"></div>
+            <div
+              style="width:100px;background-color: red;height:30px;line-height: 30px;color: #fff;border-radius: 50px 0 0 50px;margin-top: -20px">
+              已驳回
+            </div>
+            <div
+              style="width: 0px;height: 0px;border-color: #DA0000 white white #DA0000;border-width: 4px 4px 4px 4px;border-style: solid;margin-top:-2px"></div>
           </div>
         </div>
         <div style="display:flex;">
-          <div style="width:85%;padding-left:20px;display: flex;justify-content: space-around;flex-wrap: wrap;text-align: left;border-right:2px solid #EEEFEE ">
-            <p style="width:25%"><span>订舱号:</span><span>111111</span></p>
-            <p style="width:25%"><span>石英石:</span><span>1111</span></p>
-            <p style="width:25%"><span>运输条款:</span><span>1111</span></p>
-            <p style="width:25%"><span>收货人:</span><span>111</span></p>
-            <p style="width:25%"><span>航线:</span><span>111</span></p>
-            <p style="width:25%"><span>箱型:</span><span>111</span></p>
-            <p style="width:25%"><span>箱量:</span><span>111</span></p>
-            <p style="width:25%"><span>装货时间:</span><span>111</span></p>
+          <div
+            style="width:85%;padding-left:20px;display: flex;justify-content: space-around;flex-wrap: wrap;text-align: left;border-right:2px solid #EEEFEE ">
+            <p style="width:25%"><span>订舱号:</span><span>{{ item.fBillno }}</span></p>
+            <p style="width:25%"><span>提单号:</span><span>{{ item.fMblno }}</span></p>
+            <p style="width:25%"><span>运输条款:</span><span>{{ item.fServiceitems }}</span></p>
+            <p style="width:25%"><span>收货人:</span><span>{{ item.fConsigneername }}</span></p>
+            <p style="width:25%"><span>航线:</span><span>{{ item.fName }}</span></p>
+            <p style="width:25%"><span>箱型:</span><span>{{ item.fNo }}</span></p>
+            <p style="width:25%"><span>箱量:</span><span>{{ item.fCntrcount }}</span></p>
+            <p style="width:25%"><span>装货时间:</span><span>{{ item.fBsdate }}</span></p>
           </div>
-          <div style="width:15%;display:flex;flex-direction: column;align-items: center;margin-top: 20px">
-            <el-button type="info" size="small" style="width:80%; margin-left: 4px">详情</el-button>
-            <el-button type="primary" size="small" style="width:80%;margin: 10px 0 0 4px">再来一单</el-button>
+          <div style="width:15%;display:flex;flex-direction: column;align-items: center;margin-top: 40px">
+            <el-button type="primary" size="small" style="width:80%; margin-left: 4px" @click="details(item.fId)">详情
+            </el-button>
+<!--            <el-button type="primary" size="small" style="width:80%;margin: 10px 0 0 4px">再来一单</el-button>-->
           </div>
         </div>
       </div>
-
-
-
     </div>
   </div>
 </template>
 
 <script>
+import { request } from '../../request/request';
+
 export default {
   name: 'myorder',
   data() {
     return {
       activeIndex: '1',
-      checked:true,
+      checked: true,
+      filterAll: {},
+      dataList: []
     };
   },
   methods: {
+    getList() {
+      request({
+        url: '/khwarehouse/warehousebills/webVersionOrderMessage',
+        method: 'post',
+        data: this.filterAll
+      })
+        .then(res => {
+          console.log(res);
+          this.dataList = res.data.rows;
+        })
+        .catch(err => {
+          console.log(err);
+        });
+    },
+    details(fId) {
+      // console.log(fId);
+      // this.$router.push({ path: '/contractPlacing/index', query: { userId: fId } });
+      this.$router.push({
+        path: '/contractPlacing/index',
+        query: { data:JSON.stringify(fId) },
+      });
+    },
     handleSelect(key, keyPath) {
       console.log(key, keyPath);
     },
@@ -178,7 +211,7 @@ export default {
 </script>
 
 <style scoped>
-.el-input{
+.el-input {
   margin: 10px auto;
 }
 </style>

+ 1 - 1
src/views/navigation/navigation.vue

@@ -9,7 +9,7 @@
       <el-menu-item index="/">首页</el-menu-item>
       <el-submenu index="2">
         <template slot="title">我要下单</template>
-        <el-menu-item index="/contractPlacing/index">合约下单</el-menu-item>
+        <el-menu-item index="2-1">合约下单</el-menu-item>
         <el-menu-item index="/inquiryAndOrder">查询下单</el-menu-item>
       </el-submenu>
       <el-submenu index="3">

Some files were not shown because too many files changed in this diff