保存

src/views/exportTrade/customerInquiry/index.vue

@@ -193,15 +193,17 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      }).then(() => {
-        remove(row.id);
-        this.$message({
-          type: "success",
-          message: "删除成功!"
+      })
+        .then(() => {
+          remove(row.id);
+          this.$message({
+            type: "success",
+            message: "删除成功!"
+          });
+        })
+        .finally(() => {
+          this.onLoad(this.page, this.search);
         });
-        this.page.currentPage = 1;
-        this.onLoad(this.page);
-      });
     },
     //查看跳转页面
     beforeOpenPage(row, status) {

src/views/exportTrade/invoice/detailsPage.vue

@@ -288,7 +288,7 @@ export default {
       option: {
         menuBtn: false,
         labelWidth: 100,
-        disabled:false,
+        disabled: false,
         column: [
           {
             label: "客户名称",
@@ -369,17 +369,17 @@ export default {
             span: 8
           },
           {
-            label: "联系人",
+            label: "收货人",
             prop: "arrivalContact",
             span: 8
           },
           {
-            label: "电话",
+            label: "收货电话",
             prop: "arrivalTel",
             span: 8
           },
           {
-            label: "发货地址",
+            label: "收货地址",
             prop: "arrivalAddress",
             span: 8
           },
@@ -750,6 +750,14 @@ export default {
                 this.data = res.data.data.deliveryItemsList;
                 this.orderFeesList = res.data.data.deliveryFeesList;
                 this.orderFilesList = res.data.data.deliveryFilesList;
+                this.oldform = res.data.data;
+                this.olddata = this.deepClone(res.data.data.deliveryItemsList);
+                this.oldorderFeesList = this.deepClone(
+                  res.data.data.deliveryFeesList
+                );
+                this.oldorderFilesList = this.deepClone(
+                  res.data.data.deliveryFilesList
+                );
                 this.$message.success("提交成功");
               });
             });
@@ -771,6 +779,14 @@ export default {
                 this.orderFeesList = res.data.data.deliveryFeesList;
                 this.orderFilesList = res.data.data.deliveryFilesList;
                 this.$message.success("撤销成功");
+                this.oldform = res.data.data;
+                this.olddata = this.deepClone(res.data.data.deliveryItemsList);
+                this.oldorderFeesList = this.deepClone(
+                  res.data.data.deliveryFeesList
+                );
+                this.oldorderFilesList = this.deepClone(
+                  res.data.data.deliveryFilesList
+                );
               });
             });
           }

src/views/exportTrade/purchaseInquiry/detailsPage.vue

