Merge branch 'feature/Feature-copy' into develop

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

@@ -601,7 +601,7 @@ export default {
 
       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) {
                 return this.$errorMsg('合同单价、合同数量不能为空')
               }
 

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

@@ -1121,7 +1121,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) {
                 return this.$errorMsg('合同单价、合同数量不能为空')
               }
 
@@ -1197,7 +1197,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) {
                 return this.$errorMsg('合同单价、合同数量不能为空')
               }
 

src/views/supply/engin/components/commerce_form.vue

@@ -562,7 +562,6 @@ export default {
       if (this.goodsList.length) {
         const item = this.warehouseList.find(e=>e.id === id)
           this.goodsList.forEach(k=>{
-
             this.$set(k,'correspondName',item.name)
             this.$set(k,'correspondId',item.id)
           })
@@ -710,6 +709,9 @@ export default {
       this.isFirst = true;
       this.isShowDialog = true;
       this.dialogTable_currentPage = 1;
+      this.screenForm.correspondName = ''
+      this.screenForm.correspondId = ''
+      this.warehouseValue = ''
       this.getComLoginList();
     },