@dongkboy 3 сар өмнө
parent
commit
df801f6913

+ 13 - 10
src/views/platform/platformReport.vue

@@ -40,17 +40,13 @@
         <el-table height="calc(100% - 100px)" :data="recordData" row-key="companyId" :summary-method="getSummaries"
         <el-table height="calc(100% - 100px)" :data="recordData" row-key="companyId" :summary-method="getSummaries"
           show-summary>
           show-summary>
           <el-table-column prop="companyName" label="保险公司"></el-table-column>
           <el-table-column prop="companyName" label="保险公司"></el-table-column>
-          <!--                    <el-table-column type="expand" label="合作保险公司" width="200">
-                                            <template #default>
-                                                展开
-                                            </template>
-</el-table-column>-->
+
           <el-table-column prop="totalReceivable" label="应收金额" width="240"></el-table-column>
           <el-table-column prop="totalReceivable" label="应收金额" width="240"></el-table-column>
           <el-table-column prop="settledAmount" label="已结算" width="200"></el-table-column>
           <el-table-column prop="settledAmount" label="已结算" width="200"></el-table-column>
           <el-table-column prop="unSettledAmount" label="未结算" width="200"></el-table-column>
           <el-table-column prop="unSettledAmount" label="未结算" width="200"></el-table-column>
           <el-table-column label="操作" fixed="right" width="120">
           <el-table-column label="操作" fixed="right" width="120">
             <template #default="scope">
             <template #default="scope">
-              <el-button link type="primary">查看明细</el-button>
+              <el-button link type="primary" @click="handleSettlementDetail(scope.row)">查看明细</el-button>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
         </el-table>
         </el-table>
@@ -125,7 +121,7 @@
             <el-col :span="8">
             <el-col :span="8">
               <el-form-item prop="companyId" label="保险公司">
               <el-form-item prop="companyId" label="保险公司">
                 <el-select v-model="recordForm2.companyId" placeholder="请选择" clearable filterable>
                 <el-select v-model="recordForm2.companyId" placeholder="请选择" clearable filterable>
-                  <el-option v-for="item in companyList" :key="item.companyCode" :value="item.companyCode"
+                  <el-option v-for="item in companyList" :key="item.id" :value="item.id"
                     :label="item.name"></el-option>
                     :label="item.name"></el-option>
                 </el-select>
                 </el-select>
               </el-form-item>
               </el-form-item>
@@ -143,8 +139,10 @@
             </el-col>
             </el-col>
             <el-col :span="8">
             <el-col :span="8">
               <el-form-item prop="status" label="状态">
               <el-form-item prop="status" label="状态">
-                <el-select v-model="recordForm.status">
-                  <el-option value="1" label="1"></el-option>
+                <el-select v-model="recordForm2.status">
+                  <el-option value="0" label="未结算"></el-option>
+                  <el-option value="1" label="已结算"></el-option>
+                  <el-option value=" " label="全部"></el-option>
                 </el-select>
                 </el-select>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
@@ -313,6 +311,7 @@ const initData3 = () => {
     settlementTimeEnd: recordForm2.value.settlementTime?.[1],
     settlementTimeEnd: recordForm2.value.settlementTime?.[1],
     pages: pages.value,
     pages: pages.value,
     size: size.value,
     size: size.value,
+    status: recordForm2.value.status,
     invoiceTypes: ['5', '6'],
     invoiceTypes: ['5', '6'],
     agreementType: '1'
     agreementType: '1'
   }).then((res: any) => {
   }).then((res: any) => {
@@ -413,7 +412,11 @@ const initOption = () => {
     })
     })
   })
   })
 }
 }
