Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/api/modules/finance.ts

@@ -108,7 +108,8 @@ const financeApi = (axiosInstance: ApiInstance) => ({
     cardEdit: (data: any) => axiosInstance.post('/accountCard/cardEdit', data), // 账户编辑
     accountList: (data?: any) => axiosInstance.post('/account/accountList', data), // 企业列表
     cardDelete: (data: string) => axiosInstance.delete(`/accountCard/cardDelete?id=${data}`), // 账户删除
-
+    // 基础管理-账户管理-修改账户
+    modifyAccount: (data: any) => axiosInstance.post('/amountAuditing/updatePayAccountInfo', data), // 修改账户
     // 基础管理-来往企业
     accountPage: (data: any) => axiosInstance.post('/account/accountPage', data), // 列表
     accountAdd: (data: any) => axiosInstance.post('/account/accountAdd', data), // 新增

src/views/payCredit/myTask.vue

@@ -126,8 +126,8 @@
         <div style="font-size: 14px; color: #606266">应付总额：￥{{ totalAmount }}</div>
 
         <el-table :data="firstData2" height="calc(100% - 164px)" style="width: 100%; margin-top: 20px;">
-          <el-table-column prop="name" label="业务员"></el-table-column>
-          <el-table-column prop="attrType" label="业务员类型">
+          <el-table-column prop="name" label="业务员" width="120"></el-table-column>
+          <el-table-column prop="attrType" label="业务员类型" width="120">
             <template #default="scope">
               {{ scope.row.attrType === '1' ? '前线人员' : scope.row.attrType === '2' ? '后线人员' : scope.row.attrType === '3'
                 ? '合伙人' : scope.row.attrType === '4' ? '工作室管理员' : scope.row.attrType === '5' ? '团队' : scope.row.attrType
@@ -137,15 +137,20 @@
           <el-table-column prop="managerName" label="管理人"></el-table-column>
           <el-table-column prop="amount" label="提现金额"></el-table-column>
           <el-table-column prop="balanceAmount" label="账户余额"></el-table-column>
-          <el-table-column prop="bankCardNum" label="银行卡号"></el-table-column>
-          <el-table-column prop="bankName" label="银行"></el-table-column>
+          <el-table-column prop="bankCardNum" label="银行卡号" width="200"></el-table-column>
+          <el-table-column prop="bankName" label="银行" width="120"></el-table-column>
           <el-table-column prop="cardHolderName" label="姓名"></el-table-column>
           <el-table-column prop="bankNum" label="开户行"></el-table-column>
           <el-table-column prop="withdrawalRequester" label="提现人"></el-table-column>
-          <el-table-column prop="withdrawalRequestTime" label="提现时间"></el-table-column>
-          <el-table-column prop="auditingTime" label="审核时间"></el-table-column>
+          <el-table-column prop="withdrawalRequestTime" label="提现时间" width="180"></el-table-column>
+          <el-table-column prop="auditingTime" label="审核时间" width="180"></el-table-column>
           <el-table-column prop="voucherId" label="凭证号"></el-table-column>
           <el-table-column prop="payAccountName" label="付款账户"></el-table-column>
+          <el-table-column label="操作" fixed="right" width="120" align="center">
+            <template #default="scope">
+              <el-button link type="primary" size="small" @click="handleModifyAccount(scope.row)">修改账户</el-button>
+            </template>
+          </el-table-column>
         </el-table>
         <div class="pagination">
           <el-pagination v-model:current-page="pages" v-model:page-size="size" :page-sizes="[10, 20, 30, 40]"
@@ -277,6 +282,22 @@
         <el-button type="primary" @click="handleAccountSubmit">确定</el-button>
       </template>
     </el-dialog>
+
+
+
+    <el-dialog :close-on-click-modal="false" v-model="updateAccountShow" title="付款账户" width="800">
+      <el-form :model="payAccountForm" ref="DrawRef" :rules="drawRules" label-width="120">
+        <el-form-item prop="accountName" label="付款账户">
+          <el-input placeholder="请填入" v-model="payAccountForm.accountName" @click="updateAccount" :readonly="true"
+            clearable />
+        </el-form-item>
+      </el-form>
+
+      <template #footer>
+        <el-button class="border-[#0083FF] color-[#0083FF]" plain @click="updateAccountShow = false,selectItem = null">取消</el-button>
+        <el-button type="primary" @click="updateAccountShowSubmit">确定</el-button>
+      </template>
+    </el-dialog>
   </PageMain>
 </template>
 
@@ -322,6 +343,10 @@ let total3 = ref(0)
 
 let pages = ref(1)
 let size = ref(10)
+let payAccountForm = ref({
+  accountName: '',
+  payAccountId: ''
+})
 //上传凭证资料
 let fileUrl = ref('')
 const uploadImage = (file) => {
@@ -335,6 +360,7 @@ const uploadImage = (file) => {
   })
 }
 let payAccountShow = ref(false)
+let updateAccountShow = ref(false)
 // 体现付款
 let drawShow = ref(false)
 let drawForm = ref({
@@ -386,10 +412,38 @@ const refusePopoverConfirm = (row) => {
     }
   })
 }
+// 修改账户
+const handleModifyAccount = (row) => {
+  console.log(row)
+  payAccountForm.value.amountAuditingId = row.id
+  payAccountForm.value.accountName = row.payAccountBankNo
+  updateAccountShow.value = true
+}
+const updateAccountShowSubmit = () => {
+  api.financeApi.modifyAccount({
+    amountAuditingId: payAccountForm.value.amountAuditingId,
+    payAccountId: payAccountForm.value.payAccountId,
+  }).then((res: any) => {
+    if (res.code == 200) {
+  updateAccountShow.value = false
+      ElMessage({
+        message: '修改账户成功',
+        type: 'success'
+      })
+      initData('0')
+      initData('1')
+      initData('2')
+    }
+  })
+}
 const payAccount = () => {
   payAccountShow.value = true
   initAccount();
 }
+const updateAccount = () => {
+  payAccountShow.value = true
+  initAccount();
+}
 let account = ref('')
 let accountData = ref([])
 let total = ref(0)
@@ -433,8 +487,14 @@ const handleAccountCancel = () => {
 }
 const handleAccountSubmit = () => {
   payAccountShow.value = false
-  drawForm.value.accountName = selectItem.value.bankCardNum
-  drawForm.value.accountId = selectItem.value.id
+  if (drawShow.value) {
+    drawForm.value.accountName = selectItem.value.bankCardNum
+    drawForm.value.accountId = selectItem.value.id
+  } else {
+    payAccountForm.value.accountName = selectItem.value.bankCardNum
+    payAccountForm.value.payAccountId = selectItem.value.id
+  }
+
 }
 const handleCancelVerifyAmount = () => {
   drawForm.value = {