应付账款-提现申请、我的付款-待付款tab页-筛选条件定制-表格字段按需排版

src/views/payCredit/index.vue

@@ -7,7 +7,7 @@
             <span>待领取</span>
           </el-badge>
         </template>
-        <el-form :model="firstForm" label-width="120">
+        <el-form :model="firstForm" label-width="100">
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="业务员类型">
@@ -99,16 +99,6 @@
         </template>
         <el-form :model="firstForm" label-width="100">
           <el-row :gutter="20">
-            <el-col :span="8">
-              <el-form-item label="业务员">
-                <el-input v-model="firstForm.salesman" placeholder="请输入" clearable></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="业务员工号">
-                <el-input v-model="firstForm.mobile" placeholder="请输入" clearable></el-input>
-              </el-form-item>
-            </el-col>
             <el-col :span="8">
               <el-form-item label="业务员类型">
                 <el-select v-model="firstForm.attrType" placeholder="请选择" clearable>
@@ -123,6 +113,21 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="业务员">
+                <el-input v-model="firstForm.salesman" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="业务员手机号">
+                <el-input v-model="firstForm.mobile" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="管理人">
+                <el-input v-model="firstForm.managerName" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="提现时间">
                 <el-date-picker v-model="firstForm.createTime" type="daterange" range-separator="至"
@@ -130,14 +135,13 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="审核人">
-                <el-input v-model="firstForm.auditingUser" placeholder="请输入" clearable></el-input>
+              <el-form-item label="提现金额">
+                <el-input v-model="firstForm.amount" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="审核时间">
-                <el-date-picker v-model="firstForm.auditTime" type="daterange" range-separator="至"
-                  start-placeholder="开始时间" end-placeholder="结束时间" value-format="YYYY-MM-DD" />
+              <el-form-item label="领取人（待开发）">
+                <el-input v-model="firstForm.xxxxxx" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24" style="display: flex; align-items: center; justify-content: flex-end">
@@ -152,8 +156,6 @@
         </el-form>
         <el-table :data="firstData1" height="calc(100% - 218px)" style="width: 100%; margin-top: 20px;"
           highlight-current-row>
-          <el-table-column prop="name" label="业务员"></el-table-column>
-          <el-table-column prop="mobile" label="业务员工号"></el-table-column>
           <el-table-column prop="attrType" label="业务员类型">
             <template #default="scope">
               {{ scope.row.attrType == '1' ? '前线人员' : scope.row.attrType == '2' ? '后线人员' : scope.row.attrType ==
@@ -162,13 +164,19 @@
                   '6' ? '个代' : scope.row.attrType == '7' ? '电销' : scope.row.attrType == '8' ? '渠道' : '' }}
             </template>
           </el-table-column>
+          <el-table-column prop="mobile" label="业务员手机号"></el-table-column>
+          <el-table-column prop="name" label="业务员"></el-table-column>
+
           <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="cardHolderName" 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="cardHolderName" label="姓名"></el-table-column>
           <el-table-column prop="bankNum" label="开户行"></el-table-column>
+          <el-table-column prop="createTime" label="提现时间" width="180"></el-table-column>
+          <el-table-column prop="xxxxxx" label="领取人（待开发）" width="180"></el-table-column>
           <!-- <el-table-column label="操作" fixed="right" width="200">
             <template #default="scope">
               <el-button link type="primary" size="small" @click="handlePay(scope.row)">付款</el-button>
@@ -430,38 +438,20 @@ const DrawRef = ref<FormInstance>()
 let AccountRef = ref()
 let RefusePopover = ref()
 const type = ref('3')
-let activeName = ref('3')
+let activeName = ref('0')
 const handleClick = (e) => {
   console.log(e.props.name)
   pages.value = 1
   size.value = 10
   activeName.value = e.props.name
   type.value = e.props.name
-  switch (e.props.name) {
-    case '3':
-      firstForm.value = {}
-      break
-    case '0':
-      firstForm1.value = {}
-      break
-    case '1':
-      firstForm2.value = {}
-      break
-    case '2':
-      firstForm3.value = {}
-      break
-    default:
-      break
-  }
+  firstForm.value = {}
   initData(activeName.value)
   queryTotalWithdrawalAmount()
 }
 
 // 待审核
 let firstForm = ref({})
