提交陆运新增需求

src/api/landTransportation/index.js

@@ -186,6 +186,14 @@ export function getCorp() {
         method: 'get'
     })
 }
+//查询业务员
+export function getSalesman(data) {
+    return request({
+        url: '/api/blade-client/corpsattn/all-list',
+        method: 'get',
+        params:data
+    })
+}
 //批量提交调度
 export function dispatchBatch(data) {
     return request({

src/views/landTransportation/dispatchingCars/detailPage.vue

@@ -88,22 +88,28 @@
               disabled
           ></crop-select>
         </template>
+        <template slot-scope="scope" slot="station">
+          <port-info
+              v-model="goodsForm.station"
+              :disabled="goodsForm.status === 2"
+          />
+        </template>
         <template slot-scope="scope" slot="agentId">
           <crop-select
-              :disabled="goodsForm.status === 1"
+              :disabled="goodsForm.status === 2"
               v-model="goodsForm.agentId"
           ></crop-select>
         </template>
         <template slot-scope="scope" slot="polId">
           <port-info
               v-model="goodsForm.polId"
-              :disabled="goodsForm.status === 1"
+              :disabled="goodsForm.status === 2"
           />
         </template>
         <template slot-scope="scope" slot="podId">
           <port-info
               v-model="goodsForm.polId"
-              :disabled="goodsForm.status === 1"
+              :disabled="goodsForm.status === 2"
           />
         </template>
       </avue-form>
@@ -580,10 +586,48 @@ export default {
             width: 200,
             prop: 'fleetId'
           }, {
+            label: '到厂时间',
+            type: "datetime",
+            cell: true,
+            format: 'yyyy-MM-dd HH:mm:ss',
+            valueFormat: 'yyyy-MM-dd HH:mm:ss',
+            width: 200,
+            prop: 'arrivalTime'
+          }, {
             label: '应付陆运费',
             cell: true,
             prop: 'landAmountC'
           }, {
+            label: '件数',
+            width: 100,
+            search: true,
+            overHidden: true,
+            controls: false,
+            cell: true,
+            prop: 'quantity',
+            type: 'number',
+            precision:0
+          }, {
+            label: '包装',
+            width: 100,
+            search: true,
+            overHidden: true,
+            cell: true,
+            prop: 'packing',
+            type: 'select',
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=packaging",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+          }, {
+            label: '尺码',
+            width: 100,
+            search: true,
+            overHidden: true,
+            cell: true,
+            prop: 'size',
+          }, {
             label: '尺寸箱型',
             width: 100,
             slot: true,
@@ -770,7 +814,17 @@ export default {
           prop: 'siCutoffDate',
           type: 'date'
         }, {
+          label: '业务员',
+          prop: 'salesman',
+          type: 'select',
+          dicUrl: "/api/blade-client/corpsattn/all-list",
+          props: {
+            label: "cname",
+            value: "id"
+          },
+        }, {
           label: '备注',
+          span: 24,
           prop: 'remarks'
         }
         ]
@@ -837,6 +891,7 @@ export default {
         }, {
           label: '备注',
           cell: true,
+          width: 200,
           prop: 'remarks'
         }
         ]

src/views/landTransportation/driver/index.vue

@@ -309,17 +309,30 @@ export default {
           width: 140,
           search: true,
         },{
+          label: '实际到厂时间',
+          prop: 'realArrivalTime',
+          overHidden: true,
+          type: "date",
+          cell: true,
+          searchRange: true,
+          defaultTime: ['00:00:00', '23:59:59'],
+          format: "yyyy-MM-dd HH:mm:ss",
+          valueFormat: "yyyy-MM-dd HH:mm:ss",
+          index: 9,
+          width: 140,
+          search: true,
+        },{
           label: '货物名称',
           overHidden: true,
           width: 160,
           search: true,
-          index: 9,
+          index: 10,
           prop: 'goods'
         }, {
           label: '箱号',
           cell: true,
           width: 245,
-          index: 10,
+          index: 11,
           overHidden: true,
           search: true,
           prop: 'ctnNo'
@@ -327,7 +340,7 @@ export default {
           label: '场站',
           prop: 'station',
           overHidden: true,
-          index: 11,
+          index: 12,
           width: 140,
           search: true,
         },{
@@ -339,21 +352,21 @@ export default {
           defaultTime: ['00:00:00', '23:59:59'],
           format: "yyyy-MM-dd HH:mm:ss",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
-          index: 12,
+          index: 13,
           width: 140,
           search: true,
         },{
           label: '船名航次',
           prop: 'factory',
           overHidden: true,
-          index: 13,
+          index: 14,
           width: 140,
           search: true,
         }, {
           label: '尺寸箱型',
           width: 100,
           search: true,
-          index: 14,
+          index: 15,
           overHidden: true,
           prop: 'ctnType',
           type: 'select',
@@ -365,7 +378,7 @@ export default {
         }, {
           label: '箱量',
           width: 50,
-          index: 15,
+          index: 16,
           prop: 'ctnQuantity'
         }, {
           label: '重量(吨)',
@@ -373,32 +386,32 @@ export default {
           prop: 'landWeight',
           controls: false,
           overHidden: true,
-          index: 16,
+          index: 17,
           precision: 2,
           type: 'number'
         }, {
           label: '应付陆运费',
           overHidden: true,
-          index: 17,
+          index: 18,
           prop: 'landAmountC'
         }, {
           label: '委托备注',
           overHidden: true,
           width: 245,
-          index: 18,
+          index: 19,
           prop: 'remarks'
         }, {
           label: '车队备注',
           overHidden: true,
           width: 245,
-          index: 19,
+          index: 20,
           prop: 'fleetRemarks'
         }, {
           label: '司机备注',
           overHidden: true,
           cell: true,
           width: 245,
-          index: 20,
+          index: 21,
           prop: 'driverRemarks'
         },{
           label: '场站费',
@@ -581,21 +594,28 @@ export default {
       });
     },
     confirmCompletion(row) {
-      this.$confirm('是否确定完工', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        confirmCompletion({id: row.id}).then(res => {
-          this.$message.success('操作成功');
-          this.onLoad(this.page)
-        })
-      }).catch(() => {
+      if (row.realArrivalTime){
+        this.$confirm('是否确定完工', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          confirmCompletion({id: row.id}).then(res => {
+            this.$message.success('操作成功');
+            this.onLoad(this.page)
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'warning',
+            message: '请选择实际到厂时间！'
+          });
+        });
+      }else {
         this.$message({
           type: 'info',
           message: '已取消'
         });
-      });
+      }
     },
     //打开附件
     annexOpen(row, index){

src/views/landTransportation/motorcadeDriver/index.vue

@@ -237,7 +237,7 @@ export default {
               }
             })
           }
-        },{
+        }, {
           label: "司机",
           prop: "driverId",
           type: 'select',
@@ -246,7 +246,7 @@ export default {
             label: "name",
             value: "id"
           },
-          change:(data) => {
+          change: (data) => {
             telephone().then(res => {
               for (let item in res.data.data) {
                 if (data.value === res.data.data[item].id) {
@@ -255,7 +255,7 @@ export default {
               }
             })
           }
-        },{
+        }, {
           label: "电话",
           prop: "tel",
         }]
@@ -380,7 +380,7 @@ export default {
           props: {
             label: "plateNo",
             value: "id"
-          }
+          },
         }, {
           label: '提单号',
           width: 100,
@@ -388,124 +388,171 @@ export default {
           search: true,
           overHidden: true,
           prop: 'billNo'
-        }, {
-          label: '车队',
-          width: 200,
-          search: true,
-          index: 3,
-          cascader: ['plateNo'],
-          overHidden: true,
-          prop: 'fleetId'
-        }, {
-          label: '司机',
-          width: 115,
-          search: true,
-          overHidden: true,
-          cell: true,
-          filterable: true,
-          index: 5,
-          prop: 'driverId',
-          type: 'select',
-          dicUrl: "/api/blade-client/land-driver/driver-list?vehicleId={{key}}",
-          props: {
-            label: "name",
-            value: "id"
-          }
-        }, {
-          label: '电话',
-          overHidden: true,
-          width: 160,
-          search: true,
-          cell: true,
-          index: 6,
-          prop: 'tel'
-        }, {
-          label: '路线',
-          index: 7,
-          width: 160,
-          search: true,
-          prop: 'addressDetail'
-        }, {
-          label: '到厂时间',
-          prop: 'arrivalTime',
-          overHidden: true,
-          type: "date",
-          searchRange: true,
-          defaultTime: ['00:00:00', '23:59:59'],
-          format: "yyyy-MM-dd HH:mm:ss",
-          valueFormat: "yyyy-MM-dd HH:mm:ss",
-          index: 8,
-          width: 145,
-          search: true,
-        }, {
-          label: '货物名称',
-          overHidden: true,
-          width: 160,
-          search: true,
-          index: 9,
-          prop: 'goods'
-        }, {
-          label: '箱号',
-          overHidden: true,
-          width: 245,
-          index: 10,
-          search: true,
-          prop: 'ctnNo'
-        }, {
-          label: '场站',
-          prop: 'station',
-          overHidden: true,
-          index: 11,
-          width: 140,
-          search: true,
-        }, {
-          label: '制单日期',
-          overHidden: true,
-          prop: 'createTime',
-          type: "date",
-          searchRange: true,
-          defaultTime: ['00:00:00', '23:59:59'],
-          format: "yyyy-MM-dd HH:mm:ss",
-          valueFormat: "yyyy-MM-dd HH:mm:ss",
-          index: 12,
-          width: 145,
-          search: true,
-        }, {
-          label: '船名航次',
-          prop: 'factory',
-          overHidden: true,
-          index: 13,
-          width: 140,
-          search: true,
-        }, {
-          label: '尺寸箱型',
-          width: 100,
-          index: 14,
-          search: true,
-          overHidden: true,
-          prop: 'ctnType',
-          type: 'select',
-          dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxType",
-          props: {
-            label: "dictValue",
-            value: "dictValue"
-          }
-        }, {
-          label: '箱量',
-          width: 50,
-          index: 15,
-          overHidden: true,
-          prop: 'ctnQuantity'
-        }, {
-          label: '重量(吨)',
-          width: 160,
-          prop: 'landWeight',
-          controls: false,
-          overHidden: true,
-          index: 16,
-          precision: 2,
-          type: 'number'
         },
+          {
+            label: '车队',
+            width: 200,
+            search: true,
+            index: 3,
+            // hide:true,
+            showColumn: false,
+            filterable: true,
+            disabled: true,
+            type: 'select',
+            cascader: ['vehicleId'],
+            overHidden: true,
+            prop: 'fleetId',
+            dicUrl: "/api/blade-client/land-vehicle/list?size=1000&current=1",
+            props: {
+              label: "fleetName",
+              value: "fleetId",
+              res: "data.records"
+            },
+            cell: true
+          },
+          {
+            label: '司机',
+            width: 115,
+            search: true,
+            overHidden: true,
+            cell: true,
+            filterable: true,
+            index: 5,
+            prop: 'driverId',
+            type: 'select',
+            dicUrl: "/api/blade-client/land-driver/driver-list?vehicleId={{key}}",
+            props: {
+              label: "name",
+              value: "id"
+            }
+          }, {
+            label: '电话',
+            overHidden: true,
+            width: 160,
+            search: true,
+            cell: true,
+            index: 6,
+            prop: 'tel'
+          }, {
+            label: '件数',
+            width: 100,
+            search: true,
+            index: 6,
+            overHidden: true,
+            controls: false,
+            cell: true,
+            prop: 'quantity',
+            type: 'number',
+            precision:0
+          }, {
+            label: '包装',
+            width: 100,
+            search: true,
+            index: 6,
+            overHidden: true,
+            cell: true,
+            prop: 'packing',
+            type: 'select',
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=packaging",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+          }, {
+            label: '尺码',
+            width: 100,
+            search: true,
+            index:6,
+            overHidden: true,
+            cell: true,
+            prop: 'size',
+          }, {
+            label: '路线',
+            index: 7,
+            width: 160,
+            search: true,
+            prop: 'addressDetail'
+          }, {
+            label: '到厂时间',
+            prop: 'arrivalTime',
+            overHidden: true,
+            type: "date",
+            searchRange: true,
+            defaultTime: ['00:00:00', '23:59:59'],
+            format: "yyyy-MM-dd HH:mm:ss",
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
+            index: 8,
+            width: 145,
+            search: true,
+          }, {
+            label: '货物名称',
+            overHidden: true,
+            width: 160,
+            search: true,
+            index: 9,
+            prop: 'goods'
+          }, {
+            label: '箱号',
+            overHidden: true,
+            width: 245,
+            index: 10,
+            search: true,
+            prop: 'ctnNo'
+          }, {
+            label: '场站',
+            prop: 'station',
+            overHidden: true,
+            index: 11,
+            width: 140,
+            search: true,
+          }, {
+            label: '制单日期',
+            overHidden: true,
+            prop: 'createTime',
+            type: "date",
+            searchRange: true,
+            defaultTime: ['00:00:00', '23:59:59'],
+            format: "yyyy-MM-dd HH:mm:ss",
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
+            index: 12,
+            width: 145,
+            search: true,
+          }, {
+            label: '船名航次',
+            prop: 'factory',
+            overHidden: true,
+            index: 13,
+            width: 140,
+            search: true,
+          }, {
+            label: '尺寸箱型',
+            width: 100,
+            index: 14,
+            search: true,
+            overHidden: true,
+            prop: 'ctnType',
+            type: 'select',
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxType",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            }
+          }, {
+            label: '箱量',
+            width: 50,
+            index: 15,
+            overHidden: true,
+            prop: 'ctnQuantity'
+          }, {
+            label: '重量(吨)',
+            width: 160,
+            prop: 'landWeight',
+            controls: false,
+            overHidden: true,
+            index: 16,
+            precision: 2,
+            type: 'number'
+          },
           // {
           //   label: '陆运费(D)',
           //   overHidden: true,
@@ -627,10 +674,10 @@ export default {
       changeVehicle({
         ...this.formData,
         id: this.formDataList.id,
-        originalPlateNo:this.formDataList.vehicleId,
-        originalDriverName:this.formDataList.driverName,
-        originalTel:this.formDataList.tel
-      }).then(res=>{
+        originalPlateNo: this.formDataList.vehicleId,
+        originalDriverName: this.formDataList.driverName,
+        originalTel: this.formDataList.tel
+      }).then(res => {
         this.dialogChange = false
         this.onLoad(this.page)
         this.$refs.saveForm.resetForm()

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -143,6 +143,23 @@
               :corpType="'KH'"
           ></crop-select>
         </template>
+        <template slot-scope="scope" slot="station">
+          <port-info
+              v-model="goodsForm.station"
+              :disabled="goodsForm.status === 1"
+          />
+        </template>
+        >
+        <template slot-scope="scope" slot="salesman">
+          <el-select v-model="goodsForm.salesman" placeholder="请选择">
+            <el-option
+                v-for="item in salesmanList"
+                :key="item.id"
+                :label="item.cname"
+                :value="item.id">
+            </el-option>
+          </el-select>
+        </template>
         <template slot-scope="scope" slot="agentId">
           <crop-select
               :disabled="goodsForm.status === 1"
@@ -176,7 +193,8 @@
                  @row-del="rowDel">
         <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()"></el-button>
+            <el-button type="primary" icon="el-icon-circle-plus-outline" circle size="mini"
+                       @click="$refs.crudBox.rowCellAdd({arrivalTime:goodsForm.arrivalTime})"></el-button>
           </el-tooltip>
         </template>
         <template slot="ctnTypeHeader" slot-scope="{column}">
@@ -191,6 +209,9 @@
         <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>-->
       </avue-crud>
     </basic-container>
     <basic-container v-if="goodsForm.status !== 0 && goodsForm.status">
@@ -279,7 +300,9 @@
           </el-button>
         </template>
         <template slot="menuLeft">
-          <el-button type="primary" icon="el-icon-plus" :disabled="goodsForm.status === 1" @click="addRowCollection" size="small">录入明细</el-button>
+          <el-button type="primary" icon="el-icon-plus" :disabled="goodsForm.status === 1" @click="addRowCollection"
+                     size="small">录入明细
+          </el-button>
         </template>
       </avue-crud>
       <avue-crud
@@ -331,7 +354,9 @@
           </el-button>
         </template>
         <template slot="menuLeft">
-          <el-button type="primary" icon="el-icon-plus" :disabled="goodsForm.status === 1" @click="addRowPayment" size="small">录入明细</el-button>
+          <el-button type="primary" icon="el-icon-plus" :disabled="goodsForm.status === 1" @click="addRowPayment"
+                     size="small">录入明细
+          </el-button>
         </template>
       </avue-crud>
     </basic-container>
@@ -353,7 +378,7 @@ import {
   detailDelegationList,
   removeCollection,
   saveSaveList,
-  addressList, cancelSubmission, getCorp
+  addressList, cancelSubmission, getCorp, getSalesman
 } from "@/api/landTransportation";
 
 export default {
@@ -365,12 +390,13 @@ export default {
   data() {
     return {
       activeIndex: '1',
-      KeyBox:0,
-      KeyBoxTwo:0,
+      KeyBox: 0,
+      KeyBoxTwo: 0,
       type: false,
       goodsForm: {},
       modelKey: 1,
       orderFilesList: [],
+      salesmanList: [],
       vehicleList: [],
       breakConfiguration: {
         multipleChoices: false,
@@ -383,12 +409,12 @@ export default {
         dicData: []
       },
       advantageProjectData: [],
-      keyContact:0,
+      keyContact: 0,
       vehicleOptionTwo: {
         align: 'center',
         menuAlign: 'center',
-        refreshBtn:false,
-        menu:false,
+        refreshBtn: false,
+        menu: false,
         index: true,
         stripe: true,
         cellBtn: false,
@@ -499,6 +525,13 @@ export default {
             precision: 2,
             type: 'number'
           }, {
+            label: '到厂时间',
+            type: "datetime",
+            format: 'yyyy-MM-dd HH:mm:ss',
+            valueFormat: 'yyyy-MM-dd HH:mm:ss',
+            width: 200,
+            prop: 'arrivalTime'
+          }, {
             label: '车号',
             width: 150,
             prop: 'plateNo'
@@ -525,88 +558,10 @@ export default {
             label: '司机备注',
             width: 245,
             prop: 'driverRemarks'
-          }, {
-            label: '应收场站费',
-            width: 100,
-            precision: 2,
-            controls: false,
-            type: 'number',
-            prop: 'oneFeeD'
-          }, {
-            label: '应收港杂费',
-            width: 100,
-            precision: 2,
-            controls: false,
-            type: 'number',
-            prop: 'twoFeeD'
-          }, {
-            label: '应收扣款',
-            width: 100,
-            precision: 2,
-            controls: false,
-            type: 'number',
-            prop: 'threeFeeD'
-          }, {
-            label: '应收待时费',
-            width: 100,
-            precision: 2,
-            controls: false,
-            type: 'number',
-            prop: 'fourFeeD'
-          }, {
-            label: '应收其他',
-            width: 100,
-            precision: 2,
-            type: 'number',
-            controls: false,
-            prop: 'fiveFeeD'
-          }, {
-            label: '应收费用备注',
-            width: 245,
-            prop: 'feeRemarksD'
-          }, {
-            label: '应付场站费',
-            width: 100,
-            precision: 2,
-            controls: false,
-            type: 'number',
-            prop: 'oneFeeC'
-          }, {
-            label: '应付港杂费',
-            width: 100,
-            precision: 2,
-            controls: false,
-            type: 'number',
-            prop: 'twoFeeC'
-          }, {
-            label: '应付扣款',
-            width: 100,
-            precision: 2,
-            controls: false,
-            type: 'number',
-            prop: 'threeFeeC'
-          }, {
-            label: '应付待时费',
-            width: 100,
-            precision: 2,
-            controls: false,
-            type: 'number',
-            prop: 'fourFeeC'
-          }, {
-            label: '应付其他',
-            width: 100,
-            precision: 2,
-            type: 'number',
-            controls: false,
-            prop: 'fiveFeeC'
-          }, {
-            label: '应付费用备注',
-            width: 245,
-            prop: 'feeRemarksC'
           }
         ]
       },
-      vehicleOption:{},
+      vehicleOption: {},
       treeOption: {
         label: 'title',
         value: 'id',
@@ -632,8 +587,8 @@ export default {
         menuAlign: 'center',
         index: true,
         cellBtn: true,
-        menu:false,
-        refreshBtn:false,
+        menu: false,
+        refreshBtn: false,
         addBtn: false,
         addRowBtn: false,
         delBtn: false,
@@ -652,23 +607,23 @@ export default {
             name: 'landAmountD',
             type: 'sum',
             decimals: 2
-          },{
+          }, {
             name: 'oneFeeD',
             type: 'sum',
             decimals: 2
-          },{
+          }, {
             name: 'twoFeeD',
             type: 'sum',
             decimals: 2
-          },{
+          }, {
             name: 'threeFeeD',
             type: 'sum',
             decimals: 2
-          },{
+          }, {
             name: 'fourFeeD',
             type: 'sum',
             decimals: 2
-          },{
+          }, {
             name: 'fiveFeeD',
             type: 'sum',
             decimals: 2
@@ -699,17 +654,56 @@ export default {
           precision: 2,
           controls: false,
         }, {
+          label: '到厂时间',
+          type: "datetime",
+          format: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: 'yyyy-MM-dd HH:mm:ss',
+          cell: true,
+          width: 200,
+          prop: 'arrivalTime'
+        }, {
+          label: '件数',
+          width: 100,
+          search: true,
+          index: 6,
+          overHidden: true,
+          controls: false,
+          prop: 'quantity',
+          type: 'number',
+          precision:0
+        }, {
+          label: '包装',
+          width: 100,
+          search: true,
+          index: 7,
+          overHidden: true,
+          prop: 'packing',
+          type: 'select',
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=packaging",
+          props: {
+            label: "dictValue",
+            value: "dictValue"
+          },
+        }, {
+          label: '尺码',
+          width: 100,
+          search: true,
+          index:8,
+          overHidden: true,
+          prop: 'size',
+        }, {
           label: '备注',
+          width: 200,
           prop: 'remarks'
         }]
       },
-      entrustOptionTwoT:{},
+      entrustOptionTwoT: {},
       entrustList: [],
-      goodsOptionFormC:{
+      goodsOptionFormC: {
         menuBtn: false,
         disabled: false,
         span: 8,
-        column: [ {
+        column: [{
           label: '业务类型',
           prop: 'businessType',
           type: 'select',
@@ -735,9 +729,9 @@ export default {
           change: (data) => {
             if (data.value === '集装箱') {
               this.findObject(this.goodsOptionForm.column, "billNo").rules[0].required = true
-            }else if(!data.value){
+            } else if (!data.value) {
               this.findObject(this.goodsOptionForm.column, "billNo").rules[0].required = true
-            }else {
+            } else {
               this.findObject(this.goodsOptionForm.column, "billNo").rules[0].required = false
             }
           }
@@ -834,6 +828,9 @@ export default {
           prop: 'siCutoffDate',
           type: 'date'
         }, {
+          label: '业务员',
+          prop: 'salesman',
+        }, {
           label: '备注',
           span: 24,
           prop: 'remarks'
@@ -860,23 +857,23 @@ export default {
             name: 'landAmountD',
             type: 'sum',
             decimals: 2
-          },{
+          }, {
             name: 'oneFeeD',
             type: 'sum',
             decimals: 2
-          },{
+          }, {
             name: 'twoFeeD',
             type: 'sum',
             decimals: 2
-          },{
+          }, {
             name: 'threeFeeD',
             type: 'sum',
             decimals: 2
-          },{
+          }, {
             name: 'fourFeeD',
             type: 'sum',
             decimals: 2
-          },{
+          }, {
             name: 'fiveFeeD',
             type: 'sum',
             decimals: 2
@@ -892,7 +889,7 @@ export default {
           prop: 'ctnType',
           type: 'select',
           width: 100,
-          index:1,
+          index: 1,
           dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxType",
           props: {
             label: "dictValue",
@@ -904,7 +901,7 @@ export default {
           prop: 'ctnQuantity',
           controls: false,
           precision: 0,
-          index:2,
+          index: 2,
           width: 100,
           maxRows: 999,
           minRows: 1,
@@ -915,7 +912,7 @@ export default {
           prop: 'landWeight',
           controls: false,
           width: 200,
-          index:3,
+          index: 3,
           precision: 2,
           type: 'number'
         }, {
@@ -924,17 +921,60 @@ export default {
           prop: 'landAmountD',
           controls: false,
           width: 200,
-          index:4,
+          index: 4,
           precision: 2,
           type: 'number'
         }, {
+          label: '到厂时间',
+          type: "datetime",
+          format: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: 'yyyy-MM-dd HH:mm:ss',
+          cell: true,
+          width: 200,
+          index: 5,
+          prop: 'arrivalTime'
+        }, {
+          label: '件数',
+          width: 100,
+          search: true,
+          index: 6,
+          overHidden: true,
+          controls: false,
+          cell: true,
+          prop: 'quantity',
+          type: 'number',
+          precision:0
+        }, {
+          label: '包装',
+          width: 100,
+          search: true,
+          index: 7,
+          overHidden: true,
+          cell: true,
+          prop: 'packing',
+          type: 'select',
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=packaging",
+          props: {
+            label: "dictValue",
+            value: "dictValue"
+          },
+        }, {
+          label: '尺码',
+          width: 100,
+          search: true,
+          index:8,
+          overHidden: true,
+          cell: true,
+          prop: 'size',
+        }, {
           label: '备注',
           cell: true,
-          index:5,
+          index: 9,
+          width: 200,
           prop: 'remarks'
         }]
       },
-      entrustOptionTwo:{},
+      entrustOptionTwo: {},
       collectionList: [],
       collectionOptionBackup: {
         align: 'center',
@@ -1014,8 +1054,8 @@ export default {
         ]
       },
       paymentList: [],
-      collectionOption:{},
-      paymentOption:{},
+      collectionOption: {},
+      paymentOption: {},
       paymentOptionBackup: {
         align: 'center',
         menuAlign: 'center',
@@ -1136,18 +1176,25 @@ export default {
         region: [],
         address: ''
       }]
-      getCorp().then(res=>{
+      getCorp().then(res => {
         this.goodsForm = {
-          corpId:res.data.data?res.data.data.id:'',
-          businessType:"出口",
-          shippingMode:"集装箱",
-          belongCompany:res.data.data?res.data.data.belongCompany:''
+          corpId: res.data.data ? res.data.data.id : '',
+          businessType: "出口",
+          shippingMode: "集装箱",
+          belongCompany: res.data.data ? res.data.data.belongCompany : ''
         }
+        this.salesmanQuery(this.goodsForm.corpId)
       })
       this.entrustList = [{$cellEdit: true}]
     }
   },
   methods: {
+    //查询业务员
+    salesmanQuery(id) {
+      getSalesman({pid: id}).then(res => {
+        this.salesmanList = res.data.data
+      })
+    },
     //自定义列保存
     async saveColumnCollection() {
       /**
@@ -1352,7 +1399,7 @@ export default {
         item.sort = index + 1
         if (item.region !== undefined && item.region.length !== 0) {
           item.region = item.region.join(',')
-        }else {
+        } else {
           item.region = ''
         }
       })
@@ -1385,8 +1432,10 @@ export default {
           done()
         })
         for (let item in this.tableData) {
-          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 (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) + '行详细地址');
+          }
         }
         for (let item in this.entrustList) {
           if (!this.entrustList[item].ctnType) return this.$message.error('请选择第' + Number(Number(item) + 1) + '行尺寸箱型');
@@ -1397,7 +1446,7 @@ export default {
         if (this.entrustList.length === 0) return this.$message.error('箱信息不能为空')
         this.$refs['goodsFormE'].validate((valid, doneE) => {
           doneE()
-          if (valid){
+          if (valid) {
             this.$refs['goodsForm'].validate((valid, done) => {
               done();
               if (valid) {
@@ -1406,7 +1455,7 @@ export default {
                   item.sort = index + 1
                   if (item.region.length !== 0) {
                     item.region = item.region.join(',')
-                  }else {
+                  } else {
                     item.region = ''
                   }
                 })
@@ -1501,6 +1550,8 @@ export default {
     //选择客户名称带出所属公司
     getCorpData(row) {
       this.goodsForm.belongCompany = row.belongCompany
+      //查询业务员
+      this.salesmanQuery(row.id)
     },
     //选择地址客户带出地址
     withAddress(row, scope) {
@@ -1508,7 +1559,7 @@ export default {
       console.log(row)
       if (!scope.row.key) scope.row.key = 0
       this.tableData[scope.$index].corpName = row.cname
-      if (row.attn){
+      if (row.attn) {
         this.tableData[scope.$index].address = row.attn
       }
       if (row.tel) {