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

src/views/receivable/handingFee/invoiceRecord.vue

@@ -78,7 +78,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>
@@ -91,19 +91,19 @@
     <el-dialog v-model="countShow" width="600" title="开票并结算">
       <el-form ref="CountForm" :model="countForm" :rules="countRules" label-width="120">
         <el-form-item prop="invoiceParty" label="开票方">
-          <el-input v-model="countForm.invoiceParty" placeholder="请输入"></el-input>
+          <el-input v-model="countForm.invoiceParty" disabled placeholder="请输入"></el-input>
         </el-form-item>
         <el-form-item prop="receivableSupervisePremium" label="应收手续费">
-          <el-input v-model="countForm.receivableSupervisePremium" placeholder="请输入"></el-input>
+          <el-input v-model="countForm.receivableSupervisePremium" disabled placeholder="请输入"></el-input>
         </el-form-item>
         <el-form-item prop="overinflatedAmount" label="虚增金额">
-          <el-input v-model="countForm.overinflatedAmount" placeholder="请输入"></el-input>
+          <el-input v-model="countForm.overinflatedAmount" disabled placeholder="请输入"></el-input>
         </el-form-item>
         <el-form-item prop="taxPoint" label="税点">
-          <el-input v-model="countForm.taxPoint" placeholder="请输入"></el-input>
+          <el-input v-model="countForm.taxPoint" disabled placeholder="请输入"></el-input>
         </el-form-item>
         <el-form-item prop="receivableSupervisePremium" label="应收金额">
-          <el-input v-model="countForm.receivableSupervisePremium" placeholder="请输入"></el-input>
+          <el-input v-model="countForm.receivableSupervisePremium" disabled placeholder="请输入"></el-input>
         </el-form-item>
         <el-form-item prop="actualReceivedAmount" label="实收金额">
           <el-input v-model="countForm.actualReceivedAmount" placeholder="请输入"></el-input>
@@ -222,8 +222,11 @@ const uploadImage = async (file, fileList) => {
   }
 }
 // 明细查询
-const handleView = () => {
-
+const handleView = (row) => {
+  const href= window.location.href.split('#')
+  const newHref=href[0]+'#/receivable/private/report?activeName=2&id='+row.id
+  console.log("🚀 ~ handleView ~ href:", href)
+  window.open(newHref, '_blank');
 }
 // 删除
 const handleDelete = (row) => {

src/views/receivable/handingFee/report.vue

@@ -7,8 +7,7 @@
             <el-col :span="8">
               <el-form-item prop="a" label="保险公司">
                 <el-select v-model="recordForm.companyId" placeholder="请选择" clearable filterable>
-                  <el-option v-for="item in companyList" :key="item.id" :value="item.id"
-                    :label="item.name"></el-option>
+                  <el-option v-for="item in companyList" :key="item.id" :value="item.id" :label="item.name"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -22,7 +21,7 @@
               <el-form-item prop="status" label="结算状态">
                 <el-select v-model="recordForm.status">
                   <el-option v-for="item in optionObj['settlement_status']" :key="item.value" :value="item.value"
-                :label="item.label"></el-option>
+                    :label="item.label"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -32,7 +31,8 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table height="calc(100% - 100px)" :data="recordData" row-key="companyId" :summary-method="getSummaries" show-summary>
+        <el-table height="calc(100% - 100px)" :data="recordData" row-key="companyId" :summary-method="getSummaries"
+          show-summary>
           <el-table-column prop="companyName" label="保险公司" width="300"></el-table-column>
           <!--                    <el-table-column type="expand" label="合作保险公司" width="200">
                         <template #default>
@@ -70,25 +70,25 @@
             </el-col>
             <el-col :span="8">
               <el-form-item prop="invoiceParty" label="开票方">
-                <el-select v-model="recordForm1.invoiceParty" clearable >
+                <el-select v-model="recordForm1.invoiceParty" clearable>
                   <el-option v-for="item in optionObj['invoice_party']" :key="item.value" :value="item.value"
-                :label="item.label"></el-option>
+                    :label="item.label"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item prop="invoiceType" label="应收项">
-                <el-select v-model="recordForm1.invoiceType" clearable >
+                <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>
+                    :label="item.label"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item prop="status" label="结算状态">
-                <el-select v-model="recordForm1.status" clearable >
+                <el-select v-model="recordForm1.status" clearable>
                   <el-option v-for="item in optionObj['settlement_status']" :key="item.value" :value="item.value"
-                :label="item.label"></el-option>
+                    :label="item.label"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -295,6 +295,8 @@
 <script setup lang="ts">
 import api from '@/api'
 
+const route = useRoute()
+
 let activeName = ref('1')
 const handleClick = (e) => {
   pages.value = 1
@@ -427,15 +429,16 @@ const initData1 = () => {
 const initData2 = () => {
   api.settlementApi.superviseSettlementExcel({
     agreementType: '2',
-    settlementId: recordForm1.settlementId,
-    companyId: recordForm1.companyId,
-    invoiceParty: recordForm1.invoiceParty,
-    invoiceType: recordForm1.invoiceType,
-    status: recordForm1.status,
-    settlementPerson: recordForm1.settlementPerson,
-    invoiceId: recordForm1.invoiceId,
-    settlementTimeStart: recordForm1.value.settlementTime?.[0],
-    settlementTimeEnd: recordForm1.value.settlementTime?.[1],
+    settlementId: recordForm1.value.settlementId,
+    invoiceParty: recordForm1.value.invoiceParty,
+    invoiceRiskType: recordForm1.value.invoiceRiskType,
+    status: recordForm1.value.status,
+    companyId: recordForm1.value.companyId,
+    invoiceType: recordForm1.value.invoiceType,
+    settlementPerson: recordForm1.value.settlementPerson,
+    invoiceId: recordForm1.value.invoiceId,
+    setlementDateStart: recordForm1.value.settlementTime?.[0],
+    setlementDateEnd: recordForm1.value.settlementTime?.[1],
     pages: pages.value,
     size: size.value,
     invoiceTypes: ['1', '3']
@@ -636,15 +639,20 @@ const initOption = () => {
 }
 
 onMounted(() => {
-  initData1();
   initOption();
   initCompany();
+  if (route.query.activeName === '2') {
+    recordForm1.value.invoiceId = route.query.id
+    activeName.value = '2'
+    initData2();
+  } else {
+    initData1();
+  }
 })
 
 </script>
 
 <style scoped lang="scss">
-
 .pagination {
   margin-top: 10px;
   display: flex;