qukaidi пре 2 година
родитељ
комит
091f335f33

+ 2 - 2
src/views/dealer/sales/detail.vue

@@ -818,7 +818,7 @@ export default {
           : {
             stock: 0,
             balanceAmount: 0,
-            balanceQuantity: 0
+            surplusRouteQuantity: 0
           };
         this.$set(
           form,
@@ -829,7 +829,7 @@ export default {
               : (Number(a.inAmount) / Number(a.inQuantity)).toFixed(2)
             : 0
         );
-        this.$set(form, "stock", a.balanceQuantity);
+        this.$set(form, "stock", a.surplusRouteQuantity);
       })
         .finally(() => {
           this.goodsLoading = false

+ 25 - 17
src/views/financialManagement/paymentRequest/paymentRequestDetails.vue

@@ -494,7 +494,9 @@ export default {
       cancelCheck(this.form.id).then(res => {
         if (res.data.success) {
           this.$message.success("操作成功!")
-          this.afterEcho(res.data.data)
+          getDetails(this.form.id).then(res => {
+            this.afterEcho(res.data.data)
+          })
         }
       }).finally(() => {
         this.buttonLoading = false
@@ -563,24 +565,30 @@ export default {
     afterEcho(data) {
       this.form = data;
       this.oldForm = Object.assign({}, data);
-
-      this.checkDisabled = data.checkStatus === "录入" ? false : true;
-      this.recallDisabled = data.checkStatus === "审批提交" ? true : false;
-
-      this.option.column.forEach(item => {
-        if (item.prop == "remark") {
-          this.$set(item, "disabled", (this.auditDisabled || false))
-        } else if (item.prop == "createUserName" || item.prop == "createTime" || item.prop == "sysNo") {
-          this.$set(item, "disabled", true)
-        } else {
-          this.$set(item, "disabled", this.checkDisabled)
+      console.log(data)
+      if (data) {
+        console.log(1)
+        this.checkDisabled = data.checkStatus === "录入" ? false : true;
+        this.recallDisabled = data.checkStatus === "审批提交" ? true : false;
+        this.option.column.forEach(item => {
+          if (item.prop == "remark") {
+            this.$set(item, "disabled", (this.auditDisabled || false))
+          } else if (item.prop == "createUserName" || item.prop == "createTime" || item.prop == "sysNo") {
+            this.$set(item, "disabled", true)
+          } else {
+            this.$set(item, "disabled", this.checkDisabled)
+          }
+        })
+        if (data.itemsList) {
+          this.dataList = data.itemsList
+          this.oldDataList = this.deepClone(data.itemsList)
         }
-      })
-
-      if (data.itemsList) {
-        this.dataList = data.itemsList
-        this.oldDataList = this.deepClone(data.itemsList)
+      } else {
+        this.checkDisabled = true;
+        this.recallDisabled = false;
+        this.$set(this.form, "checkStatus", "录入")
       }
+
     },
     async openEdit() {
       //标签页保存key