Bladeren bron

国内贸易新增新老数据对比

lichao 3 jaren geleden
bovenliggende
commit
4819764e8e

+ 27 - 8
src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -275,6 +275,7 @@ import {getDeptLazyTree,getDeptLazyTreeTwo, customerList} from "@/api/basicData/
 import {customerList as wareHouseType} from "@/api/basicData/basicStorageType"
 import {customerList as selectWareHouse} from "@/api/basicData/basicStorageDesc"
 import {selectGoodsNum} from "@/api/basicData/inventoryAccount"
+import { contrastObj, contrastList } from "@/util/contrastData";
 
 export default {
   name: "detailsPage",
@@ -526,6 +527,12 @@ export default {
       warehouseName: [],
       maxFeeNum: 0,
       maxGoodsNum: 0,
+      oldForm: {
+        orderStatus: "录入"
+      },
+      oldGoodsList: [],
+      oldFeesList: [],
+      oldUploadList: [],
     }
   },
   //初始化查询
@@ -670,6 +677,10 @@ export default {
             return b > a? b: a;
           })
         }
+        this.oldForm = Object.assign({}, this.form)
+        this.oldGoodsList = this.oldGoodsList.concat(this.contactsData)
+        this.oldFeesList = this.oldFeesList.concat(this.advantageProjectData)
+        this.oldUploadList = this.oldUploadList.concat(this.bankOfDepositData)
         if (isCopy) {
           delete this.form.sysNo
           delete this.form.id
@@ -1067,15 +1078,23 @@ export default {
     },
     //返回列表
     backToList() {
-      this.$confirm("是否保存当前页面?", "提示", {
-        confirmButtonText: "保存",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {
-        this.editCustomer(true)
-      }).catch(() => {
+      if (contrastObj(this.form, this.oldForm) ||
+        contrastList(this.contactsData, this.oldGoodsList) ||
+        contrastList(this.advantageProjectData, this.oldFeesList) ||
+        contrastList(this.bankOfDepositData, this.oldUploadList)
+      ) {
+        this.$confirm("数据发生变化未有提交记录, 是否提交?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.editCustomer(true)
+        }).catch(() => {
+          this.$emit("goBack");
+        })
+      } else {
         this.$emit("goBack");
-      })
+      }
     },
     // 确认发货
     sendOutGoods() {

+ 27 - 8
src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -411,6 +411,7 @@ import commodity from "./configuration/commodity.json"
 import optionTwoCost from "./configuration/mainListCost.json"
 import {getDeptLazyTree, customerList} from "@/api/basicData/basicFeesDesc";
 import {selectGoodsNum} from "@/api/basicData/inventoryAccount"
+import { contrastObj, contrastList } from "@/util/contrastData";
 
 export default {
   name: "detailsPage",
@@ -625,6 +626,12 @@ export default {
       maxFeeNum: 0,
       maxGoodsNum: 0,
       selection: [],
+      oldForm: {
+        orderStatus: "录入"
+      },
+      oldGoodsList: [],
+      oldFeesList: [],
+      oldUploadList: [],
     }
   },
   //初始化查询
@@ -708,6 +715,10 @@ export default {
             return b > a? b: a;
           })
         }
+        this.oldForm = Object.assign({}, this.form)
+        this.oldGoodsList = this.oldGoodsList.concat(this.contactsData)
+        this.oldFeesList = this.oldFeesList.concat(this.advantageProjectData)
+        this.oldUploadList = this.oldUploadList.concat(this.bankOfDepositData)
         if (isCopy) {
           delete this.form.sysNo;
           delete this.form.id
@@ -1150,15 +1161,23 @@ export default {
     },
     //返回列表
     backToList() {
-      this.$confirm("是否保存当前页面?", "提示", {
-        confirmButtonText: "保存",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {
-        this.editCustomer(true)
-      }).catch(() => {
+      if (contrastObj(this.form, this.oldForm) ||
+        contrastList(this.contactsData, this.oldGoodsList) ||
+        contrastList(this.advantageProjectData, this.oldFeesList) ||
+        contrastList(this.bankOfDepositData, this.oldUploadList)
+      ) {
+        this.$confirm("数据发生变化未有提交记录, 是否提交?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.editCustomer(true)
+        }).catch(() => {
+          this.$emit("goBack");
+        })
+      } else {
         this.$emit("goBack");
-      })
+      }
     },
     // 保存列设置
     async saveColumn(name) {

+ 27 - 8
src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -276,6 +276,7 @@ import {getDeptLazyTree, customerList,getDeptLazyTreeTwo} from "@/api/basicData/
 import {customerList as wareHouseType} from "@/api/basicData/basicStorageType"
 import {customerList as selectWareHouse} from "@/api/basicData/basicStorageDesc"
 import {selectGoodsNum} from "@/api/basicData/inventoryAccount"
+import { contrastObj, contrastList } from "@/util/contrastData";
 
 export default {
   name: "detailsPage",
@@ -529,6 +530,12 @@ export default {
       // 费用信息排序的最大值
       maxFeeNum: 0,
       maxGoodsNum: 0,
+      oldForm: {
+        orderStatus: "录入"
+      },
+      oldGoodsList: [],
+      oldFeesList: [],
+      oldUploadList: [],
     }
   },
   //初始化查询
@@ -667,6 +674,10 @@ export default {
             return b > a? b: a;
           })
         }
