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

src/api/modules/finance.ts

@@ -22,6 +22,8 @@ const financeApi = (axiosInstance: ApiInstance) => ({
     commissionInvoicing: (data: any) => axiosInstance.post('/receivable/commissionInvoicing', data), // 开票
     // 删除开票记录
     deleteInvoiceById: (data: any) => axiosInstance.delete(`/receivable/deleteInvoiceById/${data}`),
+    //金额总计
+    queryTotalWithdrawalAmount: (data: any) => axiosInstance.post('/amountAuditing/queryTotalWithdrawalAmount', data),
     // 结算
     settlement: (data: any) => axiosInstance.post('/receivable/settlement', data),
     // 非车险应收

src/views/payCredit/index.vue

@@ -56,6 +56,9 @@
               <el-button plain @click="handleReset">重置</el-button>
             </el-col>
           </el-row>
+          <el-col :span="8">
+            <span>提现金额总计: {{ totalAmount || 0 }}</span>
+          </el-col>
         </el-form>
         <el-table :data="firstData4" height="calc(100% - 194px)" style="width: 100%; margin-top: 20px;">
           <el-table-column prop="name" label="业务员"></el-table-column>
@@ -65,7 +68,7 @@
               {{ 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' ? '渠道' :'' }}
+                  '6' ? '个代' : scope.row.attrType == '7' ? '电销' : scope.row.attrType == '8' ? '渠道' : '' }}
             </template>
           </el-table-column>
           <el-table-column prop="managerName" label="管理人"></el-table-column>
@@ -143,6 +146,9 @@
               <el-button plain @click="handleReset">重置</el-button>
             </el-col>
           </el-row>
+          <el-col :span="8">
+            <span>提现金额总计: {{ totalAmount || 0 }}</span>
+          </el-col>
         </el-form>
         <el-table :data="firstData1" height="calc(100% - 194px)" style="width: 100%; margin-top: 20px;">
           <el-table-column prop="name" label="业务员"></el-table-column>
@@ -152,7 +158,7 @@
               {{ 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' ? '渠道' :'' }}
+                  '6' ? '个代' : scope.row.attrType == '7' ? '电销' : scope.row.attrType == '8' ? '渠道' : '' }}
             </template>
           </el-table-column>
           <el-table-column prop="managerName" label="管理人"></el-table-column>
@@ -239,6 +245,9 @@
               <el-button plain @click="handleReset">重置</el-button>
             </el-col>
           </el-row>
+          <el-col :span="8">
+            <span>提现金额总计: {{ totalAmount || 0 }}</span>
+          </el-col>
         </el-form>
         <el-table :data="firstData2" height="calc(100% - 194px)" style="width: 100%; margin-top: 20px;">
           <el-table-column prop="name" label="业务员"></el-table-column>
@@ -248,7 +257,7 @@
               {{ 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' ? '渠道' :'' }}
+                  '6' ? '个代' : scope.row.attrType == '7' ? '电销' : scope.row.attrType == '8' ? '渠道' : '' }}
             </template>
           </el-table-column>
           <el-table-column prop="managerName" label="管理人"></el-table-column>
@@ -323,6 +332,9 @@
               <el-button plain @click="handleReset">重置</el-button>
             </el-col>
           </el-row>
+          <el-col :span="8">
+            <span>提现金额总计: {{ totalAmount || 0 }}</span>
+          </el-col>
         </el-form>
         <el-table :data="firstData3" height="calc(100% - 194px)" style="width: 100%; margin-top: 20px;">
           <el-table-column prop="name" label="业务员"></el-table-column>
@@ -332,11 +344,14 @@
               {{ 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' ? '渠道' :'' }}
+                  '6' ? '个代' : scope.row.attrType == '7' ? '电销' : scope.row.attrType == '8' ? '渠道' : '' }}
             </template>
           </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="bankCardNum" label="银行卡号"></el-table-column>
           <el-table-column prop="bank" label="银行"></el-table-column>
@@ -422,6 +437,7 @@ const handleClick = (e) => {
   activeName.value = e.props.name
   type.value = e.props.name
   initData(activeName.value)
+  queryTotalWithdrawalAmount()
 }
 
 // 待审核
@@ -555,7 +571,28 @@ const initData = (type) => {
     }
   })
 }
