Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/financial/creatPayment.vue

@@ -100,14 +100,12 @@
               label-width="0"
               style="margin-bottom: 0"
               prop="supplierBankAccount"
-              required
-              error="请选择收款账户"
             >
-              <el-select v-model="form.supplierBankAccount" placeholder="请选择收款账户">
+              <el-select v-model="form.supplierBankAccount"  @change="selectChangeBank" placeholder="请选择收款账户">
                 <el-option
                   v-for="item in bankData"
                   :key="item.id"
-                  :label="item.bankName + '(' + item.bankNameAccount+ ')'"
+                  :label="item.bankName + '(' + item.bankAccount+ ')'"
                   :value="item.id"
                 />
               </el-select>
@@ -416,7 +414,7 @@ import { getChannelList } from "@/api/ecw/channel";
 import CustomerSelector from "@/components/CustomerSelector";
 import { listSimpleDepts } from "@/api/system/dept";
 import { getTradeCityList } from "@/api/ecw/region";
-import { getSupplierPage } from "@/api/ecw/supplier";
+import { getSupplierPage,getSupplier } from "@/api/ecw/supplier";
 import { getPayableList, getPayableInfoByIds, createPayment, getPaymentInfoByIds, getPaymentItem, updatePayment } from "@/api/ecw/financial"
 export default {
   name: "CreatPayment",
@@ -557,6 +555,10 @@ export default {
               if (this.list && this.list.length > 0) {
                 params.payableReqVOList = [...this.list]
               }
+              if(!params.supplierBankAccount){
+                this.$modal.msgError("请选择供应商银行账号");
+                return
+              }
               if (params.payableReqVOList.length === 0) {
                 this.$modal.msgError("请选择供应商未付款项");
                 return
@@ -584,6 +586,10 @@ export default {
           if (this.list && this.list.length > 0) {
             params.payableReqVOList = [...this.list]
           }
+          if(!params.supplierBankAccount){
+            this.$modal.msgError("请选择供应商银行账号");
+            return
+          }
           if (params.payableReqVOList.length === 0) {
             this.$modal.msgError("请选择供应商未付款项");
             return
@@ -592,11 +598,24 @@ export default {
         }
       })
     },
+    selectChangeBank(val){
+      this.$forceUpdate()
+      console.log(this.form.supplierBankAccount)
+    },
     selectChange(val) {
+      this.bankData = []
+      // this.form.supplierBankAccount=''
+      if(val){
+        getSupplier(val).then((res)=>{
+          this.bankData = res.data.bankList
+          this.form.supplierBankAccount=''
+        })
+      }
+
       const t = this.allSupplier.find(v => v.id == val)
 
       t && (this.form.supplierName = t.companyZh)
-      t && (this.bankData = t.bankList)
+      // t && (this.bankData = t.bankList)
     },
     handleQuery() {},
     handleSelectionChange(val) {

src/views/ecw/order/prepayDeal.vue

@@ -317,7 +317,7 @@
         getExceptionById(that.orderExceptionId).then(response => {
           that.orderExceptionData = response.data;
           // that.orderExceptionData.orderExceptionType = 'order_other_exception'
-          that.orderExceptionData.orderExceptionType = 'order_miss_exception'
+          // that.orderExceptionData.orderExceptionType = 'order_miss_exception'
           // that.orderExceptionData.orderExceptionType = 'order_pay_exception'
           that.loading = false;
           that.orderId = response.data.orderId