Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/router/index.js

@@ -284,24 +284,24 @@ export const constantRoutes = [
     ]
   },
   {
-    path: '/box',
+    path: '/boxSea',
     component: Layout,
     hidden: true,
     redirect: 'noredirect',
     children: [
-      {
+      /* {
         path: 'query/:boxId(\\d+)',
         component: (resolve) => import('@/views/ecw/box/query'),
         props: true,
         name: 'boxQuery',
         meta: {title: '出货详情', icon: '', activeMenu: '/shipment/box'}
-      },
+      }, */
       {
         path: 'shippingSea/:boxId(\\d+)',
         component: (resolve) => import('@/views/ecw/box/shipping/shippingSea'),
         props: true,
         name: 'shippingSea',
-        meta: {title: '海运出货操作', icon: '', activeMenu: '/shipment/box'}
+        meta: {title: '海运出货操作', icon: '', activeMenu: '/shipment/boxSea'}
       }
     ]
   },

src/views/ecw/box/index.vue → src/views/ecw/box/indexSeaAir.vue

@@ -3,8 +3,8 @@
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="自编号" prop="orderNo">
-        <el-input v-model="queryParams.orderNo" placeholder="请输入自编号" clearable @keyup.enter.native="handleQuery"/>
+      <el-form-item label="自编号" prop="selfNo">
+        <el-input v-model="queryParams.selfNo" placeholder="请输入自编号" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="柜号" prop="cubNo">
         <el-input v-model="queryParams.cubNo" placeholder="请输入柜号" clearable @keyup.enter.native="handleQuery"/>
@@ -17,13 +17,13 @@
 
       <el-form-item label="始发地" prop="startWarehouseId">
         <el-select v-model="queryParams.startWarehouseId" placeholder="请选择始发地">
-          <el-option v-for="item in expoerCityList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
+          <el-option v-for="item in exportWarehouseList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
         </el-select>
       </el-form-item>
 
       <el-form-item label="目的地" prop="destWarehouseId">
         <el-select v-model="queryParams.destWarehouseId" placeholder="请选择目的地">
-          <el-option v-for="item in importCityList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
+          <el-option v-for="item in importWarehouseList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
         </el-select>
       </el-form-item>
 
@@ -45,14 +45,6 @@
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
-      
-      
-      <el-form-item label="运输方式" prop="transportType">
-        <el-select v-model="queryParams.transportType" placeholder="请选择运输方式" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.ECW_TRANSPORT_TYPE)"
-                     :key="dict.value" :label="dict.label" :value="dict.value"/>
-        </el-select>
-      </el-form-item>
 
       
       <el-form-item>
@@ -79,7 +71,7 @@
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="自编号" align="center" prop="orderNo"/>
+      <el-table-column label="自编号" align="center" prop="selfNo"/>
       <el-table-column label="柜号" align="center" prop="cubNo"/>
       <el-table-column label="柜型" align="center" prop="cabinetId">
         <template slot-scope="scope">
@@ -126,8 +118,6 @@
             </el-button>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="edit">编辑</el-dropdown-item>
-              <el-dropdown-item command="sea">操作-海运</el-dropdown-item>
-              <el-dropdown-item command="air">操作-空运</el-dropdown-item>
               <el-dropdown-item command="seaAir">操作-海空联运</el-dropdown-item>
               <el-dropdown-item command="error">异常登记</el-dropdown-item>
               <el-dropdown-item command="cost">费用登记</el-dropdown-item>
@@ -145,19 +135,13 @@
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 
-        <el-form-item label="运输方式" prop="transportType">
-          <el-radio-group v-model="form.transportType" @change="changeTransportType">
-              <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.ECW_TRANSPORT_TYPE)" :key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-
-        <el-form-item label="出货渠道" prop="shippingChannelId" v-if="form.transportType === 3 || form.transportType === 4">
+        <el-form-item label="出货渠道" prop="shippingChannelId">
           <el-select v-model="form.shippingChannelId" placeholder="请选择出货渠道">
             <el-option v-for="item in channelList" :label="item.nameZh" :value="item.channelId" :key="item.channelId"></el-option>
           </el-select>
         </el-form-item>
 