-
+// 金额总计
+let totalAmount = ref(0)
+const queryTotalWithdrawalAmount = () => {
+  api.financeApi.queryTotalWithdrawalAmount({
+    salesman: firstForm.value.salesman,
+    attrType: firstForm.value.attrType,
+    createTimeStart: firstForm.value.createTime?.[0],
+    createTimeEnd: firstForm.value.createTime?.[1],
+    auditingUser: firstForm.value.auditingUser,
+    auditTimeStart: firstForm.value.auditTime?.[0],
+    auditTimeEnd: firstForm.value.auditTime?.[0],
+    auditingStatus: type.value == '0' || type.value == '3' ? '0' : type.value,
+    receiveUser: type.value != '3' ? localStorage.getItem('userName') : '',
+    pageNo: pages.value,
+    pageSize: size.value
+  }).then((res: any) => {
+    if (res.code == 200) {
+      totalAmount.value = res.data
+    }
+  })
+}
+queryTotalWithdrawalAmount()
 // 体现付款
 let drawShow = ref(false)
 let drawForm = ref({
@@ -673,7 +710,7 @@ const initAccount = () => {
   })
 }
 // 数据导出
-const handleExport=()=>{
+const handleExport = () => {
   api.financeApi.exportPayableExcel({
     salesman: firstForm.value.salesman,
     attrType: firstForm.value.attrType,
@@ -702,6 +739,7 @@ onMounted(() => {
   initData('1')
   initData('2')
   initData('3')
+  queryTotalWithdrawalAmount()
 })
 
 </script>

src/views/platform/index.vue

@@ -163,10 +163,28 @@
           <el-table-column prop="settlementStatusName" label="结算状态" width="100"></el-table-column>
           <el-table-column prop="insuredPerson" label="被保人" width="100"></el-table-column>
           <el-table-column prop="jqPremium" label="交强险保费" width="100"></el-table-column>
+          <el-table-column prop="jqSuperviseCostsProportion" label="交强险手续费比例" width="150"></el-table-column>
+          <el-table-column prop="jqSuperviseCostsProportion" label="交强入口比例" width="120">
+            <template #default="scope">
+              {{ scope.row.insFeeOrders.jqInletRatio || '-' }}
+            </template>
+          </el-table-column>
           <el-table-column prop="taxPremium" label="车船税" width="100"></el-table-column>
-          <el-table-column prop="jqSuperviseCostsProportion" label="交强险手续费比例" width="100"></el-table-column>
           <el-table-column prop="syPremium" label="商业险保费" width="100"></el-table-column>
-          <el-table-column prop="sySuperviseCostsProportion" label="商业险手续费比例" width="100"></el-table-column>
+          <el-table-column prop="sySuperviseCostsProportion" label="商业险手续费比例" width="150"></el-table-column>
+          <el-table-column prop="sySuperviseCostsProportion" label="商业入口比例" width="120">
+            <template #default="scope">
+              {{ scope.row.insFeeOrders.syInletRatio || '-' }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="jyPremium" label="非车保费" width="100"></el-table-column>
+          <el-table-column prop="sySuperviseCostsProportion" label="非车入口比例" width="120">
+            <template #default="scope">
+              {{ scope.row.insFeeOrders.jyInletRatio || '-' }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="receivableAmount" label="总应收金额" width="100"></el-table-column>
+
           <el-table-column prop="jqPolicyNo" label="交强险保单号" width="150"></el-table-column>
           <el-table-column prop="syPolicyNo" label="商业险保单号" width="150"></el-table-column>
           <el-table-column prop="jqStartDate" label="交强险起保日期" width="150"></el-table-column>