+        this.oldForm = Object.assign({}, this.form)
+        this.oldGoodsList = this.oldGoodsList.concat(this.contactsData)
+        this.oldFeesList = this.oldFeesList.concat(this.advantageProjectData)
+        this.oldUploadList = this.oldUploadList.concat(this.bankOfDepositData)
         if (isCopy) {
           delete this.form.id
           delete this.form.sysNo
@@ -1113,15 +1124,23 @@ export default {
     },
     //返回列表
     backToList() {
-      this.$confirm("是否保存当前页面?", "提示", {
-        confirmButtonText: "保存",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {
-        this.editCustomer(true)
-      }).catch(() => {
+      if (contrastObj(this.form, this.oldForm) ||
+        contrastList(this.contactsData, this.oldGoodsList) ||
+        contrastList(this.advantageProjectData, this.oldFeesList) ||
+        contrastList(this.bankOfDepositData, this.oldUploadList)
+      ) {
+        this.$confirm("数据发生变化未有提交记录, 是否提交?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.editCustomer(true)
+        }).catch(() => {
+          this.$emit("goBack");
+        })
+      } else {
         this.$emit("goBack");
-      })
+      }
     },
     // 保存列设置
     async saveColumn(name) {

+ 27 - 13
src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -478,6 +478,7 @@ import {
 } from "@/api/basicData/basicFeesDesc";
 import _ from "lodash";
 import option from "./configuration/mainList.json";
+import { contrastObj, contrastList } from "@/util/contrastData";
 
 export default {
   name: "detailsPage",
@@ -999,6 +1000,12 @@ export default {
       // 费用信息排序的最大值
       maxFeeNum: 0,
       maxGoodsNum: 0,
+      oldForm: {
+        orderStatus: "录入"
+      },
+      oldGoodsList: [],
+      oldFeesList: [],
+      oldUploadList: [],
     }
   },
   //初始化查询
@@ -1099,6 +1106,10 @@ export default {
             return b > a? b: a;
           })
         }
+        this.oldForm = Object.assign({}, this.form)
+        this.oldGoodsList = this.oldGoodsList.concat(this.contactsData)
+        this.oldFeesList = this.oldFeesList.concat(this.advantageProjectData)
+        this.oldUploadList = this.oldUploadList.concat(this.bankOfDepositData)
         if (isCopy) {
           this.$set(this.form, 'orderStatus', '录入')
           delete this.form.id
@@ -1650,20 +1661,23 @@ export default {
     },
     //返回列表
     backToList() {
-      this.$confirm("是否保存当前页面?", "提示", {
-        confirmButtonText: "保存",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {
-        this.editCustomer(true)
-      }).catch(() => {
-        // this.$router.$avueRouter.closeTag();
-        // this.$router.push({
-        //   path: '/businessManagement/salesOrder/index',
-        //   query: {}
-        // });
+      if (contrastObj(this.form, this.oldForm) ||
+        contrastList(this.contactsData, this.oldGoodsList) ||
+        contrastList(this.advantageProjectData, this.oldFeesList) ||
+        contrastList(this.bankOfDepositData, this.oldUploadList)
+      ) {
+        this.$confirm("数据发生变化未有提交记录, 是否提交?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.editCustomer(true)
+        }).catch(() => {
+          this.$emit("goBack");
+        })
+      } else {
         this.$emit("goBack");
-      })
+      }
     },
     // 保存列设置
     async saveColumn(name) {