佣金付款单修改

src/views/ecw/financial/commission-Payment.vue

@@ -100,6 +100,7 @@
             :type="DICT_TYPE.ECW_PAYMENT_STATE"
             :value="scope.row.state"
           />
+          <span v-if="scope.row.state == 2 " :title="scope.row.remark"><i class="el-icon-question"></i></span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('操作')">

src/views/ecw/financial/commission-payable.vue

@@ -114,7 +114,7 @@
     <el-table-column :label="$t('备注')" prop="remark" ></el-table-column>
     <el-table-column align="center" :label="$t('操作')">
       <template v-slot="{row}">
-         <el-button type="text" @click="$router.push({path:'/financial/commission-requestFunds',query:{payableId:row.id}})" >{{$t('请款')}}</el-button>
+         <el-button v-if="!row.state" type="text" @click="$router.push({path:'/financial/commission-requestFunds',query:{payableId:row.id}})" >{{$t('请款')}}</el-button>
       </template>
     </el-table-column>
   </el-table>

src/views/ecw/financial/commission-requestFunds.vue

@@ -97,6 +97,13 @@
               />
             </el-form-item>
           </el-descriptions-item>
+          <el-descriptions-item :label="$t('客户的账户名称')" >
+            <el-form-item label-width="0"   prop="customerBankAccountName">
+              <el-select  v-model="form.customerBankAccount" >
+                <el-option @click.native="getBankInfo(item)" v-for="(item) in bankAccountList" :value="item.baAccountNum" :label="item.baAccountNum + (item.baAccountName)" ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-descriptions-item>
           <el-descriptions-item :label="$t('账户名称')" >
             <el-form-item label-width="0" :rules="{message:$t('账户名称不能为空'),required:true,}"  prop="customerBankAccountName">
               <el-input v-model="form.customerBankAccountName" ></el-input>
@@ -119,7 +126,10 @@
           </el-descriptions-item>
           <el-descriptions-item :label="$t('账户类型')" >
             <el-form-item label-width="0">
-              <el-input v-model="form.customerAccountType" ></el-input>
+            <el-select v-model="form.customerAccountType">
+              <el-option :value="0" label="停用"></el-option>
+              <el-option :value="1" label="正常"></el-option>
+            </el-select>
             </el-form-item>
           </el-descriptions-item>
           <el-descriptions-item :column="3" :label="$t('银行地址')" >
@@ -272,7 +282,6 @@
       </el-form>
     </el-card>
     <div slot="header" class="bpm-title">{{ $t('审核流程') }}</div>
-    {{form.copyUserList}}
     <work-flow xmlkey="merge_order" v-model="form.copyUserList"></work-flow>
 
     <div slot="footer" style="margin: 20px 0">
@@ -495,6 +504,7 @@ export default {
       selectedUsers: [],
       dialogVisible: false,
       interdict:false,
+      bankAccountList:[],
     };
   },
   async created() {
@@ -518,8 +528,8 @@ export default {
         this.form = {
           copyUserList:[],
           ...res.data,
-          latestPayAt: this.parseTime(res.data.latestPayAt, '{y}-{m}-{d}'),
-          applicationAt: this.parseTime(res.data.applicationAt, '{y}-{m}-{d}'),
+          latestPayAt: this.parseTime(res.data.latestPayAt, '{y}-{m}-{d} {h}:{i}:{s}'),
+          applicationAt: this.parseTime(res.data.applicationAt, '{y}-{m}-{d} {h}:{i}:{s}'),
           invoiceStatus: String(res.data.invoiceStatus),
         }
 
@@ -662,9 +672,11 @@ export default {
     selectChange(val) {
       if(val){
         getCustomer(val).then(r => {
-           this.$set(this.form, 'customerBank',r.data.bank )
-           this.$set(this.form, 'customerBankAccount',r.data.bankNumber )
-           this.$set(this.form, 'customerBankAccountName',r.data.name )
+          this.bankAccountList = r.data.customerBankAccountBackVOList
+           // this.$set(this.form, 'customerBank',r.data.bank )
+           // this.$set(this.form, 'customerBankAccount',r.data.bankNumber )
+           // this.$set(this.form, 'customerBankAccountName',r.data.name )
+          if(this.bankAccountList.length) this.getBankInfo(this.bankAccountList[0])
 
         })
       }
@@ -683,6 +695,22 @@ export default {
       // t && (this.form.supplierName = t.companyZh)
       // t && (this.bankData = t.bankList)
     },
+    getBankInfo(val){
+      let {baAccountName,baAccountNum,baBankAdd,baBankName,baSwiftCode,baType,status} = val
+        // this.form.customerAccountType = baType; //账户类型
+        this.$set(this.form, 'customerAccountType', baType)
+        // this.form.customerBank = baBankName; //客户银行
+      this.$set(this.form, 'customerBank', baBankName)
+        // this.form.customerBankAccount = baAccountNum; //	客户银行账号
+      this.$set(this.form, 'customerBankAccount', baAccountNum)
+        // this.form.customerBankAccountName = customerBankAccountName; //客户银行账户名
+      this.$set(this.form, 'customerBankAccountName', baAccountName )
+        // this.form.customerBankAddress = customerBankAddress; //	银行地址
+      this.$set(this.form, 'customerBankAddress', baBankAdd)
+        // this.form.customerBankAddress = customerBankCode; //	银行代码
+      this.$set(this.form, 'customerBankCode', baSwiftCode)
+
+    },
     handleQuery() {
       this.queryParams.page = 1;
       this.getList()