Просмотр исходного кода

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

祁鹏飞 2 недель назад
Родитель
Сommit
b469cb739a

+ 97 - 55
src/views/payCredit/agentCount.vue

@@ -9,11 +9,6 @@
         </template>
         <el-form v-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-select v-model="firstForm.typeAttr" placeholder="请选择" clearable>
@@ -25,31 +20,38 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="申请时间">
-                <el-date-picker v-model="firstForm.applyTime" type="daterange" range-separator="至"
-                  start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+              <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.auditBy" placeholder="请输入" clearable></el-input>
+              <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-date-picker v-model="firstForm.auditTime" type="daterange" range-separator="至"
+              <el-form-item label="管理人 ">
+                <el-input v-model="firstForm.leaderName" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="申请时间">
+                <el-date-picker v-model="firstForm.applyTime" 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" style="display: flex; align-items: start; justify-content: flex-end">
+            <el-col :span="8">
+              <el-form-item label="姓名 ">
+                <el-input v-model="firstForm.name" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :offset="16" :span="8" style="display: flex; align-items: start; justify-content: flex-end">
               <el-button type="primary" @click="handleSearch">搜索</el-button>
               <el-button plain @click="handleReset">重置</el-button>
             </el-col>
           </el-row>
         </el-form>
-        <el-table :data="firstData" height="calc(100% - 162px)" style="width: 100%; margin-top: 20px;">
-          <el-table-column prop="leaderName" label="管理员名称"></el-table-column>
-          <el-table-column prop="name" label="业务员"></el-table-column>
+        <el-table :data="firstData" height="calc(100% - 202px)" style="width: 100%; margin-top: 20px;">
           <el-table-column prop="typeAttr" label="业务员类型">
             <template #default="scope">
               {{
@@ -58,14 +60,14 @@
               }}
             </template>
           </el-table-column>
-          <el-table-column prop="workNumber" label="业务员工号"></el-table-column>
-          <el-table-column prop="applyTime" label="申请时间"></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="leaderName" label="管理员"></el-table-column>
+          <el-table-column prop="name" label="姓名"></el-table-column>
           <el-table-column prop="bankCardNumber" label="银行卡号"></el-table-column>
           <el-table-column prop="bankName" label="银行"></el-table-column>
-          <el-table-column prop="name" label="姓名"></el-table-column>
           <el-table-column prop="bankAddress" label="开户行"></el-table-column>
-          <el-table-column prop="auditTime" label="审核时间"></el-table-column>
-          <el-table-column prop="auditBy" label="审核人"></el-table-column>
+          <el-table-column prop="applyTime" label="申请时间"></el-table-column>
           <el-table-column label="操作" fixed="right" width="200">
             <template #default="scope">
               <el-button link type="primary" size="small" @click="agentPass(scope.row)">申请通过</el-button>
@@ -76,7 +78,8 @@
                 <el-input type="textarea" v-model="agentReason" maxlength="200"></el-input>
                 <div style="display: flex; align-items: center; justify-content: flex-end; margin-top: 10px">
                   <el-button size="small" @click="scope.row.agentShow = false">取消</el-button>
-                  <el-button type="danger" size="small" @click="handleAgentConfirm(scope.row)" :loading="auditLoading">确定驳回</el-button>
+                  <el-button type="danger" size="small" @click="handleAgentConfirm(scope.row)"
+                    :loading="auditLoading">确定驳回</el-button>
                 </div>
               </el-popover>
             </template>
@@ -96,11 +99,6 @@
         </template>
         <el-form v-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-select v-model="firstForm.typeAttr" placeholder="请选择" clearable>
@@ -111,6 +109,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.leaderName" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="申请时间">
                 <el-date-picker v-model="firstForm.applyTime" type="daterange" range-separator="至"
@@ -118,8 +131,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="审核人">
-                <el-input v-model="firstForm.auditBy" placeholder="请输入" clearable></el-input>
+              <el-form-item label="审核人 ">
+                <el-input v-model="firstForm.name" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -128,15 +141,23 @@
                   start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
