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

src/views/finance/modules/auditDetail.vue

@@ -970,6 +970,21 @@
                 <div>{{ detailData?.insFeeOrders?.thirdDistributionRatio }}%</div>
               </th>
             </tr>
+            <tr>
+              <th>
+                <div>合计</div>
+              </th>
+              <th>
+                <div>-</div>
+              </th>
+              <th>
+                <div>￥{{ new Decimal(detailData?.insFeeOrders?.firstDistributionPremium || 0).plus(detailData?.insFeeOrders?.secondDistributionPremium || 0).plus(detailData?.insFeeOrders?.thirdDistributionPremium || 0).toFixed(2) }}</div>
+              </th>
+
+              <th>
+                <div>{{ new Decimal(detailData?.insFeeOrders?.firstDistributionRatio || 0).plus(detailData?.insFeeOrders?.secondDistributionRatio || 0).plus(detailData?.insFeeOrders?.thirdDistributionRatio || 0).toFixed(2) }}%</div>
+              </th>
+            </tr>
           </tbody>
         </table>
       </div>
@@ -2129,4 +2144,4 @@ onUnmounted(() => {
     }
   }
 }
-</style>
+</style>

src/views/receivable/documentary/documentaryRecord.vue

@@ -1,6 +1,6 @@
 <template>
   <PageMain class="vh100">
-    <el-form v-model="form" label-width="80">
+    <el-form v-model="form" label-width="100">
       <el-row :gutter="20">
         <el-col :span="8">
           <el-form-item prop="recordId" label="记录编号">
@@ -23,7 +23,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item prop="invoiceType" label="应收项">
+          <el-form-item prop="accountsReceivable" label="应收项">
             <el-select v-model="form.accountsReceivable" clearable>
               <el-option v-for="item in optionObj['invoice_risk_type']" :key="item.value" :value="item.value"
                 :label="item.label"></el-option>
@@ -49,7 +49,13 @@
               format="YYYY-MM-DD HH:mm:ss" />
           </el-form-item>
         </el-col>
-        <el-col :span="16" style="display: flex; align-items: start; justify-content: flex-end">
+        <el-col :span="8">
+          <el-form-item label="保险分支公司">
+            <el-cascader filterable clearable placeholder="请选择" v-model="form.partnerCompanyId" :options="companyList1"
+              :props="companyIdprops" style="width: 100%;" @change="handleCompanyChange" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="display: flex; align-items: start; justify-content: flex-end">
           <el-button type="primary" @click="search">查询</el-button>
           <el-button plain type="primary" @click="reset">重置</el-button>
         </el-col>
@@ -203,6 +209,12 @@ const handleCurrentChange = (page) => {
   pages.value = page
   initList()
 }
