修改陆运细节改动

src/views/landTransportation/dispatchingCars/detailPage.vue

@@ -118,7 +118,7 @@
         </el-table-column>
         <el-table-column
             property="corpName"
-            label="发货工厂"
+            label="货运地点"
             align="center"
             show-overflow-tooltip
             width="200">
@@ -918,18 +918,20 @@ export default {
             message: " ",
             trigger: "blur"
           }],
-        }, {
-          label: '货运日期',
-          type: "datetime",
-          format: 'yyyy-MM-dd HH:mm:ss',
-          valueFormat: 'yyyy-MM-dd HH:mm:ss',
-          prop: 'arrivalTime',
-          rules: [{
-            required: true,
-            message: " ",
-            trigger: "blur"
-          }],
-        }, {
+        },
+        //   {
+        //   label: '货运日期',
+        //   type: "datetime",
+        //   format: 'yyyy-MM-dd HH:mm:ss',
+        //   valueFormat: 'yyyy-MM-dd HH:mm:ss',
+        //   prop: 'arrivalTime',
+        //   rules: [{
+        //     required: true,
+        //     message: " ",
+        //     trigger: "blur"
+        //   }],
+        // },
+          {
           label: '备注',
           span: 24,
           minRows: 2,

src/views/landTransportation/driver/index.vue

@@ -270,24 +270,17 @@ export default {
           overHidden: true,
           prop: 'billNo'
         }, {
-          label: '平台号',
-          width: 100,
-          index: 4,
-          search: true,
-          overHidden: true,
-          prop: 'orderNo'
-        }, {
           label: '场站',
           prop: 'station',
           overHidden: true,
-          index: 5,
+          index: 4,
           width: 140,
           search: true,
         },  {
           label: '车队',
           width: 200,
           search: true,
-          index:6,
+          index:5,
           overHidden: true,
           prop: 'fleetId'
         },{
@@ -295,7 +288,7 @@ export default {
           width: 150,
           prop: 'plateNo',
           overHidden: true,
-          index:7,
+          index:6,
           type: 'select',
           search: true,
           dicUrl: "/api/blade-client/land-vehicle/vehicle-list?fleetId={{key}}",
@@ -306,7 +299,7 @@ export default {
         }, {
           label: '司机',
           width: 115,
-          index:8,
+          index:7,
           search: true,
           overHidden: true,
           prop: 'driverId',
@@ -319,11 +312,18 @@ export default {
         }, {
           label: '电话',
           width: 160,
-          index:9,
+          index:8,
           overHidden: true,
           search: true,
           prop: 'tel'
         }, {
+          label: '平台号',
+          width: 100,
+          index: 9,
+          search: true,
+          overHidden: true,
+          prop: 'orderNo'
+        }, {
           label: '箱号',
           cell: true,
           width: 245,

src/views/landTransportation/motorcadeDriver/index.vue

@@ -377,17 +377,10 @@ export default {
           overHidden: true,
           prop: 'billNo'
         }, {
-          label: '平台号',
-          width: 100,
-          index: 4,
-          search: true,
-          overHidden: true,
-          prop: 'orderNo'
-        }, {
           label: '场站',
           prop: 'station',
           overHidden: true,
-          index: 5,
+          index: 4,
           width: 140,
           search: true,
         },
@@ -395,7 +388,7 @@ export default {
             label: '车队',
             width: 200,
             search: true,
-            index: 7,
+            index: 5,
             // hide:true,
             showColumn: false,
             filterable: true,
@@ -436,7 +429,7 @@ export default {
             overHidden: true,
             cell: true,
             filterable: true,
-            index: 8,
+            index: 7,
             prop: 'driverId',
             type: 'select',
             dicUrl: "/api/blade-client/land-driver/driver-list?plateNo={{key}}",
@@ -450,9 +443,16 @@ export default {
             width: 160,
             search: true,
             cell: true,
-            index: 9,
+            index: 8,
             prop: 'tel'
           }, {
+            label: '平台号',
+            width: 100,
+            index: 9,
+            search: true,
+            overHidden: true,
+            prop: 'orderNo'
+          },{
             label: '箱号',
             overHidden: true,
             width: 245,

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -156,7 +156,7 @@
         <template slot="headerSerial" slot-scope="{column}">
           <el-tooltip class="item" effect="dark" content="录入明细" placement="top">
             <el-button type="primary" icon="el-icon-circle-plus-outline" circle size="mini"
-                       @click="$refs.crudBox.rowCellAdd({arrivalTime:new Date((new Date).getTime() + 8 * 60 * 60 * 1000).toJSON().split('T').join(' ').substr(0, 14)+'00:00'})"></el-button>
+                       @click="$refs.crudBox.rowCellAdd({arrivalTime:new Date((new Date).getTime() + 8 * 60 * 60 * 1000).toJSON().split('T').join(' ').substr(0, 14)+'00:00',landAmountD:0})"></el-button>
           </el-tooltip>
         </template>
         <template slot="ctnTypeHeader" slot-scope="{column}">
@@ -168,9 +168,9 @@
         <!--        <template slot="landWeightHeader" slot-scope="{column}">-->
         <!--          {{ column.label }}<span style="color:#F56C6C">*</span>-->
         <!--        </template>-->
-        <template slot="landAmountDHeader" slot-scope="{column}">
-          {{ column.label }}<span style="color:#F56C6C">*</span>
-        </template>
+<!--        <template slot="landAmountDHeader" slot-scope="{column}">-->
+<!--          {{ column.label }}<span style="color:#F56C6C">*</span>-->
+<!--        </template>-->
         <template slot="arrivalTimeHeader" slot-scope="{column}">
           {{ column.label }}<span style="color:#F56C6C">*</span>
         </template>
@@ -277,7 +277,6 @@
             property="address"
             align="center"
             width="150"
-            :render-header="customTitle"
             label="联系人">
           <template slot-scope="scope">
             <el-input v-model="scope.row.contacts" :disabled="goodsForm.status !== 0" size="small"
@@ -288,7 +287,6 @@
             property="address"
             align="center"
             width="180"
-            :render-header="customTitle"
             label="电话">
           <template slot-scope="scope">
             <el-input v-model="scope.row.tel" :disabled="goodsForm.status !== 0" size="small"
@@ -298,7 +296,6 @@
         <el-table-column
             property="address"
             align="center"
-            :render-header="customTitle"
             label="详细地址">
           <template slot-scope="scope">
             <el-input v-model="scope.row.address" :disabled="goodsForm.status !== 0" size="small"
@@ -327,7 +324,7 @@
           :option="vehicleOption">
       </avue-crud>
     </basic-container>
-    <containerTitle title="费用明细"></containerTitle>
+    <containerTitle title="其他费用"></containerTitle>
     <basic-container>
       <el-tabs v-model="activeIndex" @tab-click="handleSelect">
         <el-tab-pane label="应收" name="1"></el-tab-pane>
@@ -1004,9 +1001,8 @@ export default {
             prop: 'etd',
             type: 'date'
           }, {
-            label: '截港日期',
-            prop: 'etc',
-            type: 'date'
+            label: '预配箱量',
+            prop: 'expectCtnQty'
           }, {
             label: '起运港',
             prop: 'polId'
@@ -1014,8 +1010,9 @@ export default {
             label: '目的港',
             prop: 'podId'
           }, {
-            label: '预配箱量',
-            prop: 'expectCtnQty'
+            label: '截港日期',
+            prop: 'etc',
+            type: 'date'
           }, {
             label: '截单日期',
             prop: 'siCutoffDate',
@@ -1679,16 +1676,16 @@ export default {
         for (let item in this.tableData) {
           if (item < Number(this.tableData.length) - 1) {
             if (!this.tableData[item].corpId) return this.$message.error('请选择第' + Number(Number(item) + 1) + '行货运地点');
-            if (!this.tableData[item].address) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行详细地址');
-            if (!this.tableData[item].contacts) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行联系人');
-            if (!this.tableData[item].tel) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行电话');
+            // if (!this.tableData[item].address) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行详细地址');
+            // if (!this.tableData[item].contacts) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行联系人');
+            // if (!this.tableData[item].tel) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行电话');
           }
         }
         for (let item in this.entrustList) {
           if (!this.entrustList[item].ctnType) return this.$message.error('请选择第' + Number(Number(item) + 1) + '行箱型');
           if (!this.entrustList[item].ctnQuantity) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行箱量');
           if (!this.entrustList[item].arrivalTime) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行货运日期');
-          if (!this.entrustList[item].landAmountD) return this.$message.error('请输入第' + Number(Number(item) + 1) + '运费');
+          // if (!this.entrustList[item].landAmountD) return this.$message.error('请输入第' + Number(Number(item) + 1) + '运费');
         }
         if (this.entrustList.length === 0) return this.$message.error('箱信息不能为空')
         this.$refs['goodsFormE'].validate((valid, doneE) => {