-            <el-col :span="8" style="display: flex; align-items: start; justify-content: flex-end">
+            <el-col :span="8">
+              <el-form-item label="姓名">
+                <el-input v-model="firstForm.name" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="卡号">
+                <el-input v-model="firstForm.bankCardNumber" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :offset="16" :span="8" style="display: flex; align-items: start; justify-content: flex-end">
               <el-button type="primary" @click="handleSearch">搜索</el-button>
               <el-button plain @click="handleReset">重置</el-button>
             </el-col>
           </el-row>
         </el-form>
-        <el-table :data="secondData" height="calc(100% - 162px)" style="width: 100%; margin-top: 20px;">
-          <el-table-column prop="leaderName" label="管理员名称"></el-table-column>
-          <el-table-column prop="name" label="业务员"></el-table-column>
+        <el-table :data="secondData" height="calc(100% - 252px)" style="width: 100%; margin-top: 20px;">
           <el-table-column prop="typeAttr" label="业务员类型">
             <template #default="scope">
               {{
@@ -145,14 +166,16 @@
               }}
             </template>
           </el-table-column>
-          <el-table-column prop="workNumber" label="业务员工号"></el-table-column>
-          <el-table-column prop="applyTime" label="申请时间"></el-table-column>
+          <el-table-column prop="workNumber" label="业务员手机号"></el-table-column>
+          <el-table-column prop="name" label="业务员"></el-table-column>
+          <el-table-column prop="leaderName" label="管理员名称"></el-table-column>
+          <el-table-column prop="name" label="姓名"></el-table-column>
           <el-table-column prop="bankCardNumber" label="银行卡号"></el-table-column>
           <el-table-column prop="bankName" label="银行"></el-table-column>
-          <el-table-column prop="name" label="姓名"></el-table-column>
           <el-table-column prop="bankAddress" label="开户行"></el-table-column>
-          <el-table-column prop="auditTime" label="审核时间"></el-table-column>
+          <el-table-column prop="applyTime" label="申请时间"></el-table-column>
           <el-table-column prop="auditBy" label="审核人"></el-table-column>
+          <el-table-column prop="auditTime" label="审核时间"></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]"
@@ -168,11 +191,6 @@
         </template>
         <el-form v-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-select v-model="firstForm.typeAttr" placeholder="请选择" clearable>
@@ -183,6 +201,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.leaderName" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="申请时间">
                 <el-date-picker v-model="firstForm.applyTime" type="daterange" range-separator="至"
@@ -190,8 +223,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="审核人">
-                <el-input v-model="firstForm.auditBy" placeholder="请输入" clearable></el-input>
+              <el-form-item label="审核人 ">
+                <el-input v-model="firstForm.name" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -200,15 +233,23 @@
                   start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
-            <el-col :span="8" style="display: flex; align-items: start; justify-content: flex-end">
+            <el-col :span="8">
+              <el-form-item label="姓名">
+                <el-input v-model="firstForm.name" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="卡号">
+                <el-input v-model="firstForm.bankCardNumber" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :offset="16" :span="8" style="display: flex; align-items: start; justify-content: flex-end">
               <el-button type="primary" @click="handleSearch">搜索</el-button>
               <el-button plain @click="handleReset">重置</el-button>
             </el-col>
           </el-row>
         </el-form>
-        <el-table :data="thirdData" height="calc(100% - 162px)" style="width: 100%; margin-top: 20px;">
-      <el-table-column prop="leaderName" label="管理员名称"></el-table-column>
-          <el-table-column prop="name" label="业务员"></el-table-column>
+        <el-table :data="thirdData" height="calc(100% - 252px)" style="width: 100%; margin-top: 20px;">
           <el-table-column prop="typeAttr" label="业务员类型">
             <template #default="scope">
               {{
@@ -217,16 +258,17 @@
               }}
             </template>
           </el-table-column>
