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

src/api/modules/finance.ts

@@ -121,6 +121,12 @@ const financeApi = (axiosInstance: ApiInstance) => ({
     queryReceivableContact: (data: any) => axiosInstance.post('/receivable/queryReceivableContact', data),
     // 查应收金额
     getPlatformSettlementReceivableAmount: (data: any) => axiosInstance.post('/receivable/getPlatformSettlementReceivableAmount', data),
+
+
+    // 应收金额总计
+    getCommissionReceivableTotalAmount: (data: any) => axiosInstance.post('/receivable/getCommissionReceivableTotalAmount', data),//手续
+    getOtherReceivableTotalAmount: (data: any) => axiosInstance.post('/receivable/getOtherReceivableTotalAmount', data),//跟单
+    getPlatformReceivableTotalAmount: (data: any) => axiosInstance.post('/receivable/getPlatFormReceivableTotalAmount', data),//平台
 })
 
 export default financeApi

src/api/modules/settlement.ts

@@ -20,7 +20,8 @@ const settlementApi = (axiosInstance: ApiInstance) => ({
     exportReceiverSettlementReportExcel: (data: any) => axiosInstance.post('/receivable/exportReceiverSettlementReportExcel', data, {
         responseType: 'blob'
     }), // 平台对接人导出
-
+    // 结算记录删除接口
+    deleteSettlement: (id: string) => axiosInstance.delete(`/receivable/deleteSettlementById/${id}`),
 })
 
 export default settlementApi

src/views/insurancePolicy/adjustRecord.vue