-        <el-form-item label="柜型" prop="cabinetId" v-if="form.transportType !== 3">
+        <el-form-item label="柜型" prop="cabinetId">
           <el-select v-model="form.cabinetId" placeholder="请选择柜型">
             <el-option v-for="item in cabinetList" :label="item.name" :value="item.id" :key="item.id"></el-option>
           </el-select>
@@ -165,13 +149,13 @@
 
         <el-form-item label="始发地" prop="startWarehouseId">
           <el-select v-model="form.startWarehouseId" placeholder="请选择始发地">
-            <el-option v-for="item in expoerCityList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
+            <el-option v-for="item in exportWarehouseList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
           </el-select>
         </el-form-item>
 
         <el-form-item label="目的地" prop="destWarehouseId">
           <el-select v-model="form.destWarehouseId" placeholder="请选择目的地">
-            <el-option v-for="item in importCityList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
+            <el-option v-for="item in importWarehouseList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
           </el-select>
         </el-form-item>
         
@@ -186,9 +170,9 @@
 
 <script>
   import {createbox, updatebox, deletebox, getbox, getboxPage, exportboxExcel} from "@/api/ecw/box";
-  import {getTradeCityList} from '@/api/ecw/region';
   import {getCabinetPage} from "@/api/ecw/cabinet";
   import { getChannelList } from '@/api/ecw/channel';