-
+const  handleSettlementDetail = (row) => {
+  activeName.value = '3'
+  recordForm2.value.companyId = row.id
+  initData3()
+}
 onMounted(() => {
 onMounted(() => {
   if (route.query.activeName === '3') {
   if (route.query.activeName === '3') {
     recordForm2.value.settlementId = route.query.settlementId
     recordForm2.value.settlementId = route.query.settlementId

+ 85 - 12
src/views/receivable/handingFee/report.vue

@@ -31,13 +31,21 @@
             </el-col>
             </el-col>
             <el-col :span="8">
             <el-col :span="8">
               <el-form-item prop="status" label="结算状态">
               <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"
+                <el-select v-model="recordForm.status" filterable clearable>
+                  <el-option v-for="item in settlement_status" :key="item.value" :value="item.value"
+                    :label="item.label"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item prop="invoiceStatus" label="开票状态">
+                <el-select v-model="recordForm.invoiceStatus" filterable clearable>
+                  <el-option v-for="item in invoice_status" :key="item.value" :value="item.value"
                     :label="item.label"></el-option>
                     :label="item.label"></el-option>
                 </el-select>
                 </el-select>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
-            <el-col :span="8" style="height: 50px; display: flex; align-items: start; justify-content: flex-end">
+            <el-col :span="24" style="height: 50px; display: flex; align-items: start; justify-content: flex-end">
               <el-button type="primary" @click="handleSearch(1)">查询</el-button>
               <el-button type="primary" @click="handleSearch(1)">查询</el-button>
               <el-button plain type="primary" @click="handleReset(1)">重置</el-button>
               <el-button plain type="primary" @click="handleReset(1)">重置</el-button>
             </el-col>
             </el-col>
@@ -54,7 +62,19 @@
           <el-table-column prop="sxfUnSettledAmount" label="未结算"></el-table-column>
           <el-table-column prop="sxfUnSettledAmount" label="未结算"></el-table-column>
           <el-table-column label="操作" fixed="right" width="120">
           <el-table-column label="操作" fixed="right" width="120">
             <template #default="scope">
             <template #default="scope">
-              <el-button link type="primary">查看明细</el-button>
+              <div class="flex a-c">
+                <el-dropdown placement="bottom-start" trigger="click">
+                  <span class="el-dropdown-link">
+                    查看明细
+                  </span>
+                  <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-menu>
+                  </template>
+                </el-dropdown>
+              </div>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
         </el-table>
         </el-table>
@@ -114,7 +134,7 @@
                 <el-input v-model="recordForm1.invoiceId"></el-input>
                 <el-input v-model="recordForm1.invoiceId"></el-input>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
-            <el-col :span="8" style="display: flex; justify-content: flex-end">
+            <el-col :span="24" style="display: flex; justify-content: flex-end">
               <el-button type="primary" @click="handleSearch(2)">查询</el-button>
               <el-button type="primary" @click="handleSearch(2)">查询</el-button>
               <el-button plain type="primary" @click="handleReset(2)">重置</el-button>
               <el-button plain type="primary" @click="handleReset(2)">重置</el-button>
               <el-button type="primary" @click="handleExport(2)">导出结算记录</el-button>
               <el-button type="primary" @click="handleExport(2)">导出结算记录</el-button>
@@ -302,10 +322,15 @@
       </el-tab-pane>
       </el-tab-pane>
     </el-tabs>
     </el-tabs>
   </PageMain>
   </PageMain>
-  <el-dialog :close-on-click-modal="false" v-model="viewCredential" title="查看凭证" width="400">
-    <div class="text-center text-[14px] text-[#999] pb-[20px]">点击图片放大预览</div>
-    <el-image style="width: 100%; height: 300px" :src="CredentialList[0]" :zoom-rate="1.2" :max-scale="7"
-      :min-scale="0.2" :preview-src-list="CredentialList" show-progress :initial-index="4" alt="凭证图片" fit="cover" />
+  <el-dialog :close-on-click-modal="false" v-model="viewCredential" title="查看凭证" width="500">
+    <div class="text-center text-[14px] text-[red] pb-[20px]">点击图片放大预览</div>
+    <div class="flex a-c f-wrap">
+      <el-image v-for="(item, index) in CredentialList" :key="index" class=""
+        style="width: 100px; height: 100px;margin:0  20px;" :src="item" :zoom-rate="1.2" :max-scale="7" :min-scale="0.2"
+        :preview-src-list="CredentialList" show-progress :initial-index="index" alt="凭证图片" hide-on-click-modal
+        fit="cover" />
+    </div>
+
   </el-dialog>
   </el-dialog>
 </template>
 </template>
 
 
@@ -316,7 +341,34 @@ import { useRouter } from 'vue-router';
 
 
 const router = useRouter()
 const router = useRouter()
 const route = useRoute()
 const route = useRoute()
-
+const invoice_status = ref([
+  {
+    value: '0',
+    label: '未开票'
+  },
+  {
+    value: '1',
+    label: '已开票'
+  },
+  {
+    value: ' ',
+    label: '全部'
+  },
+])
+const settlement_status = ref([
+  {
+    value: '0',
+    label: '未结算'
+  },
+  {
+    value: '1',
+    label: '已结算'
+  },
+  {
+    value: ' ',
+    label: '全部'
+  },
+])
 let activeName = ref('1')
 let activeName = ref('1')
 const handleClick = (e) => {
 const handleClick = (e) => {
   pages.value = 1
   pages.value = 1
@@ -425,9 +477,7 @@ let recordData2 = ref([])
 let recordData3 = ref([])
 let recordData3 = ref([])
 
 
 const view = (scope) => {
 const view = (scope) => {
-  console.log(scope.fileUrl)
   CredentialList.value = scope.fileUrl.split(',')
   CredentialList.value = scope.fileUrl.split(',')
-  console.log(CredentialList.value)
   viewCredential.value = true
   viewCredential.value = true
 }
 }
 
 
@@ -441,6 +491,7 @@ const initData1 = () => {
     settlementStartTime: recordForm.value.settlementTime?.[0],
     settlementStartTime: recordForm.value.settlementTime?.[0],
     settlementEndTime: recordForm.value.settlementTime?.[1],
     settlementEndTime: recordForm.value.settlementTime?.[1],
     status: recordForm.value.status,
     status: recordForm.value.status,
+    invoiceStatus: recordForm.value.invoiceStatus,
     invoiceTypes: ['1', '3'],
     invoiceTypes: ['1', '3'],
     agreementType: '2'
     agreementType: '2'
   }).then((res: any) => {
   }).then((res: any) => {
@@ -456,6 +507,7 @@ const initData2 = () => {
     invoiceParty: recordForm1.value.invoiceParty,
     invoiceParty: recordForm1.value.invoiceParty,
     invoiceRiskType: recordForm1.value.invoiceRiskType,
     invoiceRiskType: recordForm1.value.invoiceRiskType,
     status: recordForm1.value.status,
     status: recordForm1.value.status,
+    invoiceStatus: recordForm1.value.invoiceStatus,
     companyId: recordForm1.value.companyId,
     companyId: recordForm1.value.companyId,
     invoiceType: recordForm1.value.invoiceType,
     invoiceType: recordForm1.value.invoiceType,
     settlementPerson: recordForm1.value.settlementPerson,
     settlementPerson: recordForm1.value.settlementPerson,
@@ -578,6 +630,19 @@ const handleReset = (type) => {
   }
   }
 
 
 }
 }
+// 结算明细
+const handleSettlementDetail = (row) => {
+  activeName.value = '2'
+  recordForm1.value.companyId = row.id
+  initData2()
+}
+// 开票明细
+const handleInvoiceRecord = (row) => {
+  activeName.value = '2'
+  recordForm1.value.companyId = row.id
+  initData2()
+}
+
 const handleExport = (type) => {
 const handleExport = (type) => {
   switch (type) {
   switch (type) {
     case 2:
     case 2:
@@ -740,4 +805,12 @@ onMounted(() => {
 :deep(.subTable .el-table__header-wrapper) {
 :deep(.subTable .el-table__header-wrapper) {
   display: none;
   display: none;
 }
 }
+
+:deep(.el-dropdown-link) {
+  display: flex;
+  align-items: center;
+  margin-left: 15px;
+  color: var(--el-color-primary);
+  cursor: pointer;
+}
 </style>
 </style>