Merge remote-tracking branch 'origin/dev1.6' into dev1.6

src/views/ecw/financial/creatCollection.vue

@@ -321,6 +321,7 @@
                 <el-select
                   v-model="scope.row.platformAccountId"
                   :placeholder="$t('请选择收款账户')"
+                  @change="(platformAccountId)=>changePlatformAccountId(platformAccountId,scope.$index)"
                 >
                   <el-option
                     v-for="item in bankData"
@@ -1246,6 +1247,9 @@ export default {
     hiddenDialog() {
       this.open = false;
     },
+    changePlatformAccountId(platformAccountId,index){
+      this.form.receiptAccountList[index].platformAccountId = platformAccountId
+    },
     submitForm(addType) {
       const params = {...this.form}
       params.addType = addType
@@ -1305,20 +1309,6 @@ export default {
 
 
       if (addType === 1) {
-        let fieldsToValidate = ['customerId', 'departmentId', 'salesmanId']; // 部分字段校验 保存草稿用
-        Promise.all(
-          fieldsToValidate.map((field) => {
-            return new Promise((resolve, reject) => {
-              this.$refs['form'].validateField(field, (errorMessage) => {
-                resolve(errorMessage);
-              });
-            });
-          })
-        ).then((errorMessages) => {
-          let valid = errorMessages.every((errorMessage) => {
-            return errorMessage == '';
-          });
-          if (valid) {
             this.saveBtnLoading = true
             params.receiptAccountList.splice(params.receiptAccountList.length - 1,1)
             if (this.id && this.id != 0) {
@@ -1338,34 +1328,28 @@ export default {
                 this.saveBtnLoading = false
               })
             }
-          }
-        });
         return
       }
-       this.$refs.form.validate ((valid)=>{
-        if (valid) {
-          this.saveBtnLoading = true
-          params.receiptAccountList.splice(params.receiptAccountList.length - 1,1)
-          if (this.id && this.id != 0) {
-            // if(params.state==0) params.state = 1
-             params.updateType = 1
-            updateReceipt(params).then(res => {
-              this.$modal.msgSuccess(this.$t('修改成功'));
-              this.$store.dispatch('tagsView/delCurrentView')
-            }).finally(() => {
-              this.saveBtnLoading = false
-            })
-          } else {
-            params.currencyId = this.showCurrencyId
-            createReceipt(params).then(res => {
-              this.$modal.msgSuccess(this.$t('新增成功'));
-               this.$store.dispatch('tagsView/delCurrentView')
-            }).finally(() => {
-              this.saveBtnLoading = false
-            })
-          }
+        this.saveBtnLoading = true
+        params.receiptAccountList.splice(params.receiptAccountList.length - 1,1)
+        if (this.id && this.id != 0) {
+          // if(params.state==0) params.state = 1
+           params.updateType = 1
+          updateReceipt(params).then(res => {
+            this.$modal.msgSuccess(this.$t('修改成功'));
+            this.$store.dispatch('tagsView/delCurrentView')
+          }).finally(() => {
+            this.saveBtnLoading = false
+          })
+        } else {
+          params.currencyId = this.showCurrencyId
+          createReceipt(params).then(res => {
+            this.$modal.msgSuccess(this.$t('新增成功'));
+             this.$store.dispatch('tagsView/delCurrentView')
+          }).finally(() => {
+            this.saveBtnLoading = false
+          })
         }
-      })
     },
     handleSelectionChange(val) {
       this.multipleSelection = val;