Merge branch 'fix-bug' into feat-two

src/views/deposit_commerce/components/refund_list-detail.vue

@@ -897,7 +897,7 @@ export default {
             for (let i = 0; i < this.detailList.items.length; i++) {
               this.detailList.items[i].contractAmount =
                 this.detailList.items[i].contractQty * this.detailList.items[i].contractPrice
-              if (!this.detailList.items[i].contractAmount) {
+              if (this.detailList.items[i].contractAmount == null) {
                 return this.$errorMsg('合同单价、合同数量不能为空')
               }
             }
@@ -1010,7 +1010,7 @@ export default {
             for (let i = 0; i < this.detailList.items.length; i++) {
               this.detailList.items[i].contractAmount =
                 this.detailList.items[i].contractQty * this.detailList.items[i].contractPrice
-              if (!this.detailList.items[i].contractAmount) {
+              if (this.detailList.items[i].contractAmount == null) {
                 return this.$errorMsg('合同单价、合同数量不能为空')
               }
             }

src/views/deposit_commerce/components/refund_replenish.vue

@@ -939,7 +939,7 @@ export default {
             for (let i = 0; i < this.detailList.items.length; i++) {
               this.detailList.items[i].contractAmount =
                 this.detailList.items[i].contractQty * this.detailList.items[i].contractPrice
-              if (!this.detailList.items[i].contractAmount) {
+              if (this.detailList.items[i].contractAmount == null) {
                 return this.$errorMsg('合同单价、合同数量不能为空')
               }
             }
@@ -1052,7 +1052,7 @@ export default {
             for (let i = 0; i < this.detailList.items.length; i++) {
               this.detailList.items[i].contractAmount =
                 this.detailList.items[i].contractQty * this.detailList.items[i].contractPrice
-              if (!this.detailList.items[i].contractAmount) {
+              if (this.detailList.items[i].contractAmount == null) {
                 return this.$errorMsg('合同单价、合同数量不能为空')
               }
             }

src/views/deposit_home/components/deposit-apply-surrender.vue

@@ -726,7 +726,7 @@ export default {
       if (this.isCustomer) {
         for (let i = 0; i < this.details.items.length; i++) {
           this.details.items[i].contractAmount = this.details.items[i].contractQty * this.details.items[i].contractPrice
-          if (!this.details.items[i].contractAmount) {
+          if (this.details.items[i].contractAmount == null) {
             return this.$errorMsg('合同单价、合同数量不能为空')
           }
         }
@@ -749,6 +749,7 @@ export default {
           fileUrl: el.url
         })
       })
+      return
       applyDeposit({
         ...this.details,
         dataList: [...arr, ...this.details.dataList]

src/views/deposit_home/components/refund_list-detail.vue

@@ -1166,7 +1166,7 @@ export default {
             for (let i = 0; i < this.detailList.items.length; i++) {
               this.detailList.items[i].contractAmount =
                 this.detailList.items[i].contractQty * this.detailList.items[i].contractPrice
-              if (!this.detailList.items[i].contractAmount) {
+              if (this.detailList.items[i].contractAmount == null) {
                 return this.$errorMsg('合同单价、合同数量不能为空')
               }
             }
@@ -1279,7 +1279,7 @@ export default {
             for (let i = 0; i < this.detailList.items.length; i++) {
               this.detailList.items[i].contractAmount =
                 this.detailList.items[i].contractQty * this.detailList.items[i].contractPrice
-              if (!this.detailList.items[i].contractAmount) {
+              if (this.detailList.items[i].contractAmount == null) {
                 return this.$errorMsg('合同单价、合同数量不能为空')
               }
             }

src/views/deposit_home/components/refund_replenish.vue

@@ -1214,7 +1214,7 @@ export default {
             for (let i = 0; i < this.detailList.items.length; i++) {
               this.detailList.items[i].contractAmount =
                 this.detailList.items[i].contractQty * this.detailList.items[i].contractPrice
-              if (!this.detailList.items[i].contractAmount) {
+              if (this.detailList.items[i].contractAmount == null) {
                 return this.$errorMsg('合同单价、合同数量不能为空')
               }
             }
@@ -1327,7 +1327,7 @@ export default {
             for (let i = 0; i < this.detailList.items.length; i++) {
               this.detailList.items[i].contractAmount =
                 this.detailList.items[i].contractQty * this.detailList.items[i].contractPrice
-              if (!this.detailList.items[i].contractAmount) {
+              if (this.detailList.items[i].contractAmount == null) {
                 return this.$errorMsg('合同单价、合同数量不能为空')
               }
             }