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

src/views/finance/index.vue

@@ -288,6 +288,7 @@
           <el-table-column prop="createTime" label="录单时间" width="120"></el-table-column>
           <el-table-column prop="createBy" label="录单人" width="120"></el-table-column>
           <el-table-column prop="payTime" label="支付时间" width="120"></el-table-column>
+          <el-table-column prop="auditTime" label="审核时间" width="120"></el-table-column>
           <el-table-column prop="jqPremium" label="交强险" width="120"></el-table-column>
           <el-table-column prop="syPremium" label="商业险" width="120"></el-table-column>
           <el-table-column prop="jyPremium" label="驾意险" width="120"></el-table-column>

src/views/finance/modules/auditDetail.vue

@@ -302,7 +302,7 @@
         <div class="title">险种信息</div>
         <el-row :gutter="20" style="margin-bottom: 16px">
           <el-col :span="14">
-            <el-table :data="detailData?.kindInfoVo" border>
+            <el-table :data="detailData?.kindInfoVo" border :span-method="objectSpanMethod">
               <el-table-column label="名称" prop="kindName" width="100">
                 <template #default="scope">
                   <span v-if="scope.row.kindCode === 'J1'">交强险</span>
@@ -1076,15 +1076,31 @@ let carData = ref([
     d: 3
   },
 ])