+const companyIdprops = {
+  expandTrigger: 'hover' as const,
+  value: 'id',
+  label: 'name',
+  checkStrictly: true,
+}
 const search = () => {
   pages.value = 1
   size.value = 10
@@ -290,7 +302,7 @@ let settlementPaymentReason = ref('')
 const handleSettlementShow = ref(false)
 const id = ref('')
 const handleSettlement = (row: any) => {
-    id.value = row.id
+  id.value = row.id
   handleSettlementShow.value = true
 }
 // 删除
@@ -358,6 +370,7 @@ const initList = () => {
 
 // 保险公司
 let companyList = ref([])
+let companyList1 = ref([])
 const initCompany = () => {
   api.insuranceApi.leftList('').then((res: any) => {
     if (res.code == 200) {
@@ -365,7 +378,17 @@ const initCompany = () => {
     }
   })
 }
-
+const initCompany1 = () => {
+  api.agreementApi.findTree({ name: "", systemCode: localStorage.getItem('login_system') }).then((res: any) => {
+    if (res.code == 200) {
+      companyList1.value = res.data
+    }
+  })
+}
+const handleCompanyChange = (e) => {
+  console.log(e)
+  form.value.partnerCompanyId = e[e.length - 1] || ''
+}
 let imageShow = ref(false)
 let bigImageUrl = ref('')
 const handelViewImage = (item, index) => {
@@ -408,7 +431,7 @@ const settlementPaymentComfirm = () => {
     })
     return
   }
-  api.financeApi.updateSettlementStatus({invoiceId: id.value, settlementPaymentReason: settlementPaymentReason.value}).then((res: any) => {
+  api.financeApi.updateSettlementStatus({ invoiceId: id.value, settlementPaymentReason: settlementPaymentReason.value }).then((res: any) => {
     if (res.code == 200) {
       ElMessage({
         message: res.msg,
@@ -496,9 +519,20 @@ const getSummaries = (param) => {
   return sums
 }
 onMounted(() => {
+  if (route.query.invoiceType) {
+    form.value.partnerCompanyId = route.query.partnerCompanyId || ''
+    if (route.query.invoiceType == '2') {
+      form.value.accountsReceivable = '10'
+    } else {
+      form.value.accountsReceivable = '20'
+    }
+  }
+
   initList();
   initOption();
   initCompany();
+  initCompany1();
+
 });
 
 </script>

src/views/receivable/documentary/documentaryReport.vue

@@ -37,8 +37,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item prop="invoiceType" label="应收项">
-                <el-select v-model="recordForm.invoiceType">
+              <el-form-item prop="invoiceRiskType" label="应收项">
+                <el-select v-model="recordForm.invoiceRiskType">
                   <el-option value="2" label="车险"></el-option>
                   <el-option value="4" label="非车险"></el-option>
                 </el-select>
@@ -61,7 +61,7 @@
           <el-table-column prop="totalSettlementAmount" label="已结算"></el-table-column>
           <el-table-column prop="totalUnSettlementAmount" label="未结算"></el-table-column>
           <el-table-column prop="totalUnInvoiced" label="未开票"></el-table-column>
-          <el-table-column prop="invoiceType" label="应收项">
+          <el-table-column prop="invoiceRiskType" label="应收项">
             <template #default="scope">
               {{ scope.row.invoiceType == 2 ? '车险' : '非车险' }}
             </template>
@@ -108,8 +108,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item prop="invoiceType" label="应收项">
-                <el-select v-model="recordForm1.invoiceType" clearable>
+              <el-form-item prop="invoiceRiskType" label="应收项">
+                <el-select v-model="recordForm1.invoiceRiskType" clearable>
                   <el-option v-for="item in optionObj['invoice_risk_type']" :key="item.value" :value="item.value"
                     :label="item.label"></el-option>
                 </el-select>
@@ -151,7 +151,7 @@
           <el-table-column prop="settlementId" label="结算记录编号" width="200"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="200"></el-table-column>
           <el-table-column prop="invoiceParty" label="开票方" width="150"></el-table-column>
-          <el-table-column prop="invoiceType" label="应收项" width="100"></el-table-column>
+          <el-table-column prop="invoiceRiskTypeName" label="应收项" width="100"></el-table-column>
           <el-table-column prop="taxPoint" label="税点" width="100"></el-table-column>
           <el-table-column prop="actualReceivedAmount" label="实收金额" width="100"></el-table-column>
           <el-table-column prop="settlementPaymentDifference" label="回款差额" width="100"></el-table-column>
@@ -507,7 +507,7 @@ const initData1 = () => {
     settlementStartTime: recordForm.value.settlementTime?.[0],
     settlementEndTime: recordForm.value.settlementTime?.[1],
     status: recordForm.value.status,
-    invoiceType: recordForm.value.invoiceType,
+    invoiceType: recordForm.value.invoiceRiskType,
     invoiceTypes: ['2', '4'],
     agreementType: '2'
   }).then((res: any) => {
@@ -522,7 +522,7 @@ const initData2 = () => {
     settlementId: recordForm1.value.settlementId,
     partnerCompanyId: recordForm1.value.partnerCompanyId,
     invoiceParty: recordForm1.value.invoiceParty,
-    invoiceType: recordForm1.value.invoiceType,
+    invoiceRiskType: recordForm1.value.invoiceRiskType,
     status: recordForm1.value.status,
     settlementPerson: recordForm1.value.settlementPerson,
     invoiceId: recordForm1.value.invoiceId,
@@ -644,12 +644,21 @@ const handleReset = (type) => {
 const handleSettlementDetail = (row) => {
   activeName.value = '2'
   recordForm1.value.partnerCompanyId = row.partnerCompanyId
+  if (row.invoiceType == '2') {
+    recordForm1.value.invoiceRiskType = '10'
+  } else {
+    recordForm1.value.invoiceRiskType = '20'
+  }
   initData2()
 }
 // 开票明细
 const handleInvoiceRecord = (row) => {
   router.push({
     path: '/receivable/documentary/documentaryRecord',
+    query: {
+      partnerCompanyId: row.partnerCompanyId,
+      invoiceType: row.invoiceType,
+    }
   })
 }
 

src/views/receivable/documentary/index.vue

@@ -11,7 +11,6 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="保险公司">
-
                 <el-cascader filterable clearable placeholder="请选择" v-model="receivableForm.companyId"
                   :options="companyList" :props="companyIdprops" style="width: 100%;" @change="handleCompanyChange" />
               </el-form-item>
@@ -1108,13 +1107,13 @@ const getOtherReceivableList = () => {
       receiveData.value = res.data.insPlyIncomePage.records
       allData.value = res.data.insPlyIncomeOrders
       total1.value = res.data.insPlyIncomePage.total
-      receiveData.value.forEach(element => {
-        if (selectedList.value.find(v => v.id === element.id)) {
-          nextTick(() => {
-            ReceiveDataRef1.value!.toggleRowSelection(element, true)
-          })
-        }
-      });
+      // receiveData.value.forEach(element => {
+      //   if (selectedList.value.find(v => v.id === element.id)) {
+      //     nextTick(() => {
+      //       ReceiveDataRef1.value!.toggleRowSelection(element, true)
+      //     })
+      //   }
+      // });
     }
   })
 }

src/views/receivable/handingFee/invoiceRecord.vue

@@ -95,7 +95,7 @@
           </el-popover>
         </template>
       </el-table-column>
-      <el-table-column prop="settlementPaymentReason" label="回款差额原因" width="120"></el-table-column>
+      <el-table-column prop="paymentReason" label="回款差额原因" width="120"></el-table-column>
       <el-table-column prop="createBy" label="开票人" width="120"></el-table-column>
       <el-table-column prop="createTime" label="开票时间" width="150"></el-table-column>
       <el-table-column label="操作" width="300" fixed="right" align="center">

src/views/receivable/handingFee/report.vue

@@ -85,7 +85,8 @@
                   <template #dropdown>
                     <el-dropdown-menu>
                       <el-dropdown-item @click="handleSettlementDetail(scope.row)">结算明细</el-dropdown-item>
-                      <el-dropdown-item @click="handleInvoiceRecord(scope.row)">开票明细</el-dropdown-item>
+                      <el-dropdown-item :disabled="!['10','20'].includes(recordForm.accountsReceivable)"
+                        @click="handleInvoiceRecord(scope.row)">开票明细</el-dropdown-item>
                     </el-dropdown-menu>
                   </template>
                 </el-dropdown>
@@ -156,7 +157,8 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table height="calc(100% - 192px)" :data="recordData1" show-summary :summary-method="val=>getSummaries(val,['taxPoint', 'actualReceivedAmount'])">
+        <el-table height="calc(100% - 192px)" :data="recordData1" show-summary
+          :summary-method="val => getSummaries(val, ['taxPoint', 'actualReceivedAmount'])">
           <el-table-column prop="settlementId" label="结算记录编号" width="200"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="200"></el-table-column>
           <el-table-column prop="invoiceParty" label="开票方" width="150"></el-table-column>
@@ -238,7 +240,8 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table height="calc(100% - 192px)" :data="recordData2" show-summary :summary-method="val=>getSummaries(val,['receivableSuperviseCosts', 'jqPremium','taxPremium','syPremium','jqSuperviseCostsProportion','sySuperviseCostsProportion'])">
+        <el-table height="calc(100% - 192px)" :data="recordData2" show-summary
+          :summary-method="val => getSummaries(val, ['receivableSuperviseCosts', 'jqPremium', 'taxPremium', 'syPremium', 'jqSuperviseCostsProportion', 'sySuperviseCostsProportion'])">
           <el-table-column prop="invoiceId" label="开票记录编号" width="200"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="200"></el-table-column>
           <el-table-column prop="invoiceParty" label="开票方" width="100"></el-table-column>
@@ -314,7 +317,8 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table height="calc(100% - 192px)" :data="recordData3" show-summary :summary-method="val=>getSummaries(val,['receivableSuperviseCosts','jyPremium','jySuperviseCostsProportion'])">
+        <el-table height="calc(100% - 192px)" :data="recordData3" show-summary
+          :summary-method="val => getSummaries(val, ['receivableSuperviseCosts', 'jyPremium', 'jySuperviseCostsProportion'])">
           <el-table-column prop="invoiceId" label="开票记录编号" width="200"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="200"></el-table-column>
           <el-table-column prop="invoiceParty" label="开票方" width="100"></el-table-column>
@@ -690,9 +694,20 @@ const handleSettlementDetail = (row) => {
 }
 // 开票明细
 const handleInvoiceRecord = (row) => {
-  activeName.value = '3'
-  recordForm2.value.companyId = row.id
-  initData3(['1'])
+  switch (recordForm.value.accountsReceivable) {
+    case '10':
+      activeName.value = '3'
+      recordForm2.value.companyId = row.id
+      initData3(['1'])
+      break;
+    case '20':
+      activeName.value = '4'
+      recordForm3.value.companyId = row.id
+      initData3(['3'])
+      break;
+    default:
+  }
+
 }
 
 const handleExport = (type) => {