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

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

@@ -100,7 +100,7 @@
           <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-option @click.native="getBankInfo(item)" v-for="(item) in bankAccountList" :value="item.bankAccount" :label="item.bankAccount + (item.bankName)" ></el-option>
               </el-select>
             </el-form-item>
           </el-descriptions-item>
@@ -188,7 +188,7 @@
           size="mini"
           @click="handleAdd"
           style="padding: 10px; margin-bottom: 10px"
-        >{{ $t('添加未付供应商款项') }}
+        >{{ $t('加未付客户款项') }}
         </el-button
         >
       </el-col>
@@ -433,6 +433,7 @@
           <el-button @click="hiddenDialog">{{ $t('取消') }}</el-button>
         </div>
       </div>
+
     </el-dialog>
   </div>
 </template>

src/views/ecw/financial/paymentVoucher.vue

@@ -149,9 +149,9 @@
           <el-button v-has-permi="['ecw:paymentVoucher:Unapprove']" type="text" v-if="[1].includes(row.state)" @click="bridgeFn(1, '取消审核',row)">
             {{ $t('取消审核') }}
           </el-button>
-          <el-button type="text" v-has-permi="['ecw:paymentVoucher:details']" v-if="[7,3,1].includes(row.state)" @click="$router.push({path:'/bpm/process-instance/detail',query:{id:row.bmpId}})" >{{ $t('审核详情') }}</el-button>
-          <el-button type="text" v-has-permi="['ecw:paymentVoucher:Cancel-De-approval']" v-if="[3].includes(row.state)" @click="bridgeFn(2, '取消付款单反审核',row)" >{{ $t('取消反审核') }}</el-button>
-          <el-button v-has-permi="['ecw:paymentVoucher:Cancel-Write-off']" type="text" v-if="[5].includes(row.state)" @click="bridgeFn(3, '取消付款单核销',row)"  >{{ $t('取消核销审核') }}</el-button>
+          <el-button size="mini" type="text" v-has-permi="['ecw:paymentVoucher:details']" v-if="[7,3,1].includes(row.state)" @click="$router.push({path:'/bpm/process-instance/detail',query:{id:row.bmpId}})" >{{ $t('审核详情') }}</el-button>
+          <el-button size="mini" type="text" v-has-permi="['ecw:paymentVoucher:Cancel-De-approval']" v-if="[3].includes(row.state)" @click="bridgeFn(2, '取消付款单反审核',row)" >{{ $t('取消反审核') }}</el-button>
+          <el-button size="mini" v-has-permi="['ecw:paymentVoucher:Cancel-Write-off']" type="text" v-if="[5].includes(row.state)" @click="bridgeFn(3, '取消付款单核销',row)"  >{{ $t('取消核销审核') }}</el-button>
 
           <el-button v-if="[4].includes(row.state)" size="mini" type="text" v-hasPermi="['ecw:paymentVoucher:De-approval']"
                      @click="bridgeFn(4, '反审核',row)">{{ $t('反审核') }}