返回列表判断修改

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -1106,7 +1106,7 @@ export default {
         if (type == '发货') {
           this.$nextTick(() => {
             this.form.deliveryItemsList = this.contactsData.concat(this.giftData)
-            this.form.deliveryFeesList = this.advantageProjectData
+            this.form.deliveryFeesList = this.$refs.feeInfo.submitData()
             this.form.deliveryFilesList = this.bankOfDepositData
             if (typeof this.form.corpsTypeId == 'object') {
               this.form.corpsTypeId = this.form.corpsTypeId.join(",")
@@ -1604,9 +1604,16 @@ export default {
     },
     //返回列表
     backToList() {
+      let getGoodsList = []
+      let getFeeList = this.$refs.feeInfo.submitData()
+      if (this.goodsShowData.findIndex(item => item.goodType == 0) == -1) {
+        getGoodsList = this.goodsShowData.concat(this.contactsData)
+      } else {
+        getGoodsList = this.goodsShowData.concat(this.giftData)
+      }
       if (contrastObj(this.form, this.oldForm) ||
-        contrastList(this.goodsShowData, this.oldGoodsList) ||
-        contrastList(this.advantageProjectData, this.oldFeesList) ||
+        contrastList(getGoodsList, this.oldGoodsList) ||
+        contrastList(getFeeList, this.oldFeesList) ||
         contrastList(this.bankOfDepositData, this.oldUploadList)
       ) {
         this.$confirm("数据发生变化未有提交记录, 是否提交?", "提示", {
@@ -1629,9 +1636,16 @@ export default {
           if (this.contactsData.length == 0) {
             return this.$message.error('商品信息为空')
           }
+          let getGoodsList = []
+          let getFeeList = this.$refs.feeInfo.submitData()
+          if (this.goodsShowData.findIndex(item => item.goodType == 0) == -1) {
+            getGoodsList = this.goodsShowData.concat(this.contactsData)
+          } else {
+            getGoodsList = this.goodsShowData.concat(this.giftData)
+          }
           if (contrastObj(this.form, this.oldForm) ||
-            contrastList(this.goodsShowData, this.oldGoodsList) ||
-            contrastList(this.advantageProjectData, this.oldFeesList) ||
+            contrastList(getGoodsList, this.oldGoodsList) ||
+            contrastList(getFeeList, this.oldFeesList) ||
             contrastList(this.bankOfDepositData, this.oldUploadList)
           ) {
             this.$confirm("数据发生变化未有提交记录, 是否保存?", "提示", {
@@ -1650,7 +1664,7 @@ export default {
             } else {
               this.form.deliveryItemsList = this.goodsShowData.concat(this.giftData)
             }
-            this.form.deliveryFeesList = this.advantageProjectData
+            this.form.deliveryFeesList = this.$refs.feeInfo.submitData()
             this.form.deliveryFilesList = this.bankOfDepositData
             if (typeof this.form.corpsTypeId == 'object') {
               this.form.corpsTypeId = this.form.corpsTypeId.join(",")
@@ -1679,7 +1693,7 @@ export default {
           } else {
             this.form.deliveryItemsList = this.goodsShowData.concat(this.giftData)
           }
-          this.form.deliveryFeesList = this.advantageProjectData
+          this.form.deliveryFeesList = this.$refs.feeInfo.submitData()
           this.form.deliveryFilesList = this.bankOfDepositData
           if (typeof this.form.corpsTypeId == 'object') {
             this.form.corpsTypeId = this.form.corpsTypeId.join(",")
@@ -1699,9 +1713,16 @@ export default {
     },
     // 确认到货
     confirmArrival() {
+      let getGoodsList = []
+      let getFeeList = this.$refs.feeInfo.submitData()
+      if (this.goodsShowData.findIndex(item => item.goodType == 0) == -1) {
+        getGoodsList = this.goodsShowData.concat(this.contactsData)
+      } else {
+        getGoodsList = this.goodsShowData.concat(this.giftData)
+      }
       if (contrastObj(this.form, this.oldForm) ||
-        contrastList(this.goodsShowData, this.oldGoodsList) ||
-        contrastList(this.advantageProjectData, this.oldFeesList) ||
+        contrastList(getGoodsList, this.oldGoodsList) ||
+        contrastList(getFeeList, this.oldFeesList) ||
         contrastList(this.bankOfDepositData, this.oldUploadList)
       ) {
         this.$confirm("数据发生变化未有提交记录, 是否保存?", "提示", {

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -1632,12 +1632,16 @@ export default {
     },
     // 生成采购单
     saveSell() {
-      // if (!this.form.id) {
-      //   return this.$message.error("此单据没有提交记录，请先提交");
-      // }
+      let getGoodsList = []
+      let getFeeList = this.$refs.feeInfo.submitData()
+      if (this.goodsShowData.findIndex(item => item.goodType == 0) == -1) {
+        getGoodsList = this.goodsShowData.concat(this.contactsData)
+      } else {
+        getGoodsList = this.goodsShowData.concat(this.giftData)
+      }
       if (contrastObj(this.form, this.oldForm) ||
-        contrastList(this.contactsData, this.oldGoodsList) ||
-        contrastList(this.advantageProjectData, this.oldFeesList) ||
+        contrastList(getGoodsList, this.oldGoodsList) ||
+        contrastList(getFeeList, this.oldFeesList) ||
         contrastList(this.bankOfDepositData, this.oldUploadList)
       ) {
         this.$confirm("数据发生变化未有提交记录, 是否保存?", "提示", {
@@ -1791,10 +1795,16 @@ export default {
     },
     //生成发货单
     async generateShipmentD() {
-      let lsit = []
+      let getGoodsList = []
+      let getFeeList = this.$refs.feeInfo.submitData()
+      if (this.goodsShowData.findIndex(item => item.goodType == 0) == -1) {
+        getGoodsList = this.goodsShowData.concat(this.contactsData)
+      } else {
+        getGoodsList = this.goodsShowData.concat(this.giftData)
+      }
       if (contrastObj(this.form, this.oldForm) ||
-        contrastList(this.contactsData, this.oldGoodsList) ||
-        contrastList(this.advantageProjectData, this.oldFeesList) ||
+        contrastList(getGoodsList, this.oldGoodsList) ||
+        contrastList(getFeeList, this.oldFeesList) ||
         contrastList(this.bankOfDepositData, this.oldUploadList)
       ) {
         this.$confirm("数据发生变化未有提交记录, 是否保存?", "提示", {
@@ -1832,9 +1842,16 @@ export default {
     },
     // 生成结算
     applySettlement(type) {
+      let getGoodsList = []
+      let getFeeList = this.$refs.feeInfo.submitData()
+      if (this.goodsShowData.findIndex(item => item.goodType == 0) == -1) {
+        getGoodsList = this.goodsShowData.concat(this.contactsData)
+      } else {
+        getGoodsList = this.goodsShowData.concat(this.giftData)
+      }
       if (contrastObj(this.form, this.oldForm) ||
-        contrastList(this.contactsData, this.oldGoodsList) ||
-        contrastList(this.advantageProjectData, this.oldFeesList) ||
+        contrastList(getGoodsList, this.oldGoodsList) ||
+        contrastList(getFeeList, this.oldFeesList) ||
         contrastList(this.bankOfDepositData, this.oldUploadList)
       ) {
         this.$confirm("数据发生变化未有提交记录, 是否提交?", "提示", {
@@ -2722,9 +2739,16 @@ export default {
     },
     //返回列表
     backToList() {
+      let getGoodsList = []
+      let getFeeList = this.$refs.feeInfo.submitData()
+      if (this.goodsShowData.findIndex(item => item.goodType == 0) == -1) {
+        getGoodsList = this.goodsShowData.concat(this.contactsData)
+      } else {
+        getGoodsList = this.goodsShowData.concat(this.giftData)
+      }
       if (contrastObj(this.form, this.oldForm) ||
-        contrastList(this.contactsData, this.oldGoodsList) ||
-        contrastList(this.advantageProjectData, this.oldFeesList) ||
+        contrastList(getGoodsList, this.oldGoodsList) ||
+        contrastList(getFeeList, this.oldFeesList) ||
         contrastList(this.bankOfDepositData, this.oldUploadList)
       ) {
         this.$confirm("数据发生变化未有提交记录, 是否提交?", "提示", {