-let firstForm1 = ref({})
-let firstForm2 = ref({})
-let firstForm3 = ref({})
 
 const handleSearch = () => {
   pages.value = 1
@@ -471,13 +461,7 @@ const handleSearch = () => {
 const handleReset = () => {
   pages.value = 1
   size.value = 10
-  firstForm.value = {
-    salesman: '',
-    attrType: '',
-    createTime: '',
-    auditingUser: '',
-    auditTime: ''
-  }
+  firstForm.value = {}
   initData(activeName.value)
 }
 
@@ -573,6 +557,7 @@ const initData = (type) => {
     auditTimeEnd: firstForm.value.auditTime?.[0],
     auditingStatus: type == '0' || type == '3' ? '0' : type,
     receiveUser: type != '3' ? localStorage.getItem('userName') : '',
+    ...firstForm.value,
     pageNo: pages.value,
     pageSize: size.value
   }).then((res: any) => {

src/views/payCredit/myTask.vue

@@ -9,12 +9,7 @@
         </template>
         <el-form v-model="queryInfo" label-width="100">
           <el-row :gutter="20">
-            <el-col :span="8">
-              <el-form-item label="业务员">
-                <el-input v-model="queryInfo.salesman" placeholder="请输入" clearable></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
+             <el-col :span="8">
               <el-form-item label="业务员类型">
                 <el-select v-model="queryInfo.attrType" placeholder="请选择" clearable>
                   <el-option label="前线人员" value="1"></el-option>
@@ -28,12 +23,32 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="业务员">
+                <el-input v-model="queryInfo.salesman" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="业务员手机号">
+                <el-input v-model="queryInfo.mobile" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="管理人">
+                <el-input v-model="queryInfo.managerName" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="提现时间">
                 <el-date-picker v-model="time1" type="daterange" range-separator="至" start-placeholder="开始时间"
                   end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="提现金额">
+                <el-input v-model="queryInfo.amount" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="4" :offset="20" style="display: flex; align-items: start; justify-content: flex-end">
               <el-button type="primary" @click="handleSearch">搜索</el-button>
               <el-button plain>重置</el-button>
@@ -43,21 +58,23 @@
         </el-form>
         <div style="font-size: 14px; color: #606266">应付总额：￥{{ totalAmount }}</div>
         <el-table :data="firstData1" 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="attrType" label="业务员类型">
             <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
                   === '6' ? '个代' : scope.row.attrType === '7' ? '电销' : scope.row.attrType === '8' ? '渠道' : '' }}
             </template>
           </el-table-column>
+          <el-table-column prop="mobile" label="业务员手机号"></el-table-column>
+          <el-table-column prop="name" label="业务员"></el-table-column>
           <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="cardHolderName" 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="cardHolderName" label="姓名"></el-table-column>
           <el-table-column prop="bankNum" label="开户行"></el-table-column>
+          <el-table-column prop="createTime" label="提现时间"></el-table-column>
           <el-table-column label="操作" fixed="right" width="200">
             <template #default="scope">
               <el-button link type="primary" size="small" @click="handlePay(scope.row)">付款</el-button>
@@ -294,7 +311,8 @@
       </el-form>
 
       <template #footer>
-        <el-button class="border-[#0083FF] color-[#0083FF]" plain @click="updateAccountShow = false,selectItem = null">取消</el-button>
+        <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>
@@ -425,7 +443,7 @@ const updateAccountShowSubmit = () => {
     payAccountId: payAccountForm.value.payAccountId,
   }).then((res: any) => {
     if (res.code == 200) {
-  updateAccountShow.value = false
+      updateAccountShow.value = false
       ElMessage({
         message: '修改账户成功',
         type: 'success'
@@ -558,6 +576,7 @@ const initData = (type) => {
     attrType: queryInfo.value.attrType,
     createTimeStart: time1.value?.[0],
     createTimeEnd: time1.value?.[1],
+    ...queryInfo.value,
     auditingStatus: type,
     pageNo: pages.value,
     pageSize: size.value