-const typeSpanMethod = ({
+const objectSpanMethod = ({
   row,
   column,
   rowIndex,
-  columnIndex
-}) => {
+  columnIndex,
+}: SpanMethodProps) => {
+  const totalRows = detailData.value?.kindInfoVo.length || 0;
   if (columnIndex === 0) {
-    if (rowIndex === 1) {
-      return [typeData.value.length - 1, 1]
+    if (rowIndex === 0) {
+      return { rowspan: 1, colspan: 1 }
+    } else if (rowIndex === 1) {
+      // 从第2行到最后一行的行数 = 总行数 - 1
+      return { rowspan: totalRows - 1, colspan: 1 }
+    } else {
+      return { rowspan: 0, colspan: 0 }
+    }
+  }
+  if (columnIndex === 1) {
+    if (rowIndex === 0) {
+      return { rowspan: 1, colspan: 1 }
+    } else if (rowIndex === 1) {
+      // 从第2行到最后一行的行数 = 总行数 - 1
+      return { rowspan: totalRows - 1, colspan: 1 }
+    } else {
+      return { rowspan: 0, colspan: 0 }
     }
   }
 }

src/views/platform/ticket.vue

@@ -151,7 +151,6 @@
       </template>
     </el-dialog>
 
-    <el-image-viewer v-if="imageShow" :url-list="[bigImageUrl]" @close="imageShow = false" />
 
   </div>
   <el-dialog :close-on-click-modal="false" v-model="settlementDialog" width="600" title="结算">
@@ -236,6 +235,8 @@
       <el-button type="primary" @click="batchShow = false">确定</el-button>
     </template>
   </el-dialog>
+  <el-image-viewer v-if="imageShow" :url-list="[bigImageUrl]" @close="imageShow = false" />
+
 </template>
 
 <script setup lang="ts">

src/views/receivable/documentary/ticket.vue

@@ -18,10 +18,12 @@
             <el-option value="等于" label="等于"></el-option>
             <el-option value="包含" label="包含"></el-option>
           </el-select>
-          <el-select class="w-350px" v-if="item.name == 'companyId'" v-model="item.search" placeholder="请选择" clearable
+          <!-- <el-select class="w-350px" v-if="item.name == 'companyId'" v-model="item.search" placeholder="请选择" clearable
             filterable :disabled="item.type == '为空'">
             <el-option v-for="item in companyList" :key="item.id" :value="item.id" :label="item.name"></el-option>
-          </el-select>
+          </el-select> -->
+          <el-cascader class="w-350px" clearable :disabled="item.type == '为空'" v-if="item.name == 'companyId'" placeholder="请选择"  v-model="item.search" :options="companyList"
+          :props="companyIdprops" @change="handleCompanyChange(index, $event)" />
           <el-date-picker v-if="item.name == 'signYear'" style="width: 350px" format="YYYY" value-format="YYYY"
             v-model="yearrangesearch" type="yearrange" range-separator="-" :disabled="item.type == '为空'"
             @change="handlePtlAgreementChange(index, $event)" />
@@ -125,7 +127,12 @@ const yearrangesearch = ref([year, year])
 
 const countShow = ref(false)
 const countForm = ref({})
-
+const companyIdprops = {
+    expandTrigger: 'hover' as const,
+    value: 'id',
+    label: 'name',
+    checkStrictly: true,
+}
 const tableRef = ref('')
 
 const selCompanyId = ref('')
@@ -186,6 +193,10 @@ const handlePtlAgreementChange = (index: any, e: any) => {
   }
 }
 
+// 保险公司选择器改变时触发
+const handleCompanyChange = (index: any, e: any) => {
+  searchList.value[index].search = e[e.length - 1] || ''
+}
 // 签单时间选择器改变时触发
 const signDateSelectChange = (index: any, e: any) => {
   switch (e) {
@@ -292,9 +303,10 @@ const initData = () => {
 }
 // 保险公司
 const initCompany = () => {
-  api.insuranceApi.leftList('').then((res: any) => {
+  api.agreementApi.findTree({ name: "", systemCode: localStorage.getItem('login_system') }).then((res: any) => {
     if (res.code == 200) {
       companyList.value = res.data
+      console.log(companyList.value)
     }
   })
 }

src/views/receivable/handingFee/report.vue

@@ -203,13 +203,13 @@
             </el-col>
             <el-col :span="8">
               <el-form-item prop="settlementTime" label="结算时间">
-                <el-date-picker v-model="recordForm.settlementTime" type="daterange" format="YYYY-MM-DD"
+                <el-date-picker v-model="recordForm2.settlementTime" type="daterange" format="YYYY-MM-DD"
                   value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item prop="status" label="状态">
-                <el-select v-model="recordForm.status">
+                <el-select v-model="recordForm2.status">
                   <el-option value="1" label="1"></el-option>
                 </el-select>
               </el-form-item>
@@ -527,11 +527,11 @@ const initData2 = () => {
 const initData3 = (invoiceTypes) => {
   let params = invoiceTypes.includes('1') ?
     {
-      invoiceId: recordForm2.invoiceId,
-      companyId: recordForm2.companyId,
-      invoiceParty: recordForm2.invoiceParty,
-      settlementPerson: recordForm2.settlementPerson,
-      status: recordForm2.status,
+      invoiceId: recordForm2.value.invoiceId,
+      companyId: recordForm2.value.companyId,
+      invoiceParty: recordForm2.value.invoiceParty,
+      settlementPerson: recordForm2.value.settlementPerson,
+      status: recordForm2.value.status,
       settlementTimeStart: recordForm2.value.settlementTime?.[0],
       settlementTimeEnd: recordForm2.value.settlementTime?.[1],
       pages: pages.value,
@@ -540,11 +540,11 @@ const initData3 = (invoiceTypes) => {
     } :
     invoiceTypes.includes('3') ?
       {
-        invoiceId: recordForm3.invoiceId,
-        companyId: recordForm3.companyId,
-        invoiceParty: recordForm3.invoiceParty,
-        settlementPerson: recordForm3.settlementPerson,
-        status: recordForm3.status,
+        invoiceId: recordForm3.value.invoiceId,
+        companyId: recordForm3.value.companyId,
+        invoiceParty: recordForm3.value.invoiceParty,
+        settlementPerson: recordForm3.value.settlementPerson,
+        status: recordForm3.value.status,
         settlementTimeStart: recordForm3.value.settlementTime?.[0],
         settlementTimeEnd: recordForm3.value.settlementTime?.[1],
         pages: pages.value,

src/views/receivable/handingFee/ticket.vue

@@ -175,11 +175,11 @@
           <el-input v-model="receivableSupervisePremium" placeholder="请输入" disabled></el-input>
         </el-form-item>
         <el-form-item prop="receivableSupervisePremium" label="开票金额">
-          <el-input-number v-model="countForm.receivableSupervisePremium" style="width: 100%;" :min="0" :max="receivableSupervisePremium" :precision="2"
+          <el-input-number v-model="countForm.receivableSupervisePremium" style="width: 100%;" :min="0" :max="1111111111111" :precision="2"
             controls-position="right" @change="handleChange();handleChange1()" />
         </el-form-item>
         <el-form-item v-if="isSettlement" prop="actualReceivedAmount" label="实收金额">
-          <el-input-number v-model="countForm.actualReceivedAmount" style="width: 100%;" :min="0" :max="countForm.receivableSupervisePremium" :precision="2"
+          <el-input-number v-model="countForm.actualReceivedAmount" style="width: 100%;" :min="0" :max="1111111111111111" :precision="2"
             controls-position="right" @change="handleChange" />
         </el-form-item>
         <el-form-item prop="overinflatedAmount" label="虚增金额">