+  import { getWarehouseList } from "@/api/ecw/warehouse"
 
   export default {
     name: "box",
@@ -196,7 +180,7 @@
     data() {
       return {
         dateTypes:[
-          {value:'1', label:'预装时间/分拣时间'},
+          {value:'1', label:'预装时间'},
           {value:'2', label:'装柜时间'},
           {value:'3', label:'起运时间'},
           {value:'4', label:'到港时间'},
@@ -225,7 +209,7 @@
           pageNo: 1,
           pageSize: 10,
           id: null,
-          orderNo: null,
+          selfNo: null,
           cubNo: null,
           cabinetId: null,
           boxStatus: null,
@@ -233,14 +217,15 @@
           destWarehouseId: null,
           transportType: null,
         },
-        tradeCityList: [],
         cabinetList:[],
         channelList:[],
+        warehouseList: [],
         // 表单参数
         form: {},
         // 表单校验
         rules: {
-          transportType: [{ required: true, message: "运输方式不能为空", trigger: "blur" }],
+          shippingChannelId: [{ required: true, message: "出货渠道不能为空", trigger: "blur" }],
+          cabinetId: [{ required: true, message: "柜型不能为空", trigger: "blur" }],
           startWarehouseId: [{ required: true, message: "始发地不能为空", trigger: "blur" }],
           destWarehouseId: [{ required: true, message: "目的地不能为空", trigger: "blur" }],
 
@@ -248,11 +233,11 @@
       };
     },
     computed: {
-      expoerCityList() {
-        return this.tradeCityList.filter(item => item.type == 2 || item.type == 3)
+      exportWarehouseList() {
+        return this.warehouseList.filter(item => item.tradeType == '2' || item.type == '3')
       },
-      importCityList() {
-        return this.tradeCityList.filter(item => item.type == 1 || item.type == 3)
+      importWarehouseList() {
+        return this.warehouseList.filter(item => item.tradeType == '1' || item.type == '3')
       },
 
       getCabinetName() {
@@ -281,7 +266,7 @@
 
     },
     created() {
-      getTradeCityList().then(res => this.tradeCityList = res.data);
+      getWarehouseList().then(res => this.warehouseList = res.data);
       getCabinetPage(null).then(response => {
         this.cabinetList = response.data.list;
       });
@@ -293,19 +278,13 @@
         getChannelList().then(res => this.channelList = res.data)
       },
 
-      changeTransportType(value) {
-        if(value === 3) {
-          this.form.cabinetId = null;
-        } else if(value == 1 || value == 2) {
-          this.form.shippingChannelId = null;
-        }
-      },
 
       /** 查询列表 */
       getList() {
         this.loading = true;
         // 处理查询参数
         let params = {...this.queryParams};
+        params.transportType = 4;
         this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
         // 执行查询
         getboxPage(params).then(response => {
@@ -364,19 +343,7 @@
             return;
           }
 
-        if(this.form.transportType != 3) {
-          if(!this.form.cabinetId) {
-            this.$message.error('柜型不能为空');
-            return;
-          }
-        }
-
-        if(this.form.transportType == 3 || this.form.transportType == 4) {
-          if(!this.form.shippingChannelId) {
-            this.$message.error('出货渠道不能为空');
-            return;
-          }
-        }
+          this.form.transportType = 4;
 
           // 修改的提交
           if (this.form.id != null) {
@@ -425,11 +392,18 @@
       },
       /** 查看按钮操作 */
       handleCommand(row, command) {
-        console.log(row, command)
         switch (command) {
           case 'sea':
             this.$router.push('/box/shippingSea/' + row.id)
             break;
+
+          case 'edit':
+            this.handleUpdate(row);
+            break;
+
+          case 'delete':
+            this.handleDelete(row);
+            break;
         }
       },
     }

src/views/ecw/box/shipping/booking.vue

+<template>
+  <el-form ref="bookingForm" :rules="rules" :model="booking" label-width="120px" class="booking-form">
+    <el-form-item label="SO NO">
+      <el-input v-model="booking.soNo"></el-input>
+    </el-form-item>
+    <el-form-item label="船公司类型">
+      <el-select v-model="booking.type" placeholder="请选择船公司类型">
+        <el-option v-for="type in types" :key="type" :label="type" :value="type"></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="驳船港">
+      <el-select v-model="booking.bargePort" placeholder="请选择驳船港">
+        <el-option v-for="type in types" :key="type" :label="type" :value="type"></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="大船港">
+      <el-select v-model="booking.bigShipPort" placeholder="请选择大船港">
+        <el-option v-for="type in types" :key="type" :label="type" :value="type"></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="目的港">
+      <el-select v-model="booking.destination" placeholder="请选择目的港">
+        <el-option v-for="type in types" :key="type" :label="type" :value="type"></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="订舱公司">
+      <el-select v-model="booking.bookingCompany" placeholder="请选择订舱公司">
+        <el-option v-for="type in types" :key="type" :label="type" :value="type"></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="预计驳船时间" prop="time">
+      <el-date-picker type="date" placeholder="请选择日期" v-model="booking.bargeTime"></el-date-picker>
+    </el-form-item>
+    <el-form-item label="预计开船时间" prop="time">
+      <el-date-picker type="date" placeholder="请选择日期" v-model="booking.departureTime"></el-date-picker>
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" @click="onSubmit">提交</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+export default {
+  name: "booking",
+  data() {
+    return {
+      types: ["PIL", "MSK", "CMA", "COSCO", "ZIM", "ONE", "OOCL", "MSC", "HPL"],
+      booking: {},
+      rules: {
+        time: [{ required: true, message: "请选择时间", trigger: "change" }],
+      },
+    };
+  },
+  methods: {
+    onSubmit() {
+      this.$refs["bookingForm"].validate((valid) => {
+        if (valid) {
+          alert("submit!");
+        }
+      });
+    },
+    cancel() {
+      this.$emit("closeDialog");
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.booking-form {
+  .el-form-item__content {
+    > div {
+      width: 100%;
+    }
+  }
+}
+</style>

src/views/ecw/box/shipping/flowChart.vue

 <template>
-  <el-scrollbar :vertical="true">
-    <section class="shipping-chart">
+  <div>
+    <el-scrollbar :vertical="true" style="width: 100%;" viewClass="shipping-chart">
       <div v-for="(nodes,index) in chartData['sea']" :key="index" class="chart-nodes">
         <div>
           <div v-for="node in nodes" :key="node.title" @click="nodeClick(node)" class="node-div">
-            <img :src="node.imgSrc" alt="">
-            <p>{{node.title}}</p>
+            <template v-if="!node.unNode">
+              <img :src="node.imgSrc" alt="">
+              <p>{{node.title}}</p>
+            </template>
+            <template v-else-if="node.unNode">
+              <el-button type="primary">AGENT</el-button>
+            </template>
           </div>
         </div>
         <div class="chart-arrow" v-if="index !== (chartData['sea'].length-1)">
-          <p>箭头</p>
+          <img src="@/assets/images/shipping/jt-start.png" alt="">
         </div>
       </div>
-    </section>
-  </el-scrollbar>
+    </el-scrollbar>
+    <el-dialog :title="title" :visible.sync="dialogVisible" width="30%" destroy-on-close>
+      <booking @closeDialog="closeDialog" v-if="type === 'booking'" />
+      <trailer @closeDialog="closeDialog" v-if="type === 'trailer'" />
+    </el-dialog>
+  </div>
+
 </template>
 
 <script>
+import booking from "./booking";
+import trailer from "./trailer";
+
 export default {
   name: "flowChart",
+  components: { booking, trailer },
   props: {
     shippingType: String,
   },
   data() {
     return {
+      dialogVisible: false,
+      title: "",
+      type: "",
       chartData: {
         sea: [
           [
@@ -44,6 +61,10 @@ export default {
               imgSrc: require("@/assets/images/shipping/tc-start.png"),
               type: "trailer",
             },
+            {
+              unNode: true,
+              agent: true,
+            },
           ],
           [
             {
@@ -116,7 +137,6 @@ export default {
               title: "结算",
               imgSrc: require("@/assets/images/shipping/js-start.png"),
               type: "settlement",
-              isEnd: true,
             },
           ],
         ],
@@ -124,30 +144,46 @@ export default {
     };
   },
   methods: {
+    closeDialog() {
+      this.dialogVisible = false;
+    },
     nodeClick(node) {
       console.log(node);
+      switch (node.type) {
+        case "booking":
+        case "trailer":
+          this.dialogVisible = true;
+          this.title = node.title;
+          this.type = node.type;
+          break;
+      }
     },
   },
 };
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 .shipping-chart {
+  width: max-content;
   display: flex;
   justify-content: center;
+  margin: 10px;
   .chart-nodes {
-    p {
-      margin: 0;
-      text-align: center;
-    }
     display: flex;
     align-items: center;
     justify-content: center;
     .node-div {
+      margin-top: 10px;
       cursor: pointer;
+      p {
+        margin-top: -10px;
+        margin-bottom: 0px;
+        text-align: center;
+      }
     }
   }
   .chart-arrow {
+    // margin: -15px 10px 0px 10px;
     margin: 0 10px;
   }
 }

src/views/ecw/box/shipping/shippingSea.vue

@@ -39,6 +39,6 @@ export default {
 
 <style lang="scss" scoped>
 .shipping-flow {
-  margin-top: 15px;
+  margin-top: 5px;
 }
 </style>

src/views/ecw/box/shipping/trailer.vue

+<template>
+  <el-form ref="trailerForm" :rules="rules" :model="trailer" label-width="120px" class="trailer-form">
+    <el-form-item label="状态">
+      <el-select v-model="trailer.status" placeholder="请选择状态">
+        <el-option v-for="item in status" :key="item.value" :label="item.label" :value="item.value"></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="拖车公司">
+      <el-select v-model="trailer.trailerCompany" placeholder="请选择拖车公司">
+        <el-option v-for="item in status" :key="item.value" :label="item.label" :value="item.value"></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="拖车时间" prop="time">
+      <el-date-picker type="date" placeholder="请选择日期" v-model="trailer.trailerTime"></el-date-picker>
+    </el-form-item>
+    <el-form-item label="车牌">
+      <el-input v-model="trailer.licensePlate"></el-input>
+    </el-form-item>
+    <el-form-item label="司机">
+      <el-input v-model="trailer.driver"></el-input>
+    </el-form-item>
+    <el-form-item label="司机联系方式">
+      <el-input v-model="trailer.telephone"></el-input>
+    </el-form-item>
+    <el-form-item label="货柜号">
+      <el-input v-model="trailer.containerNumber"></el-input>
+    </el-form-item>
+    <el-form-item label="封条">
+      <el-input v-model="trailer.seal"></el-input>
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" @click="onSubmit">提交</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+export default {
+  name: "trailer",
+  data() {
+    return {
+      status: [
+        {
+          value: "1",
+          label: "已派车，待提柜",
+        },
+        {
+          value: "2",
+          label: "已提柜，待还柜",
+        },
+        {
+          value: "3",
+          label: "已还柜",
+        },
+      ],
+      trailer: {},
+      rules: {
+        time: [{ required: true, message: "请选择时间", trigger: "change" }],
+      },
+    };
+  },
+  methods: {
+    onSubmit() {
+      this.$refs["trailerForm"].validate((valid) => {
+        if (valid) {
+          alert("submit!");
+        }
+      });
+    },
+    cancel() {
+      this.$emit("closeDialog");
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.trailer-form {
+  .el-form-item__content {
+    > div {
+      width: 100%;
+    }
+  }
+}
+</style>