业务锁

src/views/businessManagement/deliveryNotice/configuration/customerContact.json

@@ -33,6 +33,10 @@
     {
       "name": "invoiceWeight",
       "type": "sum"
+    },
+    {
+      "name": "purchaseTotalAmount",
+      "type": "sum"
     }
   ],
   "column":[

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -230,6 +230,7 @@
           itemType="发货"
           feeUrl="/blade-deliver-goods/deliveryfees/update"
           @beforeFinance="beforeFinance"
+          :corpId="form.corpId"
         />
 <!--        <containerTitle title="费用明细"></containerTitle>-->
 <!--        <basic-container style="margin-bottom: 10px">-->

src/views/businessManagement/deliveryNotice/index.vue

@@ -182,7 +182,7 @@ export default {
     })
   },
   activated() {
-    this.isShow = true;
+    // this.isShow = true;
     setTimeout(() => {
       if (this.$route.query.form) {
         this.detailData = {

src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -170,6 +170,7 @@
           optionType="GN"
           itemType="收货"
           feeUrl="/blade-deliver-goods/deliveryfees/update"
+          :corpId="form.corpId"
         />
 <!--        <containerTitle title="费用明细"></containerTitle>-->
 <!--        <basic-container style="margin-bottom: 10px">-->

src/views/businessManagement/receipt/index.vue

@@ -184,7 +184,7 @@ export default {
     })
   },
   activated() {
-    this.isShow = true;
+    // this.isShow = true;
     setTimeout(() => {
       if (this.$route.query.form) {
         this.detailData = {

src/views/financialManagement/paymentSettle/paymentSettle.vue

@@ -135,11 +135,6 @@
           billId: row.id,
           no: localStorage.getItem('browserID')
         }
-        this.inDetailsKey(this.$route.name, {
-          moduleName: 'ff',
-          tableName: 'finance_settlement',
-          billId: row.id,
-        })
         this.checkLock(data).then(res => {
           if (res.data.code == 200) {
             this.detailData = {

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -602,11 +602,11 @@
               settlementType:1
             }
 // 如果有id解锁，没有跳过
-            this.form.id && this.unLock({moduleName: 'ff',tableName: 'finance_settlement', billId: this.form.id})
+//             this.form.id && this.unLock({moduleName: 'ff',tableName: 'finance_settlement', billId: this.form.id})
             saveOrEdit(params).then(res=>{
               this.$message.success("操作成功!")
-              this.detailData.disabled = true
-              this.editDisable = true
+              // this.detailData.disabled = true
+              // this.editDisable = true
               this.afterEcho(res.data.data)
               done();
             }).finally(()=>{
@@ -682,12 +682,12 @@
           }).then(() => {
             this.saveSettlement()
           }).catch(()=>{
-            this.form.id && this.unLock({moduleName: 'ff',tableName: 'finance_settlement', billId: this.form.id})
+            !this.editDisable && this.form.id && this.unLock({moduleName: 'ff',tableName: 'finance_settlement', billId: this.form.id})
             this.$emit("goBack");
             this.leaveDetailsKey(this.$route.name)
           })
         }else{
-          this.form.id && this.unLock({moduleName: 'ff',tableName: 'finance_settlement', billId: this.form.id})
+          !this.editDisable && this.form.id && this.unLock({moduleName: 'ff',tableName: 'finance_settlement', billId: this.form.id})
           this.$emit("goBack");
           this.leaveDetailsKey(this.$route.name)
         }
@@ -712,6 +712,11 @@
           if (res.data.code == 200) {
             this.onLock(data).then(response => {
             })
+            this.inDetailsKey(this.$route.name, {
+              moduleName: 'ff',
+              tableName: 'finance_settlement',
+              billId: this.form.id,
+            })
             this.detailData.disabled = false;
             this.editDisable = false;
             this.buttonLoading = true

src/views/financialManagement/receiptSettle/receiptSettle.vue

@@ -122,11 +122,6 @@
           billId: row.id,
           no: localStorage.getItem('browserID')
         }
-        this.inDetailsKey(this.$route.name, {
-          moduleName: 'sf',
-          tableName: 'finance_settlement',
-          billId: row.id,
-        })
         this.checkLock(data).then(res => {
           if (res.data.code == 200) {
             this.detailData = {

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -620,11 +620,11 @@
             }
 
             // 如果有id解锁，没有跳过
-            this.form.id && this.unLock({moduleName: 'sf',tableName: 'finance_settlement', billId: this.form.id})
+            // this.form.id && this.unLock({moduleName: 'sf',tableName: 'finance_settlement', billId: this.form.id})
             saveOrEdit(params).then(res=>{
               this.$message.success("操作成功!")
-              this.detailData.disabled = true
-              this.editDisable = true
+              // this.detailData.disabled = true
+              // this.editDisable = true
               this.afterEcho(res.data.data)
             }).finally(()=>{
               this.buttonLoading = false
@@ -699,12 +699,12 @@
           }).then(() => {
             this.saveSettlement()
           }).catch(()=>{
-            this.form.id && this.unLock({moduleName: 'sf',tableName: 'finance_settlement', billId: this.form.id})
+            !this.editDisable && this.form.id && this.unLock({moduleName: 'sf',tableName: 'finance_settlement', billId: this.form.id})
             this.$emit("goBack");
             this.leaveDetailsKey(this.$route.name)
           })
         }else{
-          this.form.id && this.unLock({moduleName: 'sf',tableName: 'finance_settlement', billId: this.form.id})
+          !this.editDisable && this.form.id && this.unLock({moduleName: 'sf',tableName: 'finance_settlement', billId: this.form.id})
           this.$emit("goBack");
           this.leaveDetailsKey(this.$route.name)
         }
@@ -739,6 +739,11 @@
           if (res.data.code == 200) {
             this.onLock(data).then(response => {
             })
+            this.inDetailsKey(this.$route.name, {
+              moduleName: 'sf',
+              tableName: 'finance_settlement',
+              billId: this.form.id,
+            })
             this.detailData.disabled = false;
             this.editDisable = false;
             this.buttonLoading = true