@@ -265,7 +265,7 @@ export default {
       option: {
         menuBtn: false,
         labelWidth: 100,
-        disabled:false,
+        disabled: false,
         column: [
           {
             label: "客户名称",
@@ -404,7 +404,11 @@ export default {
       selectionList: [],
       treeDeptId: null,
       itemtypeList: [],
-      reData: null
+      reData: null,
+      oldform: {
+        orderStatus: "录入"
+      },
+      olddata: []
     };
   },
   props: {
@@ -612,17 +616,20 @@ export default {
       this.dialogVisible = !this.dialogVisible;
     },
     getDetail(id) {
-      console.log(id);
       detail(id).then(res => {
         this.form = res.data.data;
         this.data = res.data.data.orderItemsList
           ? res.data.data.orderItemsList
           : [];
         this.configuration.dicData = this.form.corpsName;
+        this.oldform = res.data.data;
+        this.olddata = this.deepClone(
+          res.data.data.orderItemsList ? res.data.data.orderItemsList : []
+        );
       });
     },
     //修改提交触发
-    editCustomer(status) {
+    editCustomer(status, status2) {
       this.$refs["form"].validate((valid, done) => {
         done();
         if (valid) {
@@ -637,6 +644,13 @@ export default {
                 : [];
               this.configuration.dicData = this.form.corpsName;
               this.$message.success("修改成功");
+              this.oldform = res.data.data;
+              this.olddata = this.deepClone(
+                res.data.data.orderItemsList ? res.data.data.orderItemsList : []
+              );
+              if (status2 == "goBack") {
+                this.$emit("goBack");
+              }
             });
           }
           if (status == "submit") {
@@ -650,6 +664,10 @@ export default {
                 : [];
               this.configuration.dicData = this.form.corpsName;
               this.$message.success("提交成功");
+              this.oldform = res.data.data;
+              this.olddata = this.deepClone(
+                res.data.data.orderItemsList ? res.data.data.orderItemsList : []
+              );
             });
           }
         } else {
@@ -659,7 +677,24 @@ export default {
     },
     //返回列表
     backToList() {
-      this.$emit("goBack");
+      if (
+        contrastObj(this.form, this.oldform) ||
+        contrastList(this.data, this.olddata)
+      ) {
+        this.$confirm("数据发生变化未有提交记录, 是否提交?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            this.editCustomer("save", "goBack");
+          })
+          .catch(() => {
+            this.$emit("goBack");
+          });
+      } else {
+        this.$emit("goBack");
+      }
     },
     openReport() {
       this.switchDialog = !this.switchDialog;

src/views/exportTrade/receipt/config/mainList.json

@@ -28,7 +28,7 @@
       "prop": "businessDate",
       "search": true,
       "searchSpan": 8,
-      "index": 4,
+      "index": 2,
       "width": 130,
       "overHidden": true,
       "type": "date",
@@ -87,6 +87,33 @@
       "overHidden": true
     },
     {
+      "label": "发货地址",
+      "prop": "arrivalAddress",
+      "search": true,
+      "searchSpan": 8,
+      "index": 9,
+      "width": 110,
+      "overHidden": true
+    },
+    {
+      "label": "发货人",
+      "prop": "arrivalContact",
+      "search": true,
+      "searchSpan": 8,
+      "index": 10,
+      "width": 110,
+      "overHidden": true
+    },
+    {
+      "label": "发货电话",
+      "prop": "arrivalTel",
+      "search": true,
+      "searchSpan": 8,
+      "index": 11,
+      "width": 110,
+      "overHidden": true
+    },
+    {
       "label": "备注",
       "prop": "deliveryRemarks",
       "search": true,

src/views/exportTrade/receipt/detailsPage.vue

@@ -301,7 +301,7 @@ export default {
       option: {
         menuBtn: false,
         labelWidth: 100,
-        disabled:false,
+        disabled: false,
         column: [
           {
             label: "客户名称",
@@ -380,6 +380,21 @@ export default {
             span: 8
           },
           {
+            label: "发货人",
+            prop: "arrivalContact",
+            span: 8
+          },
+          {
+            label: "发货电话",
+            prop: "arrivalTel",
+            span: 8
+          },
+          {
+            label: "发货地址",
+            prop: "arrivalAddress",
+            span: 8
+          },
+          {
             label: "制单时间",
             prop: "createTime",
             span: 8,
@@ -436,7 +451,13 @@ export default {
       orderFeesList: [],
       orderFilesList: [],
       itemtypeList: [],
-      reData: null
+      reData: null,
+      oldform: {
+        deliveryStatus: "录入"
+      },
+      olddata: [],
+      oldorderFeesList: [],
+      oldorderFilesList: []
     };
   },
   props: {
@@ -672,10 +693,16 @@ export default {
         this.orderFeesList = res.data.data.deliveryFeesList;
         this.orderFilesList = res.data.data.deliveryFilesList;
         this.configuration.dicData = this.form.corpName;
+        this.oldform = res.data.data;
+        this.olddata = this.deepClone(res.data.data.deliveryItemsList);
+        this.oldorderFeesList = this.deepClone(res.data.data.deliveryFeesList);
+        this.oldorderFilesList = this.deepClone(
+          res.data.data.deliveryFilesList
+        );
       });
     },
     //修改提交触发
-    editCustomer(status) {
+    editCustomer(status,status2) {
       this.$refs["form"].validate((valid, done) => {
         done();
         if (valid) {
@@ -703,8 +730,19 @@ export default {
               this.data = res.data.data.deliveryItemsList;
               this.orderFeesList = res.data.data.deliveryFeesList;
               this.orderFilesList = res.data.data.deliveryFilesList;
+              this.oldform = res.data.data;
+              this.olddata = this.deepClone(res.data.data.deliveryItemsList);
+              this.oldorderFeesList = this.deepClone(
+                res.data.data.deliveryFeesList
+              );
+              this.oldorderFilesList = this.deepClone(
+                res.data.data.deliveryFilesList
+              );
               this.configuration.dicData = this.form.corpName;
               this.$message.success(this.form.id ? "修改成功" : "提交成功");
+              if(status2=='goBack'){
+                this.$emit("goBack");
+              }
             });
           }
           if (status == "save") {
@@ -725,6 +763,14 @@ export default {
                 this.orderFilesList = res.data.data.deliveryFilesList;
                 this.configuration.dicData = this.form.corpName;
                 this.$message.success("提交成功");
+                this.oldform = res.data.data;
+                this.olddata = this.deepClone(res.data.data.deliveryItemsList);
+                this.oldorderFeesList = this.deepClone(
+                  res.data.data.deliveryFeesList
+                );
+                this.oldorderFilesList = this.deepClone(
+                  res.data.data.deliveryFilesList
+                );
               });
             });
           }
@@ -746,6 +792,14 @@ export default {
                 this.orderFilesList = res.data.data.deliveryFilesList;
                 this.configuration.dicData = this.form.corpName;
                 this.$message.success("撤销成功");
+                this.oldform = res.data.data;
+                this.olddata = this.deepClone(res.data.data.deliveryItemsList);
+                this.oldorderFeesList = this.deepClone(
+                  res.data.data.deliveryFeesList
+                );
+                this.oldorderFilesList = this.deepClone(
+                  res.data.data.deliveryFilesList
+                );
               });
             });
           }
@@ -756,7 +810,28 @@ export default {
     },
     //返回列表
     backToList() {
-      this.$emit("goBack");
+      let orderFeesList = this.$refs.feeInfo.submitData();
+      let orderFilesList = this.$refs.uploadFile.submitData();
+      if (
+        contrastObj(this.form, this.oldform) ||
+        contrastList(this.data, this.olddata) ||
+        contrastList(orderFeesList, this.oldorderFeesList) ||
+        contrastList(orderFilesList, this.oldorderFilesList)
+      ) {
+        this.$confirm("数据发生变化未有提交记录, 是否提交?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            this.editCustomer("submit","goBack");
+          })
+          .catch(() => {
+            this.$emit("goBack");
+          });
+      } else {
+        this.$emit("goBack");
+      }
     },
     openReport() {
       this.switchDialog = !this.switchDialog;

src/views/exportTrade/salesContract/detailsPage.vue

@@ -729,7 +729,13 @@ export default {
       orderFilesList: [],
       orderItemIds: [],
       itemtypeList: [],
-      reData: null
+      reData: null,
+      oldform: {
+        orderStatus: "录入"
+      },
+      olddata: [],
+      oldorderFeesList: [],
+      oldorderFilesList: []
     };
   },
   props: {
@@ -1031,10 +1037,14 @@ export default {
         this.orderFeesList = res.data.data.orderFeesList;
         this.orderFilesList = res.data.data.orderFilesList;
         this.configuration.dicData = this.form.corpName;
+        this.oldform = res.data.data;
+        this.olddata = this.deepClone(res.data.data.orderItemsList);
+        this.oldorderFeesList = this.deepClone(res.data.data.orderFeesList);
+        this.oldorderFilesList = this.deepClone(res.data.data.orderFilesList);
       });
     },
     //修改提交触发
-    editCustomer() {
+    editCustomer(status) {
       this.$refs["form"].validate((valid, done) => {
         done();
         if (valid) {
@@ -1069,6 +1079,15 @@ export default {
             this.orderFeesList = res.data.data.orderFeesList;
             this.orderFilesList = res.data.data.orderFilesList;
             this.$message.success(this.form.id ? "修改成功" : "提交成功");
+            this.oldform = res.data.data;
+            this.olddata = this.deepClone(res.data.data.orderItemsList);
+            this.oldorderFeesList = this.deepClone(res.data.data.orderFeesList);
+            this.oldorderFilesList = this.deepClone(
+              res.data.data.orderFilesList
+            );
+            if (status == "goBack") {
+              this.$emit("goBack");
+            }
           });
         } else {
           return false;
@@ -1077,7 +1096,28 @@ export default {
     },
     //返回列表
     backToList() {
-      this.$emit("goBack");
+      let orderFeesList = this.$refs.feeInfo.submitData();
+      let orderFilesList = this.$refs.uploadFile.submitData();
+      if (
+        contrastObj(this.form, this.oldform) ||
+        contrastList(this.data, this.olddata) ||
+        contrastList(orderFeesList, this.oldorderFeesList) ||
+        contrastList(orderFilesList, this.oldorderFilesList)
+      ) {
+        this.$confirm("数据发生变化未有提交记录, 是否提交?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            this.editCustomer("goBack");
+          })
+          .catch(() => {
+            this.$emit("goBack");
+          });
+      } else {
+        this.$emit("goBack");
+      }
     },
     openReport() {
       this.switchDialog = !this.switchDialog;

src/views/exportTrade/shippingInquiry/detailsPage.vue

@@ -16,7 +16,7 @@
           type="primary"
           :disabled="disabled && detailData.status == 1"
           @click="editCustomer('submit')"
-          v-if="form.id&&detailData.status != 1"
+          v-if="form.id && detailData.status != 1"
           >确认修改
         </el-button>
         <el-button
@@ -325,7 +325,10 @@ export default {
       selectionList: [],
       treeDeptId: null,
       orderFeesList: [],
-      freightData: []
+      freightData: [],
+      oldform: {},
+      olddata: [],
+      oldfreightData: []
     };
   },
   props: {
@@ -472,39 +475,30 @@ export default {
       detail(id).then(res => {
         this.form = res.data.data;
         this.data = res.data.data.itemsVOList ? res.data.data.itemsVOList : [];
-        this.orderFeesList = res.data.data.orderFeesList
-          ? res.data.data.orderFeesList
-          : [];
         this.freightData = res.data.data.orderFreightList
           ? res.data.data.orderFreightList
           : [];
         this.configuration.dicData = this.form.corpsName;
+        this.oldform = res.data.data;
+        this.olddata = this.deepClone(
+          res.data.data.itemsVOList ? res.data.data.itemsVOList : []
+        );
+        this.oldfreightData = this.deepClone(
+          res.data.data.orderFreightList ? res.data.data.orderFreightList : []
+        );
       });
     },
     addFreight() {
       this.freightData.push({ $cellEdit: true });
     },
     //修改提交触发
-    editCustomer(status) {
+    editCustomer(status, status2) {
       this.$refs["form"].validate((valid, done) => {
         done();
         if (valid) {
-          let orderFeesList = this.$refs.feeInfo.submitData();
-          for (let i = 0; i < orderFeesList.length; i++) {
-            if (orderFeesList[i].corpId == null) {
-              return this.$message.error(`请输入第${i + 1}行的结算中心`);
-            }
-            if (orderFeesList[i].price == 0) {
-              return this.$message.error(`请正确输入第${i + 1}行的价格`);
-            }
-            if (orderFeesList[i].quantity == 0) {
-              return this.$message.error(`请正确输入第${i + 1}行的数量`);
-            }
-          }
           if (status == "submit") {
             submit({
               id: this.form.id,
-              orderFeesList: orderFeesList,
               orderFreightList: this.freightData
             }).then(res => {
               this.$message.success("修改成功");
@@ -512,19 +506,27 @@ export default {
               this.data = res.data.data.itemsVOList
                 ? res.data.data.itemsVOList
                 : [];
-              this.orderFeesList = res.data.data.orderFeesList
-                ? res.data.data.orderFeesList
-                : [];
               this.freightData = res.data.data.orderFreightList
                 ? res.data.data.orderFreightList
                 : [];
               this.configuration.dicData = this.form.corpsName;
+              this.oldform = res.data.data;
+              this.olddata = this.deepClone(
+                res.data.data.itemsVOList ? res.data.data.itemsVOList : []
+              );
+              this.oldfreightData = this.deepClone(
+                res.data.data.orderFreightList
+                  ? res.data.data.orderFreightList
+                  : []
+              );
+              if (status2 == "goBack") {
+                this.$emit("goBack");
+              }
             });
           }
           if (status == "fix") {
             commit({
               id: this.form.id,
-              orderFeesList: orderFeesList,
               orderFreightList: this.freightData
             }).then(res => {
               this.$message.success("提交成功");
@@ -532,13 +534,19 @@ export default {
               this.data = res.data.data.itemsVOList
                 ? res.data.data.itemsVOList
                 : [];
-              this.orderFeesList = res.data.data.orderFeesList
-                ? res.data.data.orderFeesList
-                : [];
               this.freightData = res.data.data.orderFreightList
                 ? res.data.data.orderFreightList
                 : [];
               this.configuration.dicData = this.form.corpsName;
+              this.oldform = res.data.data;
+              this.olddata = this.deepClone(
+                res.data.data.itemsVOList ? res.data.data.itemsVOList : []
+              );
+              this.oldfreightData = this.deepClone(
+                res.data.data.orderFreightList
+                  ? res.data.data.orderFreightList
+                  : []
+              );
             });
           }
         } else {
@@ -548,7 +556,25 @@ export default {
     },
     //返回列表
     backToList() {
-      this.$emit("goBack");
+      if (
+        contrastObj(this.form, this.oldform) ||
+        contrastList(this.data, this.olddata) ||
+        contrastList(this.freightData, this.oldfreightData)
+      ) {
+        this.$confirm("数据发生变化未有提交记录, 是否提交?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            this.editCustomer("submit", "goBack");
+          })
+          .catch(() => {
+            this.$emit("goBack");
+          });
+      } else {
+        this.$emit("goBack");
+      }
     },
     onClose(val) {
       this.switchDialog = val;