-          <el-table-column prop="workNumber" label="业务员号"></el-table-column>
-          <!-- <el-table-column prop="applyTime" label="申请时间"></el-table-column> -->
-          <el-table-column prop="lastRejectReason" label="驳回原因"></el-table-column>
-          <el-table-column prop="lastRejectTime" label="驳回时间"></el-table-column>
+          <el-table-column prop="workNumber" label="业务员手机号"></el-table-column>
+          <el-table-column prop="name" label="业务员"></el-table-column>
+          <el-table-column prop="leaderName" label="管理员"></el-table-column>
+          <el-table-column prop="name" label="姓名"></el-table-column>
           <el-table-column prop="bankCardNumber" label="银行卡号"></el-table-column>
           <el-table-column prop="bankName" label="银行"></el-table-column>
-          <el-table-column prop="name" label="姓名"></el-table-column>
           <el-table-column prop="bankAddress" label="开户行"></el-table-column>
-          <el-table-column prop="auditTime" label="审核时间"></el-table-column>
+          <el-table-column prop="lastRejectReason" label="驳回原因"></el-table-column>
+          <el-table-column prop="lastRejectTime" label="驳回时间"></el-table-column>
           <el-table-column prop="auditBy" label="审核人"></el-table-column>
+          <el-table-column prop="auditTime" label="审核时间"></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]"
@@ -287,7 +329,7 @@ const handleClick = (e) => {
   firstForm.value = {}
   initList(Number(activeName.value))
 }
-  const auditLoading = ref(false)//审核loading
+const auditLoading = ref(false)//审核loading
 // 待审核
 let firstForm = ref({})
 let firstData = ref([])

+ 14 - 27
src/views/payCredit/generanView.vue

@@ -2,11 +2,6 @@
   <PageMain class="vh100">
     <el-form v-model="form" label-width="100">
       <el-row :gutter="20">
-        <el-col :span="8">
-          <el-form-item label="业务员">
-            <el-input placeholder="请输入" v-model="form.salesman"></el-input>
-          </el-form-item>
-        </el-col>
         <el-col :span="8">
           <el-form-item label="业务员类型">
             <el-select v-model="form.attrType" clearable>
@@ -22,14 +17,16 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="统计日期">
-            <el-date-picker v-model="form.createTime" clearable type="daterange" range-separator="至"
-              start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+          <el-form-item label="业务员">
+            <el-input placeholder="请输入" v-model="form.salesman"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8"></el-col>
-        <el-col :span="8"></el-col>
-        <el-col :span="8" style="display: flex; align-items: center; justify-content: flex-end">
+        <el-col :span="8">
+          <el-form-item label="业务员手机号">
+            <el-input placeholder="请输入" v-model="form.mobile"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :offset="16" :span="8" style="display: flex; align-items: center; justify-content: flex-end">
           <el-button type="primary" @click="handleSearch">查询</el-button>
           <el-button type="primary" plain @click="handleReset">重置</el-button>
         </el-col>
@@ -58,17 +55,16 @@
       </el-col>
     </el-row>
     <el-table :data="tableData" height="calc(100% - 232px)" style="margin-top: 20px">
-      <el-table-column prop="leaderName" label="管理员名称"></el-table-column>
-      <el-table-column prop="name" label="业务员姓名"></el-table-column>
-      <el-table-column prop="mobile" label="业务员手机号"></el-table-column>
-      <el-table-column prop="workNumber" 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="leaderName" label="管理人"></el-table-column>
       <el-table-column prop="organizationName" label="归属"></el-table-column>
       <el-table-column prop="deptName" label="所属机构"></el-table-column>
       <el-table-column prop="sumAmount" label="应付总计"></el-table-column>
@@ -116,7 +112,6 @@ let form = ref({
   salesman: '',
   attrType: '',
 
-  createTime: []
 })
 let formData = ref({})
 let tableData = ref([])
