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

src/api/modules/finance.ts

@@ -14,6 +14,7 @@ const financeApi = (axiosInstance: ApiInstance) => ({
     saveCostInfo: (data: any) => axiosInstance.post('/feeAudit/saveCostInfo', data), // 保存调整后的费用
     isLock: (data: string) => axiosInstance.get(`/feeAudit/isLock?orderNo=${data}`), // 判断领取按钮是否锁定
     verifyOrder: (data: any) => axiosInstance.post('/feeAudit/verifyOrder', data), // 审核通过/不通过
+    computedCostInfo: (data: any) => axiosInstance.post('/feeAudit/computedCostInfo', data), // 计算费用
 
     deleteIncomesByIds:(data: any) => axiosInstance.post('/receivable/deleteIncomesByIds',data), //私有协议-手续费应收-应收列表删除
     getCommissionReceivableList:(data: any) => axiosInstance.post('/receivable/getCommissionReceivableList',data), //私有协议-手续费应收-应收列表
@@ -69,7 +70,8 @@ const financeApi = (axiosInstance: ApiInstance) => ({
 
   //我的付款
     myPaymentList: (data: any) => axiosInstance.post('/amountAuditing/myPayment', data), // 我的付款列表
-
+    //我的付款-应收总额
+    myPaymentTotalWithdrawalAmount: (data: any) => axiosInstance.post('/amountAuditing/myPaymentTotalWithdrawalAmount', data), // 应收总额
     // 应付账款-概览
     getPayableStatistics: (data: any) => axiosInstance.post('userAccount/getPayableStatistics', data), // 总数
     userAccountList: (data: any) => axiosInstance.post('/userAccount/accountList', data), // 列表

src/views/finance/modules/auditDetail.vue

@@ -559,6 +559,7 @@
             <el-button size="small" v-if="!costShow" type="primary" plain @click="handleCostChange">调整费用</el-button>
             <div v-else style="display: flex; align-items: center; justify-content: flex-end">
               <el-button size="small" type="primary" plain @click="costShow = false">取消调整</el-button>
+              <el-button size="small" type="primary" plain @click="handleComputedCostInfo">留点计算</el-button>
               <el-button size="small" type="primary" plain @click="handleSaveCostChange">保存</el-button>
             </div>
           </div>
@@ -651,9 +652,9 @@
               </th>
 
               <th>
-                <el-input-number v-model="detailData.costRatio.jqKeepPointRatio" controls-position="right"
-                  v-if="costShow" style="width: 80px" :min="0" :max="100" />
-                <div v-else>{{ detailData?.costRatio?.jqKeepPointRatio }}%</div>
+                <!-- <el-input-number v-model="detailData.costRatio.jqKeepPointRatio" controls-position="right" v-if="costShow"
+                  style="width: 80px" :min="0" :max="100" /> -->
+                <div >{{ detailData?.costRatio?.jqKeepPointRatio }}%</div>
               </th>
               <th>
                 <div>￥{{ detailData?.insFeeOrders?.jqKeepPointPremium }}</div>
@@ -722,9 +723,9 @@
               </th>
 
               <th>
-                <el-input-number v-model="detailData.costRatio.syKeepPointRatio" controls-position="right"
-                  v-if="costShow" style="width: 80px" :min="0" :max="100" />
-                <div v-else>{{ detailData?.costRatio?.syKeepPointRatio }}%</div>
+                <!-- <el-input-number v-model="detailData.costRatio.syKeepPointRatio" controls-position="right" v-if="costShow"
+                  style="width: 80px" :min="0" :max="100" /> -->
+                <div >{{ detailData?.costRatio?.syKeepPointRatio }}%</div>
               </th>
               <th>
                 <div>￥{{ detailData?.insFeeOrders?.syKeepPointPremium }}</div>
@@ -793,9 +794,9 @@
               </th>
 
               <th>
-                <el-input-number v-model="detailData.costRatio.jyKeepPointRatio" controls-position="right"
-                  v-if="costShow" style="width: 80px" :min="0" :max="100" />
-                <div v-else>{{ detailData?.costRatio?.jyKeepPointRatio }}%</div>
+                <!-- <el-input-number v-model="detailData.costRatio.jyKeepPointRatio" controls-position="right" v-if="costShow"
+                  style="width: 80px" :min="0" :max="100" /> -->
+                <div >{{ detailData?.costRatio?.jyKeepPointRatio }}%</div>
               </th>
               <th>
                 <div>￥{{ detailData?.insFeeOrders?.jyKeepPointPremium }}</div>
@@ -1112,9 +1113,22 @@ let bbList = ref([
 // 调整费用
 let costShow = ref(false)
 const handleCostChange = () => {
-  getCostDetail();
   costShow.value = true
 }
+// 留点费用计算
+const handleComputedCostInfo = () => {
+  api.financeApi.computedCostInfo({
+    ...detailData.value.costRatio,
+    orderNo: myRoute.query.id
+  }).then((res: any) => {
+    if (res.code == 200) {
+      detailData.value.costRatio = res.data.costRatio
+      detailData.value.insFeeOrders = res.data.insFeeOrders
+    } else {
+    }
+  })
+}
+// 保存费用
 const handleSaveCostChange = () => {
   api.financeApi.saveCostInfo({
     ...detailData.value.costRatio,
@@ -1314,15 +1328,7 @@ const handleAudit = (type) => {
   })
 }
 
-// 获取费用详情
-let costDetail = ref({})
-const getCostDetail = () => {
-  api.financeApi.auditCostInfo(myRoute.query.id).then((res: any) => {
-    if (res.code == 200) {
-      costDetail.value = res.data
-    }
-  })
-}
+
 
 let isShow = ref('0')
 

src/views/insurancePolicy/modules/underwriting.vue

@@ -132,7 +132,7 @@
     </div>
     <div class="footer">
       <el-button class="border-[#0083FF] color-[#0083FF]" plain type="primary" @click="handleSubmit(false)">取消</el-button>
-      <el-button type="primary" @click="handleSubmit(true)">提交核保</el-button>
+      <el-button type="primary" @click="handleSubmit(true)" :loading="loading">提交核保</el-button>
     </div>
     <Equities v-if="equitiesShow" :show="equitiesShow" :recipientInfo="recipientInfo"
       :availableAmount="props.availableAmount" @cancel="equitiesShow = false" @save="handleEquitiesSave"></Equities>
@@ -158,6 +158,7 @@ const useMoney = ref(0)//可用金额
 const usedMoney = ref(0)//已使用金额
 const lastMoney = ref(0)//剩余金额
 const ImageTypeSelect = ref()
+const loading = ref(false)//提交loading
 const emit = defineEmits(['close'])
 let images = ref([])
 watch(() => props.insOrderRightsInfoDto, (newVal) => {
@@ -317,6 +318,7 @@ const selectionChange = (val) => {
 // 提交核保
 const handleSubmit = (bool) => {
   if (bool) {
+    loading.value = true
     let info = props.recipientInfo.find((item: any) => item.title == recipient.value);
     let params = {
       order: {
@@ -337,6 +339,7 @@ const handleSubmit = (bool) => {
       }
     }
     api.insurancePolicyApi.underwriting(params).then((res: any) => {
+      loading.value = false
       emit('close', res, {
         equitiesData: equitiesData.value.length,
         totalPriceCount: totalPriceCount.value

src/views/payCredit/myTask.vue

@@ -1,10 +1,10 @@
 <template>
   <PageMain class="vh100">
     <el-tabs v-model="activeName" class="demo-tabs h-full" @tab-click="handleClick">
-      <el-tab-pane :label="`已领取（${total1}）`" name="0" class="h-full">
+      <el-tab-pane  name="0" class="h-full">
         <template #label>
           <el-badge :value="total1">
-            <span>待领取</span>
+            <span>待付款</span>
           </el-badge>
         </template>
         <el-form v-model="queryInfo" label-width="100">
@@ -40,7 +40,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <p style="font-size: 14px; color: #606266">应付总额：￥30000.00</p>
+        <p style="font-size: 14px; color: #606266">应付总额：￥{{ totalAmount }}</p>
         <el-table :data="firstData1" height="calc(100% - 196px)" style="width: 100%; margin-top: 20px;">
           <el-table-column prop="name" label="业务员"></el-table-column>
           <el-table-column prop="attrType" label="业务员类型">
@@ -67,7 +67,12 @@
             @current-change="handleCurrentChange"></el-pagination>
         </div>
       </el-tab-pane>
-      <el-tab-pane :label="`已付款（${total2}）`" name="1" class="h-full">
+      <el-tab-pane  name="1" class="h-full">
+        <template #label>
+          <el-badge :value="total2">
+            <span>已付款</span>
+          </el-badge>
+        </template>
         <el-form v-model="queryInfo" label-width="100">
           <el-row :gutter="20">
             <el-col :span="8">
@@ -103,6 +108,8 @@
             </el-col>
           </el-row>
         </el-form>
+        <p style="font-size: 14px; color: #606266">应付总额：￥{{ totalAmount }}</p>
+
         <el-table :data="firstData2" height="calc(100% - 144px)" style="width: 100%; margin-top: 20px;">
           <el-table-column prop="name" label="业务员"></el-table-column>
           <el-table-column prop="attrType" label="业务员类型">
@@ -129,7 +136,12 @@
             @current-change="handleCurrentChange"></el-pagination>
         </div>
       </el-tab-pane>
-      <el-tab-pane :label="`拒绝付款（${total3}）`" name="2" class="h-full">
+      <el-tab-pane  name="2" class="h-full">
+        <template #label>
+          <el-badge :value="total3">
+            <span>拒绝付款</span>
+          </el-badge>
+        </template>
         <el-form v-model="queryInfo" label-width="100">
           <el-row :gutter="20">
             <el-col :span="8">
@@ -165,6 +177,8 @@
             </el-col>
           </el-row>
         </el-form>
+        <p style="font-size: 14px; color: #606266">应付总额：￥{{ totalAmount }}</p>
+
         <el-table :data="firstData3" height="calc(100% - 144px)" style="width: 100%; margin-top: 20px;">
           <el-table-column prop="name" label="业务员"></el-table-column>
           <el-table-column prop="attrType" label="业务员类型">
@@ -212,7 +226,9 @@ const handleClick = (e) => {
   size.value = 10
   queryInfo.value = {}
   activeName.value = e.props.name
+  console.log(activeName.value)
   initData(activeName.value)
+  getMyPaymentTotalWithdrawalAmount()
 }
 let time1 = ref([])//提现时间
 
@@ -262,11 +278,26 @@ const handleSearch = () => {
   pages.value = 1
   size.value = 10
   initData(activeName.value)
+  getMyPaymentTotalWithdrawalAmount()
+}
+let totalAmount = ref(0)
+//我的付款-应收总额
+const getMyPaymentTotalWithdrawalAmount = () => {
+  api.financeApi.myPaymentTotalWithdrawalAmount({
+    salesman: queryInfo.value.salesman,
+    attrType: queryInfo.value.attrType,
+    createTimeStart: time1.value?.[0],
+    createTimeEnd: time1.value?.[1],
+    auditingStatus: activeName.value,
+  }).then((res: any) => {
+      totalAmount.value = res.msg
+  })
 }
 onMounted(() => {
   initData('0')
   initData('1')
   initData('2')
+  getMyPaymentTotalWithdrawalAmount()
 })
 </script>
 

src/views/platform/platformRecord.vue

@@ -76,6 +76,11 @@
       </el-table-column>
       <el-table-column prop="createBy" label="结算人" width="100"></el-table-column>
       <el-table-column prop="createTime" label="结算时间"></el-table-column>
+      <el-table-column label="操作" width="200">
+        <template #default="scope">
+          <el-button link type="primary" @click="viewDetail(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]"
@@ -87,6 +92,9 @@
 
 <script setup lang="ts">
 import api from "@/api";
+import { useRoute, useRouter } from 'vue-router';
+const route = useRoute();
+const router = useRouter();
 
 let form = ref({});
 let tableData = ref([]);
@@ -182,6 +190,16 @@ const initOption = () => {
     })
   })
 }
+const viewDetail = (row) => {
+  console.log(row)
+  router.push({
+    name: 'platformReport',
+    query: {
+      settlementId: row.settlementId,
+      activeName:"3"
+    }
+  })
+}
 onMounted(() => {
   initList();
   initOption();

src/views/platform/platformReport.vue

@@ -107,8 +107,8 @@
         <el-form v-model="recordForm2" label-width="120">
           <el-row :gutter="20">
             <el-col :span="8">
-              <el-form-item prop="invoiceId" label="开票记录编号">
-                <el-input v-model="recordForm2.invoiceId"></el-input>
+              <el-form-item prop="settlementId" label="结算记录编号">
+                <el-input v-model="recordForm2.settlementId"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -184,7 +184,16 @@
 
 <script setup lang="ts">
 import api from '@/api'
-
+import { useRoute, useRouter } from 'vue-router';
+const route = useRoute();
+const router = useRouter();
+// 结算记录
+let recordForm = ref({})
+let recordForm1 = ref({})
+let recordForm2 = ref({})
+let recordData = ref([])
+let recordData1 = ref([])
+let recordData2 = ref([])
 let activeName = ref('1')
 const handleClick = (e) => {
   pages.value = 1
@@ -204,7 +213,13 @@ const handleClick = (e) => {
       break;
   }
 }
-
+if(route.query.activeName){
+  activeName.value = route.query.activeName as string
+  recordForm2.value.settlementId = route.query.settlementId as string
+}
+else{
+  activeName.value = '1'
+}
 // 保险公司
 let companyList = ref([])
 const initCompany = () => {
@@ -258,13 +273,7 @@ const getSummaries = (param) => {
   return sums
 }
 
-// 结算记录
-let recordForm = ref({})
-let recordForm1 = ref({})
-let recordForm2 = ref({})
-let recordData = ref([])
-let recordData1 = ref([])
-let recordData2 = ref([])
+
 const handleSearch1 = () => {
   initData1()
 }

src/views/receivable/documentary/documentaryReport.vue

@@ -489,10 +489,10 @@ const handleSearch = (type) => {
       initData2()
       break;
     case 3:
-      initData3('2')
+      initData3(['2'])
       break;
     case 4:
-      initData3('4')
+      initData3(['4'])
       break;
   }
 }

src/views/receivable/handingFee/invoiceRecord.vue

@@ -75,7 +75,9 @@
       <el-table-column prop="taxPoint" label="税点" width="120"></el-table-column>
       <el-table-column prop="actualReceivedAmount" label="开票金额" width="120"></el-table-column>
       <el-table-column prop="receivableSupervisePremium" label="应收金额" width="120"></el-table-column>
-      <el-table-column prop="settlementStatus" label="结算状态" width="120"></el-table-column>
+      <el-table-column prop="settlementStatus" label="结算状态" width="120">
+
+      </el-table-column>
       <el-table-column prop="settlementAmount" label="已结算金额" width="120"></el-table-column>
       <el-table-column prop="remainSettlementAmount" label="待结算金额" width="120"></el-table-column>
       <el-table-column prop="createBy" label="开票人" width="120"></el-table-column>
@@ -83,7 +85,7 @@
       <el-table-column label="操作" width="200" fixed="right" align="center">
         <template #default="scope">
           <el-button link type="primary" @click="handleCount(scope.row)">结算</el-button>
-          <el-button link type="primary" @click="handleView(scope.row)">明细查询</el-button>
+          <el-button link type="primary" v-if="scope.row.settlementStatus == '已结算'" @click="handleView(scope.row)">明细查询</el-button>
           <el-button link type="primary" @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>
@@ -157,7 +159,12 @@
 <script setup lang="ts">
 
 import api from "@/api";
+import { useRoute, useRouter } from 'vue-router'
 import { ElMessage, ElMessageBox } from 'element-plus'
+
+const route = useRoute()
+const router = useRouter()
+
 const companyIdprops = {
   expandTrigger: 'hover' as const,
   value: 'id',
@@ -249,9 +256,13 @@ const uploadImage = async (file, fileList) => {
 }
 // 明细查询
 const handleView = (row) => {
-  const href = window.location.href.split('#')
-  const newHref = href[0] + '#/receivable/private/handingFee?activeName=2&id=' + row.id
-  window.open(newHref, '_blank');
+  router.push({
+    path: '/receivable/private/report',
+    query: {
+      activeName: '2',
+      id: row.id
+    }
+  })
 }
 // 删除
 const handleDelete = (row) => {