Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -1639,6 +1639,7 @@ export default {
             if (isBack) {
               //成功关闭此页面回到列表页
               this.$emit("goBack");
+              this.leaveDetailsKey(this.$route.name)
             } else {
               this.saveActives = ''
               this.queryData(res.data.data.id, false, type)
@@ -1680,10 +1681,14 @@ export default {
         }).then(() => {
           this.editCustomer(true)
         }).catch(() => {
+          this.form.id && this.unLock({moduleName: 'fh',tableName: 'business_delivery', billId: this.form.id})
           this.$emit("goBack");
+          this.leaveDetailsKey(this.$route.name)
         })
       } else {
+        this.form.id && this.unLock({moduleName: 'fh',tableName: 'business_delivery', billId: this.form.id})
         this.$emit("goBack");
+        this.leaveDetailsKey(this.$route.name)
       }
     },
     // 确认发货
@@ -1992,7 +1997,8 @@ export default {
         moduleName: 'fh',
         tableName: 'business_delivery',
         billId: this.form.id,
-        no: localStorage.getItem('browserID')
+        no: localStorage.getItem('browserID'),
+        billNo: this.form.sysNo
       }
       this.saveLoading = true
       this.checkLock(data).then(res => {

src/views/businessManagement/deliveryNotice/index.vue

@@ -255,6 +255,11 @@ export default {
         billId: row.id,
         no: localStorage.getItem('browserID')
       }
+      this.inDetailsKey(this.$route.name, {
+        moduleName: 'fh',
+        tableName: 'business_delivery',
+        billId: row.id,
+      })
       this.checkLock(data).then(res => {
         if (res.data.code == 200) {
           this.onLock(data).then(response => {

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -1533,6 +1533,7 @@ export default {
             if (isBack) {
               //成功关闭此页面回到列表页
               this.$emit("goBack");
+              this.leaveDetailsKey(this.$route.name)
             } else {
               this.queryData(res.data.data)
             }
@@ -1663,10 +1664,14 @@ export default {
         }).then(() => {
           this.editCustomer(true)
         }).catch(() => {
+          this.form.id && this.unLock({moduleName: 'cg',tableName: 'business_order', billId: this.form.id})
           this.$emit("goBack");
+          this.leaveDetailsKey(this.$route.name)
         })
       } else {
+        this.form.id && this.unLock({moduleName: 'cg',tableName: 'business_order', billId: this.form.id})
         this.$emit("goBack");
+        this.leaveDetailsKey(this.$route.name)
       }
     },
     // 保存列设置
@@ -1832,7 +1837,8 @@ export default {
         moduleName: 'cg',
         tableName: 'business_order',
         billId: this.form.id,
-        no: localStorage.getItem('browserID')
+        no: localStorage.getItem('browserID'),
+        billNo: this.form.orderNo
       }
       this.saveLoading = true
       this.checkLock(data).then(res => {

src/views/businessManagement/purchaseOrder/index.vue

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

src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -1358,6 +1358,7 @@ export default {
             if (isBack) {
               //成功关闭此页面回到列表页
               this.$emit("goBack");
+              this.leaveDetailsKey(this.$route.name)
             } else {
               this.queryData(res.data.data.id)
             }
@@ -1396,10 +1397,14 @@ export default {
         }).then(() => {
           this.editCustomer(true)
         }).catch(() => {
+          this.form.id && this.unLock({moduleName: 'sh',tableName: 'business_delivery', billId: this.form.id})
           this.$emit("goBack");
+          this.leaveDetailsKey(this.$route.name)
         })
       } else {
+        this.form.id && this.unLock({moduleName: 'sh',tableName: 'business_delivery', billId: this.form.id})
         this.$emit("goBack");
+        this.leaveDetailsKey(this.$route.name)
       }
     },
     // 保存列设置
@@ -1462,7 +1467,8 @@ export default {
         moduleName: 'sh',
         tableName: 'business_delivery',
         billId: this.form.id,
-        no: localStorage.getItem('browserID')
+        no: localStorage.getItem('browserID'),
+        billNo: this.form.sysNo
       }
       this.saveLoading = true
       this.checkLock(data).then(res => {

src/views/businessManagement/receipt/index.vue

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

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -2399,7 +2399,6 @@ export default {
             this.$set(this.tableData[item], 'purchaseAmount', '0')
           }
         })
-        // debugger
         selectGoodsNum({
           goodsId: this.tableData[item].id,
           itemType: this.tableData[item].typeno,
@@ -2900,6 +2899,7 @@ export default {
             if (isBack) {
               //成功关闭此页面回到列表页
               this.$emit("goBack");
+              this.leaveDetailsKey(this.$route.name)
             } else {
               this.saveActives = ''
               this.queryData(res.data.data.id)
@@ -3016,7 +3016,6 @@ export default {
       let getGoodsList = []
       let getGiftList = []
       let getFeeList = this.$refs.feeInfo.submitData()
-      debugger
       if (this.goodsActives == 'gift') {
         getGiftList = this.goodsShowData
         getGoodsList = this.contactsData
@@ -3037,10 +3036,14 @@ export default {
         }).then(() => {
           this.editCustomer(true)
         }).catch(() => {
+          this.form.id && this.unLock({moduleName: 'xs',tableName: 'business_order', billId: this.form.id})
           this.$emit("goBack");
+          this.leaveDetailsKey(this.$route.name)
         })
       } else {
+        this.form.id && this.unLock({moduleName: 'xs',tableName: 'business_order', billId: this.form.id})
         this.$emit("goBack");
+        this.leaveDetailsKey(this.$route.name)
       }
     },
     // 保存列设置
@@ -3324,7 +3327,8 @@ export default {
         moduleName: 'xs',
         tableName: 'business_order',
         billId: this.form.id,
-        no: localStorage.getItem('browserID')
+        no: localStorage.getItem('browserID'),
+        billNo: this.form.orderNo
       }
       this.saveLoading = true
       this.checkLock(data).then(res => {

src/views/businessManagement/salesOrder/index.vue

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

src/views/financialManagement/paymentSettle/paymentSettle.vue

@@ -135,6 +135,11 @@
           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

@@ -578,6 +578,7 @@
             })
             if(status === true){
               this.$emit("goBack");
+              this.leaveDetailsKey(this.$route.name)
             }
           }
         })
@@ -681,10 +682,14 @@
           }).then(() => {
             this.saveSettlement()
           }).catch(()=>{
+            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.$emit("goBack");
+          this.leaveDetailsKey(this.$route.name)
         }
       },
       // 溢付款更改时
@@ -700,7 +705,8 @@
           moduleName: 'ff',
           tableName: 'finance_settlement',
           billId: this.form.id,
-          no: localStorage.getItem('browserID')
+          no: localStorage.getItem('browserID'),
+          billNo: this.form.srcOrderno
         }
         this.checkLock(data).then(res => {
           if (res.data.code == 200) {

src/views/financialManagement/receiptSettle/receiptSettle.vue

@@ -122,6 +122,11 @@
           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

@@ -594,6 +594,7 @@
             })
             if(status === true){
               this.$emit("goBack");
+              this.leaveDetailsKey(this.$route.name)
             }
           }
         })
@@ -698,10 +699,14 @@
           }).then(() => {
             this.saveSettlement()
           }).catch(()=>{
+            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.$emit("goBack");
+          this.leaveDetailsKey(this.$route.name)
         }
       },
       // 溢付款更改时
@@ -727,7 +732,8 @@
           moduleName: 'sf',
           tableName: 'finance_settlement',
           billId: this.form.id,
-          no: localStorage.getItem('browserID')
+          no: localStorage.getItem('browserID'),
+          billNo: this.form.srcOrderno
         }
         this.checkLock(data).then(res => {
           if (res.data.code == 200) {