Merge remote-tracking branch 'origin/dev' into dev

src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -10,7 +10,8 @@
       <div class="add-customer-btn">
           <el-button v-if="form.wagonNumberStatus == 1" size="small" @click="revokeWagonNumberfun" type="warning">撤销运输服务</el-button>
           <el-button v-else :disabled="!form.wagonNumberOne" size="small" @click="submitWagonNumberfun" type="success">提交运输服务</el-button>
-        <el-button v-if="detailData.seeDisabled" :disabled="form.wagonNumberStatus == 1" size="small" @click="editHandle" type="primary">编 辑</el-button>
+<!--        :disabled="form.wagonNumberStatus == 1"-->
+        <el-button v-if="detailData.seeDisabled" size="small" @click="editHandle" type="primary">编 辑</el-button>
         <el-button type="primary" size="small" :disabled="!form.id" :loading="saveLoading"
           @click="postMessage">发送消息</el-button>
         <el-button class="el-button--small-yh" type="primary" @click="revokeInGoods" size="small"
@@ -840,6 +841,12 @@ export default {
         this.advantageProjectData = this.form.deliveryFeesList
         this.bankOfDepositData = this.form.deliveryFilesList
         this.configuration.dicData = this.form.corpName
+        let a = this.form.wagonNumberStatus == 1
+        if (!a) {
+          console.log("aaa")
+          this.findObject(this.basicData.column, "wagonNumberOne").disabled = false
+          this.findObject(this.basicData.column, "wagonNumberTwo").disabled = false
+        }
         this.contactsData.forEach(item => {
           // this.form.deliveryAmount += Number(item.deliveryAmount)
           // this.form.totalQuantity += Number(item.actualQuantity)
@@ -1573,8 +1580,8 @@ export default {
       }).finally(() => {
         this.saveLoading = false
       })
-        this.findObject(this.basicData.column, "wagonNumberOne").disabled = false
-        this.findObject(this.basicData.column, "wagonNumberTwo").disabled = false
+        // this.findObject(this.basicData.column, "wagonNumberOne").disabled = false
+        // this.findObject(this.basicData.column, "wagonNumberTwo").disabled = false
     },
       // 提交
       submitWagonNumberfun(){
@@ -1585,7 +1592,7 @@ export default {
           }).then(res=>{
               submitWagonNumber(this.form).then(res=>{
                   this.$message.success('提交运输服务成功');
-                  this.detailData.seeDisabled = true
+                  // this.detailData.seeDisabled = true
                   this.findObject(this.basicData.column, "storageId").disabled = true
                   this.findObject(this.basicData.column, "wagonNumberOne").disabled = true
                   this.findObject(this.basicData.column, "wagonNumberTwo").disabled = true
@@ -1606,6 +1613,9 @@ export default {
                   // this.findObject(this.basicData.column, "wagonNumberOne").disabled = true
                   // this.findObject(this.basicData.column, "wagonNumberTwo").disabled = true
                   this.queryData(this.form.id)
+
+                this.findObject(this.basicData.column, "wagonNumberOne").disabled = false
+                this.findObject(this.basicData.column, "wagonNumberTwo").disabled = false
               })
           })
       },