Merge branch 'mergeBranch' into redUrgent

src/HDrpManagement/logistics/modules/add.vue

@@ -21,7 +21,7 @@
           <el-input v-model="form.billno" placeholder="物流单号"></el-input>
         </el-form-item>
         <el-form-item label="寄付方式">
-          <el-select v-model="form.paytype" placeholder="请选择" @change="selectChange">
+          <el-select v-model="form.paytype" placeholder="请选择" @change="selectChange" :disabled="isCorrelate > 0">
             <el-option
               label="到付"
               value="到付">
@@ -64,7 +64,7 @@
         </div>
         <el-row :gutter="10">
           <el-col :span="setcol">
-            <dispatch-table ref="dislist"></dispatch-table>
+            <dispatch-table type="add" ref="dislist"></dispatch-table>
           </el-col>
           <el-col :span="24 - setcol">
             <add-disbill v-if="drawer" ref="addbill" :data="enterpriseInfo" :paytype="form.paytype" @onConfirm="onConfirm"></add-disbill>
@@ -96,6 +96,7 @@ export default {
     return {
       drawer:false,
       visible:false,
+      isCorrelate:0,
       setcol:24,
       form:{
         "freightamount": "",
@@ -153,6 +154,7 @@ export default {
         return arr.filter((item) => !res.has(item[uniId]) && res.set(item[uniId], 1));
       }
       this.$refs['dislist'].tableData = unique([...this.$refs['dislist'].tableData,...data],'billno')
+      this.isCorrelate = this.$refs.dislist.tableData.length
       this.form.remarks = this.$refs['dislist'].tableData[0].remarks
     },
     async onSubmit () {
@@ -195,6 +197,9 @@ export default {
     },
     onClose () {
       this.$refs['ent'].form = this.$refs['logis'].form = {}
+      this.setcol = 24
+      this.isCorrelate = 0
+      this.$refs.dislist.tableData = []
     }
   }
 }

src/HDrpManagement/logistics/modules/dispatchTable.vue

@@ -47,7 +47,8 @@
       label="备注">
     </el-table-column>
     <el-table-column
-    v-if="type === 'edit'"
+    v-if="type === 'edit' || type === 'add'"
+    fixed="right"
     label="操作"
     width="90">
       <template slot-scope="scope">
@@ -104,8 +105,9 @@
         })
         if(res.data.length > 0) this.$emit('onInit',res.data[0]);
         this.tableData = res.data
+        this.$emit('isCorrelation',res.data.length)
         console.log(this.tableData);
-        
+
         res.data.length > 0?this.rowClick(res.data[0]):''
       },
       rowClick (row) {

src/HDrpManagement/logistics/modules/edit.vue

@@ -22,7 +22,7 @@ ed<template>
           <el-input v-model="form.logisticno" placeholder="物流单号"></el-input>
         </el-form-item>
         <el-form-item label="寄付方式">
-          <el-select v-model="form.paytype" placeholder="请选择">
+          <el-select v-model="form.paytype" placeholder="请选择" :disabled="isCorrelate > 0">
             <el-option
               label="到付"
               value="到付">
@@ -65,7 +65,7 @@ ed<template>
         </div>
         <el-row :gutter="10">
           <el-col :span="setcol">
-            <dispatch-table type="edit" :needQuery="true" ref="dislist"></dispatch-table>
+            <dispatch-table type="edit" :needQuery="true" ref="dislist" @isCorrelation="isCorrelation"></dispatch-table>
           </el-col>
           <el-col :span="24 - setcol">
             <add-disbill ref="addbill" :data="enterpriseInfo" @onConfirm="onConfirm"></add-disbill>
@@ -115,6 +115,7 @@ export default {
       drawer:false,
       visible:false,
       setcol:24,
+      isCorrelate:0,
       form:{
        "freightamount": "",
         "logisticno": "",
@@ -128,7 +129,7 @@ export default {
         "logisphone":"",
          "logiscontact":"",
         "rec_contactsid":'',
-        "billdate":''
+        "billdate":'',
       },
       enterpriseInfo:null,
        pickerOptions: {
@@ -145,9 +146,14 @@ export default {
       this.$nextTick(()=>{
         this.$refs['ent'].form.enterprisename = this.data.enterprisename
         this.$refs['logis'].form.abbreviation = this.data.logiscomp_enterprisename
+        this.$refs.dislist.listData()
+        this.setcol = 24
       })
 
     },
+    isCorrelation(val){
+      this.isCorrelate = val
+    },
     addMoreBill () {
       if (this.enterpriseInfo === null) return this.$message({
         message:'请先选择企业信息',
@@ -170,8 +176,8 @@ export default {
         return arr.filter((item) => !res.has(item[uniId]) && res.set(item[uniId], 1));
       }
       this.$refs['dislist'].tableData = unique([...this.$refs['dislist'].tableData,...data],'billno')
+      this.isCorrelate = this.$refs.dislist.tableData.length
       this.form.remarks = this.$refs['dislist'].tableData[0].remarks
-
     },
     async onSubmit () {
       this.form.sa_dispatchids = this.$refs['dislist'].tableData.map(e=>{