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

src/views/ecw/deptTarget/allAchievement.vue

@@ -107,11 +107,7 @@
       <el-table-column :label="$t('客户名称')" align="center" prop="name"/>
       <el-table-column :label="$t('联系方式')" align="center" prop="phoneNew"/>
       <el-table-column :label="$t('唛头')" align="center" prop="marks"/>
-      <el-table-column :label="$t('订单状态')" align="center">
-        <template slot-scope="scope">
-          <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
+      <el-table-column :label="$t('订单状态')" align="center" prop="statusMsg"/>
       <el-table-column :label="$t('是否控货')" align="center" prop="isCargoControl">
         <template slot-scope="scope">
           {{scope.row.isCargoControl?$t('是'):$t('否')}}

src/views/ecw/deptTarget/myAchievement.vue

@@ -111,11 +111,7 @@
       <el-table-column :label="$t('客户名称')" align="center" prop="name"/>
       <el-table-column :label="$t('联系方式')" align="center" prop="phoneNew"/>
       <el-table-column :label="$t('唛头')" align="center" prop="marks"/>
-      <el-table-column :label="$t('订单状态')" align="center">
-        <template slot-scope="scope">
-          <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
+      <el-table-column :label="$t('订单状态')" align="center" prop="statusMsg"/>
       <el-table-column :label="$t('是否控货')" align="center" prop="isCargoControl">
         <template slot-scope="scope">
           {{scope.row.isCargoControl?$t('是'):$t('否')}}

src/views/ecw/deptTarget/myDeptAchievement.vue

@@ -110,11 +110,7 @@
       <el-table-column :label="$t('客户名称')" align="center" prop="name"/>
       <el-table-column :label="$t('联系方式')" align="center" prop="phoneNew"/>
       <el-table-column :label="$t('唛头')" align="center" prop="marks"/>
-      <el-table-column :label="$t('订单状态')" align="center">
-        <template slot-scope="scope">
-          <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
+      <el-table-column :label="$t('订单状态')" align="center" prop="statusMsg"/>
       <el-table-column :label="$t('是否控货')" align="center" prop="isCargoControl">
         <template slot-scope="scope">
           {{scope.row.isCargoControl?$t('是'):$t('否')}}
@@ -151,7 +147,7 @@
     import dayjs from "dayjs";
     import {listServiceUser} from "@/api/system/user";
     import {getWarehouseList} from '@/api/ecw/warehouse'
-    
+
     export default {
         name: "EcwDepttargetMydeptachievement",
         components: {},
@@ -241,7 +237,7 @@
                     }
                     return '/'
                 }
-            },            
+            },
             exportWarehouseList(){
               /* tradeType 1 进口，2出口，3进出口 */
               return this.warehouseList.filter(item => item.tradeType == 2 || item.tradeType == 3)

src/views/ecw/financial/creatPayment.vue

@@ -727,7 +727,7 @@ export default {
     },
     selectChangeBank(val){
       this.$forceUpdate()
-      var bank = this.bankData.find(item=>item.bankAccount==this.form.supplierBankAccount)
+      let bank = this.bankData.find(item=>item.bankAccount==this.form.supplierBankAccount)
       this.form.supplierBank = bank.bankName
       this.form.supplierBankAccountName = bank.accountName
     },
@@ -737,9 +737,9 @@ export default {
       if(val){
         getSupplier(val).then((res)=>{
           this.bankData = res.data.bankList
-          var bank = this.bankData.find(item=>item.bankAccount==this.form.supplierBankAccount)
-          console.log(this.bankData)
-          if(this.bankData.length>0&&!bank) this.form.supplierBankAccount= this.bankData[0]['bankAccount']
+          let bank = this.bankData.find(item=>item.bankAccount==this.form.supplierBankAccount)
+          if(!bank) this.form.supplierBankAccount=''
+          if(!bank&&this.bankData.length>0) this.form.supplierBankAccount= this.bankData[0]['bankAccount']
         })
       }