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

src/views/finance/modules/auditDetail.vue

@@ -908,7 +908,7 @@
                   Number(detailData?.insFeeOrders?.jyExportKeepPointPremium)).toFixed(5) }}</div>
               </th>
               <th colspan="2">
-                --
+                <div>利润差额:￥{{ detailData?.insFeeOrders?.totalExportDiffAmount || 0  }}</div>
               </th>
             </tr>
           </tbody>

src/views/payCredit/index.vue

@@ -9,16 +9,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>
@@ -34,22 +24,31 @@
               </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-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.auditingUser" 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.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-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="提现金额">
+                <el-input v-model="firstForm.amount" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="24" style="display: flex; align-items: center; justify-content: flex-end">
               <el-button plain @click="handleExport">数据导出</el-button>
               <el-button type="primary" @click="handleSearch">搜索</el-button>
@@ -62,8 +61,6 @@
         </el-form>
         <el-table :data="firstData4" 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 ==
@@ -72,12 +69,14 @@
                   '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 label="操作" fixed="right" width="200">
@@ -100,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>
@@ -124,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="至"
@@ -131,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">
@@ -153,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 ==
@@ -163,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>
@@ -431,14 +438,14 @@ 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
-  firstForm.value = {}
   activeName.value = e.props.name
   type.value = e.props.name
+  firstForm.value = {}
   initData(activeName.value)
   queryTotalWithdrawalAmount()
 }
@@ -454,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)
 }
 
@@ -556,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

src/views/platform/index.vue

@@ -388,7 +388,7 @@
             下载「标准导入模板」，编辑后上传；系统将自动匹配相关字段
             <el-button link type="primary" @click="exportData">下载模板</el-button>
           </div>
-          <el-upload class="upload-demo" drag accept=".xls, .xlsx" :auto-upload="false" @change="uploadJYFile">
+          <el-upload class="upload-demo" drag accept=".xls, .xlsx" :auto-upload="false" :show-file-list="false" @change="uploadJYFile">
             <el-icon class="el-icon--upload"><upload-filled /></el-icon>
             <div class="el-upload__text">
               点击或将文件拖拽到这里上传
@@ -404,13 +404,12 @@
               </span> 条数据，其中 <span style="color:#409eff;">{{ importModifyCallback?.successNumber || 0 }} </span>
               条正常导入；<span style="color: red;">{{ importModifyCallback?.failedNumber || 0 }}</span> 条不符合要求无法导入。
             </div>
-            <el-button type="primary" link @click="downloadImportFailedData(importModifyCallback)">下载导入失败文件</el-button>
           </div>
         </el-tab-pane>
       </el-tabs>
       <template #footer>
         <el-button class="border-[#0083FF] color-[#0083FF]" plain @click="batchEditShow = false">取消</el-button>
-        <el-button type="primary" @click="handleBatchEditSubmit()">确定</el-button>
+        <el-button v-if="subActiveName == 'first'" type="primary" @click="handleBatchEditSubmit()">确定</el-button>
       </template>
     </el-dialog>
     <el-dialog :close-on-click-modal="false" v-model="settlementDialog" width="600" title="结算">
@@ -651,25 +650,24 @@ const getUnauditedOrder = () => {
 const exportData = () => {
   let params = {
     licenseNo: receivableForm.value?.licenseNo,
+    typeAttr: receivableForm.value?.typeAttr,
     companyId: receivableForm.value?.companyId,
-    signingStartTime: receivableForm.value?.signingTime?.[0],
-    signingEndTime: receivableForm.value?.signingTime?.[1],
+    signingTimeStart: receivableForm.value?.signingTime?.[0],
+    signingTimeEnd: receivableForm.value?.signingTime?.[1],
     orderNo: receivableForm.value?.orderNo,
     agreementId: receivableForm.value?.agreementId,
-    deptId: receivableForm.value?.deptId,
-    riskCode: receivableForm.value?.riskCode,
+    deptId: receivableForm.value?.deptId?.join(),
+    productName: receivableForm.value?.productName,
     orderType: receivableForm.value?.orderType,
     insuredName: receivableForm.value?.insuredName,
-    jqPolicyNo: receivableForm.value?.jqPolicyNo,
-    syPolicyNo: receivableForm.value?.syPolicyNo,
+    jyPolicyNo: receivableForm.value?.jyPolicyNo,
     dockingPerson: receivableForm.value?.dockingPerson,
     jqStartDate: receivableForm.value?.jqDate?.[0],
     jqEndDate: receivableForm.value?.jqDate?.[1],
     syStartDate: receivableForm.value?.syDate?.[0],
     syEndDate: receivableForm.value?.syDate?.[1],
-    queryType: activeName.value == '1' ? '1' : activeName.value == '2' ? '3' : ''
   }
-  api.financeApi.exportReceivable(params).then((res: any) => {
+  api.financeApi.exportTemplateReceivableList(params).then((res: any) => {
     if (res.code == 200) {
       const link = document.createElement('a');
       link.href = res.msg;
@@ -776,6 +774,7 @@ const handleBatchEdit = () => {
     return
   }
   editForm.value = {}
+  importModifyCallback.value = null
   batchEditShow.value = true
 }
 
@@ -801,7 +800,7 @@ const uploadJYFile = async (file) => {
   let files = file.raw
   const params = new FormData(); // 声明formData数据类型
   params.append("file", files);
-  const { code, data, msg } = await api.financeApi.importPlatformExcel(params)
+  const { code, data, msg } = await api.financeApi.importReceivableListUpdate(params)
   if (code == 200) {
     importModifyCallback.value = data
     ElMessage({

src/views/receivable/handingFee/index.vue

@@ -539,7 +539,7 @@
             下载「标准导入模板」，编辑后上传；系统将自动匹配相关字段
             <el-button link type="primary" @click="exportData">下载模板</el-button>
           </div>
-          <el-upload class="upload-demo" drag accept=".xls, .xlsx" :auto-upload="false" @change="uploadJYFile">
+          <el-upload class="upload-demo" drag accept=".xls, .xlsx" :auto-upload="false" :show-file-list="false" @change="uploadJYFile">
             <el-icon class="el-icon--upload"><upload-filled /></el-icon>
             <div class="el-upload__text">
               点击或将文件拖拽到这里上传
@@ -555,13 +555,12 @@
               </span> 条数据，其中 <span style="color:#409eff;">{{ importModifyCallback?.successNumber || 0 }} </span>
               条正常导入；<span style="color: red;">{{ importModifyCallback?.failedNumber || 0 }}</span> 条不符合要求无法导入。
             </div>
-            <el-button type="primary" link @click="downloadImportFailedData(importModifyCallback)">下载导入失败文件</el-button>
           </div>
         </el-tab-pane>
       </el-tabs>
       <template #footer>
         <el-button class="border-[#0083FF] color-[#0083FF]" plain @click="batchEditShow = false">取消</el-button>
-        <el-button type="primary" @click="handleBatchEditSubmit">确定</el-button>
+        <el-button v-if="subActiveName=='first'" type="primary" @click="handleBatchEditSubmit">确定</el-button>
       </template>
     </el-dialog>
   </PageMain>
@@ -962,7 +961,9 @@ const handleBatchEdit = () => {
     return
   }
   editForm.value = {}
+  importModifyCallback.value = null
   batchEditShow.value = true
+
 }
 
 const handleBatchEditSubmit = async () => {