@@ -144,28 +139,20 @@ const handleReset = () => {
   form.value = {
     salesman: '',
     attrType: '',
-    createTime: []
   }
   initData()
 }
 
 const initData = () => {
   api.financeApi.getPayableStatistics({
-    salesman: form.value.salesman,
-    attrType: form.value.attrType,
-
-    createTimeStart: form.value.createTime?.[0],
-    createTimeEnd: form.value.createTime?.[1]
+    ...form.value
   }).then((res: any) => {
     formData.value = res.data
   })
   api.financeApi.userAccountList({
-    salesman: form.value.salesman,
-    attrType: form.value.attrType,
+    ...form.value,
     pages: pages.value,
     size: size.value,
-    createTimeStart: form.value.createTime?.[0],
-    createTimeEnd: form.value.createTime?.[1]
   }).then((res: any) => {
     if (res.code == 200) {
       tableData.value = res.data.records

+ 45 - 30
src/views/payCredit/index.vue

@@ -253,9 +253,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="支付时间(待开发)">
-                <el-date-picker v-model="firstForm.paymentTime" type="daterange" range-separator="至"
-                  start-placeholder="开始时间" end-placeholder="结束时间" value-format="YYYY-MM-DD" />
+              <el-form-item label="支付时间">
+                <el-date-picker v-model="paymentTime" type="daterange" range-separator="至" start-placeholder="开始时间"
+                  end-placeholder="结束时间" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -316,16 +316,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>
@@ -340,21 +330,41 @@
                 </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="至"
-                  start-placeholder="开始时间" end-placeholder="结束时间" value-format="YYYY-MM-DD" />
+                <el-date-picker v-model="createTime" type="daterange" range-separator="至" start-placeholder="开始时间"
+                  end-placeholder="结束时间" value-format="YYYY-MM-DD" />
               </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.rejectPerson" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="驳回时间">
+                <el-date-picker v-model="rejectTime" type="daterange" range-separator="至" start-placeholder="开始时间"
+                  end-placeholder="结束时间" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
             <el-col :span="24" style="display: flex; align-items: center; justify-content: flex-end">
@@ -369,8 +379,6 @@
         </el-form>
         <el-table :data="firstData3" 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 ==
@@ -379,16 +387,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="rejectReason" label="驳回原因"></el-table-column>
-          <el-table-column prop="rejectTime" label="驳回时间"></el-table-column>
-          <el-table-column prop="rejectPerson" 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="rejectReason" label="驳回原因"></el-table-column>
+          <el-table-column prop="rejectTime" label="驳回时间"></el-table-column>
+          <el-table-column prop="rejectPerson" label="驳回人"></el-table-column>
+          <el-table-column prop="createTime" label="提现时间"></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]"
@@ -459,7 +470,7 @@ const DrawRef = ref<FormInstance>()
 let AccountRef = ref()
 let RefusePopover = ref()
 const type = ref('3')
-let activeName = ref('1')
+let activeName = ref('3')
 const handleClick = (e) => {
   console.log(e.props.name)
   pages.value = 1
@@ -490,7 +501,9 @@ let firstData1 = ref([{}])
 let firstData2 = ref([{}])
 let firstData3 = ref([{}])
 let firstData4 = ref([{}])
-
+let rejectTime = ref([])  // 驳回时间
+let createTime = ref([])  // 提现时间
+let paymentTime = ref([])  // 支付时间
 // 驳回
 let refuseReason = ref('')
 const handlePay = (row) => {
@@ -574,8 +587,10 @@ const initData = (type) => {
     createTimeStart: firstForm.value.createTime?.[0],
     createTimeEnd: firstForm.value.createTime?.[1],
     auditingUser: firstForm.value.auditingUser,
-    auditTimeStart: firstForm.value.auditTime?.[0],
-    auditTimeEnd: firstForm.value.auditTime?.[0],
+    rejectTimeBegin: firstForm.value.rejectTime?.[0],
+    rejectTimeEnd: firstForm.value.rejectTime?.[1],
+    paymentTimeBegin: firstForm.value.paymentTime?.[0],
+    paymentTimeEnd: firstForm.value.paymentTime?.[1],
     auditingStatus: type == '0' || type == '3' ? '0' : type,
     receiveUser: type != '3' ? localStorage.getItem('userName') : '',
     ...firstForm.value,

+ 91 - 47
src/views/payCredit/myTask.vue

@@ -9,7 +9,7 @@
         </template>
         <el-form v-model="queryInfo" label-width="100">
           <el-row :gutter="20">
-             <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>
@@ -40,7 +40,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="提现时间">
-                <el-date-picker v-model="time1" type="daterange" range-separator="至" start-placeholder="开始时间"
+                <el-date-picker v-model="createTime" type="daterange" range-separator="至" start-placeholder="开始时间"
                   end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
@@ -51,14 +51,14 @@
             </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>
+              <el-button plain @click="handleReset">重置</el-button>
               <el-button type="primary" @click="handleExport">导出</el-button>
             </el-col>
           </el-row>
         </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="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
@@ -105,7 +105,7 @@
         </template>
         <el-form v-model="queryInfo" label-width="100">
           <el-row :gutter="20">
-             <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>
@@ -119,7 +119,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-             <el-col :span="8">
+            <el-col :span="8">
               <el-form-item label="业务员手机号">
                 <el-input v-model="queryInfo.mobile" placeholder="请输入" clearable></el-input>
               </el-form-item>
@@ -129,38 +129,39 @@
                 <el-input v-model="queryInfo.salesman" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
-  <el-col :span="8">
-              <el-form-item label="管理人(待开发)">
+            <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="开始时间"
+                <el-date-picker v-model="createTime" 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-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="8">
-              <el-form-item label="支付时间(待开发)">
-                <el-date-picker v-model="queryInfo.paymentTime" type="daterange" range-separator="至"
-                  start-placeholder="开始时间" end-placeholder="结束时间" value-format="YYYY-MM-DD" />
+              <el-form-item label="支付时间">
+                <el-date-picker v-model="paymentTime" type="daterange" range-separator="至" start-placeholder="开始时间"
+                  end-placeholder="结束时间" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="付款账户(待开发)">
-                <el-input v-model="queryInfo.xxxxxxx" placeholder="请输入" clearable></el-input>
+              <el-form-item label="付款账户">
+                <el-select v-model="queryInfo.accountId" placeholder="请选择" clearable>
+                  <el-option v-for="item in accountList" :key="item.id" :label="item.cardName"
+                    :value="item.id"></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8"></el-col>
-            <el-col :span="8"></el-col>
             <el-col :span="8" style="display: flex; align-items: start; justify-content: flex-end">
               <el-button type="primary" @click="handleSearch">搜索</el-button>
-              <el-button plain>重置</el-button>
+              <el-button plain @click="handleReset">重置</el-button>
               <el-button type="primary" @click="handleExport">导出</el-button>
 
             </el-col>
@@ -189,10 +190,10 @@
           <el-table-column prop="bankName" label="银行" width="120"></el-table-column>
           <el-table-column prop="bankNum" 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="paymentTime" 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 prop="xxxxxx" label="回单资料 (待开发)"></el-table-column>
+          <el-table-column prop="xxxxxx" 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>
@@ -213,11 +214,6 @@
         </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-form-item label="业务员类型">
                 <el-select v-model="queryInfo.attrType" placeholder="请选择" clearable>
@@ -232,17 +228,41 @@
                 </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="queryInfo.createTimeStart" type="daterange" range-separator="至"
-                  start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+                <el-date-picker v-model="createTime" 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-col>
-            <el-col :span="8"></el-col>
-            <el-col :span="8" style="display: flex; align-items: start; justify-content: flex-end">
+            <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="8">
+              <el-form-item label="驳回时间">
+                <el-date-picker v-model="rejectTime" type="daterange" range-separator="至" start-placeholder="开始时间"
+                  end-placeholder="结束时间" value-format="YYYY-MM-DD" />
+              </el-form-item>
+            </el-col>
+            <el-col :offset="8" :span="8" style="display: flex; align-items: start; justify-content: flex-end">
               <el-button type="primary" @click="handleSearch">搜索</el-button>
-              <el-button plain>重置</el-button>
+              <el-button plain @click="handleReset">重置</el-button>
               <el-button type="primary" @click="handleExport">导出</el-button>
 
             </el-col>
@@ -359,28 +379,21 @@ const refuseReason = ref('')
 let activeName = ref('0')
 let RefusePopover = ref()
 const queryInfo = ref({
-  salesman: '',//业务员
-  attrType: '',//业务员类型
-  createTimeStart: '',//提现时间开始
-  createTimeEnd: ''//提现时间结束
 })
 const handleClick = (e) => {
   console.log()
   pages.value = 1
   size.value = 10
   queryInfo.value = {
-    salesman: '',
-    attrType: '',
-    createTimeStart: '',
-    createTimeEnd: ''
   }
   activeName.value = e.props.name
   console.log(activeName.value)
   initData(activeName.value)
   getMyPaymentTotalWithdrawalAmount()
 }
-let time1 = ref([])//提现时间
-
+let rejectTime = ref([])  // 驳回时间
+let createTime = ref([])  // 提现时间
+let paymentTime = ref([])  // 支付时间
 let firstData1 = ref([{}])
 let firstData2 = ref([{}])
 let firstData3 = ref([{}])
@@ -519,6 +532,13 @@ const accountSearch = () => {
   pageSize.value = 10
   initAccount();
 }
+// 重置
+const handleReset = () => {
+  pages.value = 1
+  size.value = 10
+  queryInfo.value = {}
+  initData(activeName.value)
+}
 let selectItem = ref(null)
 const handleCurrentChange = (row: any) => {
   selectItem.value = row
@@ -604,8 +624,12 @@ const initData = (type) => {
   api.financeApi.myPaymentList({
     salesman: queryInfo.value.salesman,
     attrType: queryInfo.value.attrType,
-    createTimeStart: time1.value?.[0],
-    createTimeEnd: time1.value?.[1],
+    createTimeStart: createTime.value?.[0],
+    createTimeEnd: createTime.value?.[1],
+    paymentTimeBegin: paymentTime.value?.[0],
+    paymentTimeEnd: paymentTime.value?.[1],
+    rejectTimeBegin: rejectTime.value?.[0],
+    rejectTimeEnd: rejectTime.value?.[1],
     ...queryInfo.value,
     auditingStatus: type,
     pageNo: pages.value,
@@ -637,8 +661,12 @@ const getMyPaymentTotalWithdrawalAmount = () => {
   api.financeApi.myPaymentTotalWithdrawalAmount({
     salesman: queryInfo.value.salesman,
     attrType: queryInfo.value.attrType,
-    createTimeStart: time1.value?.[0],
-    createTimeEnd: time1.value?.[1],
+    createTimeStart: createTime.value?.[0],
+    createTimeEnd: createTime.value?.[1],
+    paymentTimeBegin: paymentTime.value?.[0],
+    paymentTimeEnd: paymentTime.value?.[1],
+    rejectTimeBegin: rejectTime.value?.[0],
+    rejectTimeEnd: rejectTime.value?.[1],
     auditingStatus: activeName.value,
   }).then((res: any) => {
     totalAmount.value = res.msg
@@ -649,8 +677,12 @@ const handleExport = () => {
   api.financeApi.exportMyPayment({
     salesman: queryInfo.value.salesman,
     attrType: queryInfo.value.attrType,
-    createTimeStart: time1.value?.[0],
-    createTimeEnd: time1.value?.[1],
+    createTimeStart: createTime.value?.[0],
+    createTimeEnd: createTime.value?.[1],
+    paymentTimeBegin: paymentTime.value?.[0],
+    paymentTimeEnd: paymentTime.value?.[1],
+    rejectTimeBegin: rejectTime.value?.[0],
+    rejectTimeEnd: rejectTime.value?.[1],
     auditingStatus: activeName.value,
   }).then((res: any) => {
     if (res.code == 200) {
@@ -666,11 +698,23 @@ const handleExport = () => {
 
   })
 }
+const accountList = ref([])
+const getAccountList = () => {
+  api.financeApi.cardList({
+    pageSize: 1000
+  }).then((res: any) => {
+    if (res.code == 200) {
+      accountList.value = res.data.records
+    }
+  })
+}
+
 onMounted(() => {
   initData('0')
   initData('1')
   initData('2')
   getMyPaymentTotalWithdrawalAmount()
+  getAccountList()
 })
 </script>