@@ -202,7 +202,7 @@ const handleExport = () => {
 // 详情
 const toDetail = (e: any) => {
     router.push({
-        path: '/insurancePolicy/adjustRecord/detail',
+        path: '/insurancePolicy/order/insurancePolicyOrderDetail',
         query: {
             id: e.operationData.id,
 			orderNo: e.operationData.orderNo,

src/views/platform/index.vue

@@ -148,6 +148,8 @@
           <span class="col-108 m-r-8">
             已选: <span class="text-red">{{selectedList.length}}</span> 条
           </span>
+          <span>应收金额总计：${{ receivedAmountTotal || 0 }}</span>
+
         </el-row>
         <el-table :data="receiveData" :height="isTrue ? 'calc(100% - 446px)' : 'calc(100% - 346px)'"
           style="width: 100%; margin-top: 20px;" ref="ReceiveDataRef1" @select="handleSelectChange1"
@@ -565,12 +567,16 @@ let myRouter = useRouter()
 let ticketRef = ref(null)
 let activeName = ref('1')
 let subActiveName = ref('first')
-
+let receivedAmountTotal = ref(0)
 const handleTabsClick = (e) => {
+  console.log(e.props.name)
+  activeName.value = e.props.name
   if (e.props.name == '1') {
     getPlatFormReceivableList()
+    getreceivedAmountTotal()
   } else if (e.props.name == '2') {
     getPlatformReceivableList()
+    getreceivedAmountTotal()
   }
   isTrue.value = false
   receivableForm.value = {}
@@ -606,12 +612,43 @@ const reset = () => {
   size.value = 10
   if (activeName.value == '1') {
     getPlatFormReceivableList()
+    getreceivedAmountTotal()
   } else if (activeName.value == '2') {
     getPlatformReceivableList()
+    getreceivedAmountTotal()
   }
 
 }
+const  getreceivedAmountTotal = () => {
+  let params = {
+    licenseNo: receivableForm.value?.licenseNo,
+    typeAttr: receivableForm.value?.typeAttr,
+    companyId: receivableForm.value?.companyId,
+    signingStartTime: receivableForm.value?.signingTime?.[0],
+    signingEndTime: receivableForm.value?.signingTime?.[1],
+    orderNo: receivableForm.value?.orderNo,
+    agreementId: receivableForm.value?.agreementId,
+    deptId: receivableForm.value?.deptId,
+    riskCode: receivableForm.value?.riskCode,
+    orderType: receivableForm.value?.orderType,
+    insuredName: receivableForm.value?.insuredName,
+    jqPolicyNo: receivableForm.value?.jqPolicyNo,
+    syPolicyNo: receivableForm.value?.syPolicyNo,
+    dockingPerson: receivableForm.value?.dockingPerson,
+    jqStartDate: receivableForm.value?.jqDate?.[0],
+    jqEndDate: receivableForm.value?.jqDate?.[1],
+    syStartDate: receivableForm.value?.syDate?.[0],
+    syEndDate: receivableForm.value?.syDate?.[1],
+    pages: pages.value,
+    size: size.value
+  }
 
+  api.financeApi.getPlatformReceivableTotalAmount(params).then((res: any) => {
+    if (res.code == 200) {
+      receivedAmountTotal.value = res.data
+    }
+  })
+}
 let ReceiveDataRef1 = ref()
 // 选中的数据
 let selectedList = ref([])
@@ -895,11 +932,25 @@ const downloadImportFailedData = (item) => {
 // 分页
 let pages = ref(1)
 let size = ref(10)
-const handleSizeChange = (size) => {
-  size.value = size
+const handleSizeChange = (val) => {
+  size.value = val
+  if (activeName.value == '1') {
+    getPlatFormReceivableList()
+    getreceivedAmountTotal()
+  } else if (activeName.value == '2') {
+    getPlatformReceivableList()
+    getreceivedAmountTotal()
+  }
 }
-const handleCurrentChange = (page) => {
-  pages.value = page
+const handleCurrentChange = (val) => {
+  pages.value = val
+  if (activeName.value == '1') {
+    getPlatFormReceivableList()
+    getreceivedAmountTotal()
+  } else if (activeName.value == '2') {
+    getPlatformReceivableList()
+    getreceivedAmountTotal()
+  }
 }
 
 // 获取险种
@@ -1082,6 +1133,7 @@ onMounted(() => {
   initCompany();
   initDept();
   getPlatFormReceivableList();
+  getreceivedAmountTotal();
 })
 </script>
 

src/views/platform/ticket.vue

@@ -359,11 +359,13 @@ const uploadJYFile = async (file) => {
   const { code, data, msg } = await api.financeApi.importAccountsReceivableInvoice(params)
   if (code == 200) {
     importModifyCallback.value = data
-    api.financeApi.getSelectedReceivableList({ orderNos: data.orderNos }).then((res: any) => {
-      if (res.code == 200) {
-        tableData.value = res.data
-      }
-    })
+    if(data.orderNos.length>0){
+      api.financeApi.getSelectedReceivableList({ orderNos: data.orderNos }).then((res: any) => {
+        if (res.code == 200) {
+          tableData.value = res.data
+        }
+      })
+    }
     ElMessage({
       message: msg,
       type: 'success'

src/views/receivable/documentary/documentaryReport.vue

@@ -143,6 +143,12 @@
           <el-table-column prop="createBy" label="结算人" width="100"></el-table-column>
           <el-table-column prop="createTime" label="结算时间" width="200"></el-table-column>
           <el-table-column prop="invoiceId" label="开票记录编号"></el-table-column>
+          <el-table-column label="操作" width="100">
+            <template #default="scope">
+              <el-button link type="primary" @click="handleDetail(scope.row)">删除</el-button>
+              <el-button link type="primary" @click="handleOrderDetail(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]"
@@ -304,8 +310,12 @@
 </template>
 
 <script setup lang="ts">
+import { ElMessage, ElMessageBox } from 'element-plus'
 import api from '@/api'
+import { useRouter, useRoute } from 'vue-router'
 
+const router = useRouter()
+const route = useRoute()
 let activeName = ref('1')
 const handleClick = (e) => {
   pages.value = 1
@@ -630,8 +640,41 @@ const exportOtherSettlementDetailJyExcel = () => {
     }
   })
 }
+const handleDetail = (type) => {
+  ElMessageBox.confirm(
+    '确定删除该记录吗？',
+    '删除',
+    {
+      confirmButtonText: '确定删除',
+      type: 'error',
+      center: true,
+      confirmButtonClass: 'el-button--danger',
+    }
+  )
+    .then(() => {
+      api.settlementApi.deleteSettlement(type.settlementId).then((res: any) => {
+        if (res.code == 200) {
+          ElMessage({
+            message: '删除成功',
+            type: 'success'
+          })
+          initData2()
+        }
+      })
+    })
+    .catch(() => {
+    })
 
-const optionObj=ref({})
+}
+const handleOrderDetail = (type: any) => {
+  router.push({
+    path: '/insurancePolicy/order/insurancePolicyOrderDetail',
+    query: {
+      orderNo: type.orderNo
+    }
+  })
+}
+const optionObj = ref({})
 const initOption = () => {
   let list = ['invoice_risk_type', 'invoice_party', 'settlement_status']
   list.forEach(item => {

src/views/receivable/documentary/index.vue

@@ -147,6 +147,7 @@
           <span class="col-108 m-r-8">
             已选: <span class="text-red">{{ selectedList.length }}</span> 条
           </span>
+          <span>应收金额总计：${{ receivedAmountTotal || 0 }}</span>
         </el-row>
         <el-table :data="receiveData" :height="isTrue ? 'calc(100% - 396px)' : 'calc(100% - 296px)'"
           style="width: 100%; margin-top: 20px;" ref="ReceiveDataRef1" @select="handleSelectChange1"
@@ -547,11 +548,13 @@ import { useRouter } from 'vue-router'
 let myRouter = useRouter()
 
 let activeName = ref('1')
-let subActiveName = ref('first')
-
+let subActiveName = ref('1')
+const  receivedAmountTotal = ref(0)
 const handleTabsClick = (e) => {
+  activeName.value = e.props.name
   if (e.props.name == '1') {
     getOtherReceivableList()
+    getreceivedAmountTotal()
   } else if (e.props.name == '2') {
     getJyOtherReceivableList()
   }
@@ -615,6 +618,36 @@ const selectAll = (type: boolean) => {
     selectedList.value = []
   }
 }
+const  getreceivedAmountTotal = () => {
+  let params = {
+    licenseNo: receivableForm.value?.licenseNo,
+    typeAttr: receivableForm.value?.typeAttr,
+    companyId: receivableForm.value?.companyId,
+    signingStartTime: receivableForm.value?.signingTime?.[0],
+    signingEndTime: receivableForm.value?.signingTime?.[1],
+    orderNo: receivableForm.value?.orderNo,
+    agreementId: receivableForm.value?.agreementId,
+    deptId: receivableForm.value?.deptId,
+    riskCode: receivableForm.value?.riskCode,
+    orderType: receivableForm.value?.orderType,
+    insuredName: receivableForm.value?.insuredName,
+    jqPolicyNo: receivableForm.value?.jqPolicyNo,
+    syPolicyNo: receivableForm.value?.syPolicyNo,
+    dockingPerson: receivableForm.value?.dockingPerson,
+    jqStartDate: receivableForm.value?.jqDate?.[0],
+    jqEndDate: receivableForm.value?.jqDate?.[1],
+    syStartDate: receivableForm.value?.syDate?.[0],
+    syEndDate: receivableForm.value?.syDate?.[1],
+    pages: pages.value,
+    size: size.value
+  }
+
+  api.financeApi.getOtherReceivableTotalAmount(params).then((res: any) => {
+    if (res.code == 200) {
+      receivedAmountTotal.value = res.data
+    }
+  })
+}
 // 全选类型改变
 const selectTypeChange = (type) => {
   selectAllValue.value = true
@@ -962,11 +995,24 @@ const initCompany = () => {
 // 分页
 let pages = ref(1)
 let size = ref(10)
-const handleSizeChange = (size) => {
-  size.value = size
+const handleSizeChange = (val) => {
+  console.log(val)
+  size.value = val
+  if (activeName.value == '1') {
+    getOtherReceivableList()
+    getreceivedAmountTotal()
+  } else if (activeName.value == '2') {
+    getJyOtherReceivableList()
+  }
 }
-const handleCurrentChange = (page) => {
-  pages.value = page
+const handleCurrentChange = (val) => {
+  pages.value = val
+  if (activeName.value == '1') {
+    getOtherReceivableList()
+    getreceivedAmountTotal()
+  } else if (activeName.value == '2') {
+    getJyOtherReceivableList()
+  }
 }
 
 const search = () => {
@@ -974,9 +1020,11 @@ const search = () => {
   size.value = 10
   if (activeName.value == '1') {
     getOtherReceivableList()
+    getreceivedAmountTotal()
   }
   if (activeName.value == '2') {
     getJyOtherReceivableList()
+    getreceivedAmountTotal()
   }
 }
 const reset = () => {
@@ -1123,6 +1171,7 @@ onMounted(() => {
   initCompany();
   initDept();
   getOtherReceivableList();
+  getreceivedAmountTotal();
 })
 
 </script>

src/views/receivable/handingFee/index.vue

@@ -112,7 +112,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-row :gutter="8" class="flex a-c " style="margin: 20px 0">
+        <el-row  class="flex a-c " style="margin: 20px 0">
           <span class="flex col-160 m-r-8 bg-F9">
             <el-checkbox class="p-w-12" @change="selectAll" v-model="selectAllValue"></el-checkbox>&nbsp;
             <el-select class="select-all width-100" placeholder="全选" v-model="selectType" @change="selectTypeChange">
@@ -149,7 +149,10 @@
           <span class="col-108 m-r-8">
             已选: <span class="text-red">{{ selectedList.length }}</span> 条
           </span>
+          <span>应收金额总计：${{ receivedAmountTotal || 0 }}</span>
         </el-row>
+
+
         <el-table :data="receiveData" :height="isTrue ? 'calc(100% - 396px)' : 'calc(100% - 246px)'"
           style="width: 100%; margin-top: 20px;" row-key="id" ref="ReceiveDataRef1" @select="handleSelectChange1"
           @select-all="handleSelectAll1">
@@ -548,7 +551,7 @@ let myRouter = useRouter()
 
 let activeName = ref('1')
 let subActiveName = ref('first')
-
+const  receivedAmountTotal = ref(0)//应收金额总计
 const handleTabsClick = (e) => {
   if (e.props.name == '1') {
     getCommissionReceivableList()
@@ -909,10 +912,12 @@ const downloadImportFailedData = (item) => {
 // 分页
 let pages = ref(1)
 let size = ref(10)
-const handleSizeChange = (size) => {
-  size.value = size
+const handleSizeChange = (val) => {
+
+  size.value = val
   if (activeName.value == '1') {
     getCommissionReceivableList()
+    getreceivedAmountTotal()
   } else if (activeName.value == '2') {
     getJyReceivableList()
   }
@@ -921,6 +926,7 @@ const handleCurrentChange = (page) => {
   pages.value = page
   if (activeName.value == '1') {
     getCommissionReceivableList()
+    getreceivedAmountTotal()
   } else if (activeName.value == '2') {
     getJyReceivableList()
   }
@@ -937,7 +943,48 @@ const toEdit = (row: any) => {
     }
   })
 }
+const search = () => {
+  pages.value = 1
+  size.value = 10
+  if (activeName.value == '1') {
+    getCommissionReceivableList()
+    getreceivedAmountTotal()
+  }
+  if (activeName.value == '2') {
+    getJyReceivableList()
+  }
+}
+const  getreceivedAmountTotal = () => {
+  let params = {
+    invoiceId: receivableForm.value?.invoiceId,
+    licenseNo: receivableForm.value?.licenseNo,
+    typeAttr: receivableForm.value?.typeAttr,
+    companyId: receivableForm.value?.companyId,
+    signingStartTime: receivableForm.value?.signingTime?.[0],
+    signingEndTime: receivableForm.value?.signingTime?.[1],
+    orderNo: receivableForm.value?.orderNo,
+    agreementId: receivableForm.value?.agreementId,
+    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,
+    dockingPerson: receivableForm.value?.dockingPerson,
+    jqStartDate: receivableForm.value?.jqDate?.[0],
+    jqEndDate: receivableForm.value?.jqDate?.[1],
+    syStartDate: receivableForm.value?.syDate?.[0],
+    syEndDate: receivableForm.value?.syDate?.[1],
+    pages: pages.value,
+    size: size.value
+  }
 
+  api.financeApi.getCommissionReceivableTotalAmount(params).then((res: any) => {
+    if (res.code == 200) {
+      receivedAmountTotal.value = res.data
+    }
+  })
+}
 // 获取险种
 let insuranceType = ref([])
 const dictDetails = () => {
@@ -978,16 +1025,7 @@ const initDept = () => {
   })
 }
 
-const search = () => {
-  pages.value = 1
-  size.value = 10
-  if (activeName.value == '1') {
-    getCommissionReceivableList()
-  }
-  if (activeName.value == '2') {
-    getJyReceivableList()
-  }
-}
+
 const reset = () => {
   receivableForm.value = {}
   pages.value = 1
@@ -1114,6 +1152,7 @@ const exportData = () => {
     }
   })
 }
+
 onMounted(() => {
   if (route.query.id) {
     receivableForm.value.invoiceId = route.query.id
@@ -1122,6 +1161,7 @@ onMounted(() => {
   initCompany();
   initDept();
   getCommissionReceivableList();
+  getreceivedAmountTotal()
 })
 </script>
 

src/views/receivable/handingFee/report.vue

@@ -143,7 +143,13 @@
           </el-table-column>
           <el-table-column prop="createBy" label="结算人" width="100"></el-table-column>
           <el-table-column prop="createTime" label="结算时间" width="200"></el-table-column>
-          <el-table-column prop="invoiceId" label="开票记录编号"></el-table-column>
+          <el-table-column prop="invoiceId" label="开票记录编号" width="200"></el-table-column>
+          <el-table-column label="操作" width="200" align="center" fixed="right">
+            <template #default="scope">
+              <el-button link type="primary" @click="handleDetail(scope.row)">删除</el-button>
+              <el-button link type="primary" @click="handleOrderDetail(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]"
@@ -310,7 +316,10 @@
 
 <script setup lang="ts">
 import api from '@/api'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { useRouter } from 'vue-router';
 
+const router = useRouter()
 const route = useRoute()
 
 let activeName = ref('1')
@@ -661,7 +670,40 @@ const initOption = () => {
     })
   })
 }
-
+const handleDetail = (type) => {
+  console.log(type.settlementId)
+  ElMessageBox.confirm(
+  '确定删除该记录吗？',
+  '删除',
+  {
+  confirmButtonText: '确定删除',
+  type: 'error',
+  center: true,
+  confirmButtonClass: 'el-button--danger',
+  }
+  )
+  .then(() => {
+    api.settlementApi.deleteSettlement(type.settlementId).then((res: any) => {
+      if (res.code == 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success'
+        })
+        initData2()
+      }
+    })
+  })
+  .catch(() => {
+  })
+}
+const handleOrderDetail = (type: any) => {
+  router.push({
+    path: '/insurancePolicy/order/insurancePolicyOrderDetail',
+    query: {
+      orderNo: type.orderNo
+    }
+  })
+}
 onMounted(() => {
   initOption();
   initCompany();

src/views/receivable/handingFee/ticket.vue

@@ -450,11 +450,13 @@ const uploadJYFile = async (file) => {
   const { code, data, msg } = await api.financeApi.importAccountsReceivableInvoice(params)
   if (code == 200) {
     importModifyCallback.value = data
-    api.financeApi.getSelectedReceivableList({ orderNos: data.orderNos }).then((res: any) => {
-      if (res.code == 200) {
-        tableData.value = res.data
-      }
-    })
+    if(data.orderNos.length>0){
+      api.financeApi.getSelectedReceivableList({ orderNos: data.orderNos }).then((res: any) => {
+        if (res.code == 200) {
+          tableData.value = res.data
+        }
+      })
+    }
     ElMessage({
       message: msg,
       type: 'success'