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

src/views/additionalOrder/additional/index.vue

@@ -50,8 +50,8 @@
                 </span>
               </span>
             </template>
-            <el-row v-if="carSwitch" :gutter="24">
-              <el-col :span="5">
+            <div v-if="carSwitch" class="flex p-r-20px" >
+              <div class="w-340px" >
                 <el-form-item label="行驶证主页" class="white-m-p24">
                   <el-upload v-if="!xszFront" drag :auto-upload="false" :show-file-list="false"
                     @change="uploadImage($event, 'xszf')">
@@ -106,9 +106,9 @@
                     </div>
                   </el-upload>
                 </el-form-item>
-              </el-col>
+              </div>
               <el-divider direction="vertical"></el-divider>
-              <el-col :span="18">
+              <div class="flex-1">
                 <el-row :gutter="20">
                   <el-col class="col-m-b-6" :span="8">
                     <el-form-item label="车牌" prop="licenseNo">
@@ -259,8 +259,8 @@
                     </el-form-item>
                   </el-col>
                 </el-row>
-              </el-col>
-            </el-row>
+              </div>
+            </div>
             <el-row v-else :gutter="20">
               <el-col class="col-m-b-6" :span="6">
                 <el-form-item class="white-m-p24" label="车辆是否上牌？" prop="isRegistered">
@@ -438,8 +438,8 @@
                 </span>
               </span>
             </template>
-            <el-row v-if="owerSwitch" :gutter="24">
-              <el-col :span="5" v-if="additionalForm.personType1 === '1'">
+            <div v-if="owerSwitch" class="flex p-r-20px" >
+              <div class="w-340px" v-if="additionalForm.personType1 === '1'">
                 <el-form-item label="身份证正面页" class="white-m-p24">
                   <el-upload v-if="!sfzFront" drag @change="uploadImage($event, 'sfzf')" :auto-upload="false"
                     :show-file-list="false">
@@ -494,8 +494,8 @@
                     </div>
                   </el-upload>
                 </el-form-item>
-              </el-col>
-              <el-col :span="5" v-if="additionalForm.personType1 === '2'">
+              </div>
+              <div class="w-340px" v-if="additionalForm.personType1 === '2'">
                 <el-form-item label="营业执照" class="white-m-p24">
                   <el-upload v-if="!yyzzFront" drag @change="uploadImage($event, 'yyzz')" :auto-upload="false"
                     :show-file-list="false">
@@ -523,9 +523,9 @@
                     </div>
                   </el-upload>
                 </el-form-item>
-              </el-col>
+              </div>
               <el-divider direction="vertical"></el-divider>
-              <el-col :span="18">
+              <div class="flex-1">
                 <el-row :gutter="20">
                   <el-col class="col-m-b-6" :span="8">
                     <el-form-item label="车主类型" prop="personType1">
@@ -635,8 +635,8 @@
                     </el-form-item>
                   </el-col>
                 </el-row>
-              </el-col>
-            </el-row>
+              </div>
+            </div>
             <el-row v-else :gutter="20">
               <el-col class="col-m-b-6" :span="6">
                 <el-form-item class="white-m-p24" label="车主类型" prop="personType1">
@@ -739,8 +739,8 @@
                 </span>
               </span>
             </template>
-            <el-row v-if="ower1Switch && !btns.ower1Show" :gutter="24">
-              <el-col :span="5">
+            <div v-if="ower1Switch && !btns.ower1Show" class="flex p-r-20px">
+              <div class="w-340px">
                 <el-form-item label="身份证正面页" class="white-m-p24">
                   <el-upload v-if="!sfz1Front" drag @change="uploadImage($event, 'sfzf1')" :auto-upload="false"
                     :show-file-list="false">
@@ -795,9 +795,9 @@
                     </div>
                   </el-upload>
                 </el-form-item>
-              </el-col>
+              </div>
               <el-divider direction="vertical"></el-divider>
-              <el-col :span="18">
+              <div class="flex-1">
                 <el-row :gutter="20">
                   <el-col class="col-m-b-6" :span="8">
                     <el-form-item label="投保人类型" prop="personType2">
@@ -876,8 +876,8 @@
                     </el-form-item>
                   </el-col>
                 </el-row>
-              </el-col>
-            </el-row>
+              </div>
+            </div>
             <el-row v-if="!ower1Switch && !btns.ower1Show" :gutter="20">
               <el-col class="col-m-b-6" :span="6">
                 <el-form-item class="white-m-p24" label="车主类型" prop="personType2">
@@ -978,8 +978,8 @@
                 </span>
               </span>
             </template>
-            <el-row v-if="ower2Switch && !btns.ower2show" :gutter="24">
-              <el-col :span="5">
+            <div v-if="ower2Switch && !btns.ower2show" class="flex p-r-20px">
+              <div class="w-340px">
                 <el-form-item label="身份证正面页" class="white-m-p24">
                   <el-upload v-if="!sfz2Front" drag @change="uploadImage($event, 'sfzf2')" :auto-upload="false"
                     :show-file-list="false">
@@ -1034,9 +1034,9 @@
                     </div>
                   </el-upload>
                 </el-form-item>
-              </el-col>
+              </div>
               <el-divider direction="vertical"></el-divider>
-              <el-col :span="18">
+              <div class="flex-1">
                 <el-row :gutter="20">
                   <el-col class="col-m-b-6" :span="8">
                     <el-form-item label="被投保人类型" prop="personType3">
@@ -1115,8 +1115,8 @@
                     </el-form-item>
                   </el-col>
                 </el-row>
-              </el-col>
-            </el-row>
+              </div>
+            </div>
             <el-row v-if="!ower2Switch && !btns.ower2show" :gutter="20">
               <el-col class="col-m-b-6" :span="6">
                 <el-form-item class="white-m-p24" label="被投保人类型" prop="personType3">

src/views/insurancePolicy/orderDetail.vue

@@ -20,7 +20,7 @@
               detailData?.order?.orderStatus
                 === '5' ? '已承保' : detailData?.order?.orderStatus === '6' ? '计算保费失败，请按要求修改订单' :
                 detailData?.order?.orderStatus ===
-                  '7' ? '核保不通过，请按意见修改订单' : detailData?.order?.orderStatus === '8'?'订单已关闭，有投保需求请重新报价':'--' }}</span>
+                  '7' ? '核保不通过，请按意见修改订单' : detailData?.order?.orderStatus === '8' ? '订单已关闭，有投保需求请重新报价' : '--' }}</span>
         </el-col>
       </el-row>
 
@@ -33,10 +33,10 @@
           <div class="infoBox">
             <!-- 批单状态 = 待审核 -->
             <div class="name" v-if="detailData?.insOrderAdjustVo.status === 1">{{
-              `订单申请${detailData?.insOrderAdjustVo.type === 0 ? '整单退保' : '险种批改' }，等待审核处理` }}</div>
+              `订单申请${detailData?.insOrderAdjustVo.type === 0 ? '整单退保' : '险种批改'}，等待审核处理` }}</div>
             <!-- 批单状态 = 退回修改 -->
             <div class="name" v-if="detailData?.insOrderAdjustVo.status === 3">{{
-              `订单申请${detailData?.insOrderAdjustVo.type === 0 ? '整单退保' : '险种批改' }被退回，等修改后重新提交审核` }}</div>
+              `订单申请${detailData?.insOrderAdjustVo.type === 0 ? '整单退保' : '险种批改'}被退回，等修改后重新提交审核` }}</div>
             <div class="desc" style="color: var(--el-text-color-regular)">
               {{ `申请批改${handleCompute(detailData?.insOrderAdjustVo.afterPremium, detailData?.insOrderAdjustVo.premium)
                 > 0 ? '补缴保费金额' : '退款金额'}：¥${Math.abs(handleCompute(detailData?.insOrderAdjustVo.afterPremium,
@@ -68,8 +68,8 @@
           <span class="words">{{ detailData?.salesmanInfo?.typeAttr == '5' ? '团队' : detailData?.salesmanInfo?.typeAttr
             ==
             '6' ? '个代' : detailData?.salesmanInfo?.typeAttr == '7' ? '渠道' : detailData?.salesmanInfo?.typeAttr == '8'
-              ?'电销组':'--'
-            }}</span>
+              ? '电销组' : '--'
+          }}</span>
         </el-col>
         <el-col :span="6">
           <span class="label">归属</span>
@@ -79,14 +79,14 @@
           <span class="label">出单协议</span>
           <span class="words" style="color: #00a0f4" @click="toAgreementDetail">{{ detailData?.order?.agreementName ||
             '--'
-          }}</span>
+            }}</span>
         </el-col>
         <el-col :span="6">
           <span class="label">协议类型</span>
           <span class="words">{{ detailData?.order?.agreementType === '1' ? '平台协议-平台结算' :
             detailData?.order?.agreementType
               ===
-              '2' ? '私有协议-自行结算' : detailData?.order?.agreementType === '3' ?'网销协议-自行结算':'--' }}</span>
+              '2' ? '私有协议-自行结算' : detailData?.order?.agreementType === '3' ? '网销协议-自行结算' : '--' }}</span>
         </el-col>
         <el-col :span="6">
           <span class="label">录单人</span>
@@ -109,11 +109,13 @@
           <span class="words">{{ detailData?.order?.payTime || '--' }}</span>
         </el-col>
       </el-row>
-      <div class="tipsList">
-        <div class="tipsItem" :class="{ 'active': tipsIndex === index }" v-for="(item, index) in tipsList" :key="index"
-          @click="handleTipsIndexChange(item, index)">
-          <img :src="item.url" />
-          <span class="tipsName">{{ item.name }}</span>
+      <div class="p-[0_24px]">
+        <div class="tipsList">
+          <div class="tipsItem" :class="{ 'active': tipsIndex === index }" v-for="(item, index) in tipsList"
+            :key="index" @click="handleTipsIndexChange(item, index)">
+            <img :src="item.url" />
+            <span class="tipsName">{{ item.name }}</span>
+          </div>
         </div>
       </div>
     </div>
@@ -205,7 +207,7 @@
           <div class="taxList">
             <span class="taxItem" :class="{ 'active': item.bool }" v-for="(item, index) in taxList" :key="index">{{
               item.name
-            }}</span>
+              }}</span>
           </div>
         </div>
         <el-row :gutter="20">
@@ -338,7 +340,7 @@
             <span class="value">{{ detailData?.carInfoVo?.isRegistered == '0' ? '已上牌' :
               detailData?.carInfoVo?.isRegistered
                 ==
-                '1' ?'未上牌':'--' }}</span>
+                '1' ? '未上牌' : '--' }}</span>
           </el-col>
           <el-col :span="6" class="carMsgItem">
             <span class="label">车牌</span>
@@ -360,12 +362,12 @@
           <el-col :span="6" class="carMsgItem">
             <span class="label">使用性质</span>
             <span class="value">{{ dictChange(optionObj['car_nature_code'], detailData?.carInfoVo?.carNatureCode)
-            }}</span>
+              }}</span>
           </el-col>
           <el-col :span="6" class="carMsgItem">
             <span class="label">车辆用途</span>
             <span class="value">{{ dictChange(optionObj['vehicle_use_code'], detailData?.carInfoVo?.vehicleUseCode)
-            }}</span>
+              }}</span>
           </el-col>
           <el-col :span="6" class="carMsgItem">
             <span class="label">车辆种类</span>
@@ -374,12 +376,12 @@
           <el-col :span="6" class="carMsgItem">
             <span class="label">车辆类型</span>
             <span class="value">{{ dictChange(optionObj['car_type_code'], detailData?.carInfoVo?.carTypeCode)
-            }}</span>
+              }}</span>
           </el-col>
           <el-col :span="6" class="carMsgItem">
             <span class="label">能源种类</span>
             <span class="value">{{ dictChange(optionObj['energy_type_code'], detailData?.carInfoVo?.energyTypeCode)
-            }}</span>
+              }}</span>
           </el-col>
           <el-col :span="6" class="carMsgItem">
             <span class="label">注册日期</span>
@@ -485,7 +487,7 @@
           <div class="taxList">
             <span class="taxItem" :class="{ 'active': item.bool }" v-for="(item, index) in tbList" :key="index">{{
               item.name
-            }}</span>
+              }}</span>
           </div>
         </div>
         <el-row :gutter="20" v-if="!tbList[0].bool">
@@ -549,7 +551,7 @@
           <div class="taxList">
             <span class="taxItem" :class="{ 'active': item.bool }" v-for="(item, index) in bbList" :key="index">{{
               item.name
-            }}</span>
+              }}</span>
           </div>
         </div>
         <el-row :gutter="20" v-if="!bbList[0].bool && !bbList[1].bool">
@@ -1684,12 +1686,12 @@ const getQuoteNumber = (licenseNo, vinNo, engineNo) => {
 }
 
 /** 根据路由参数 jumpType 跳转至对应的提示项，并触发提示切换处理 */
-const jumpFn=()=>{
-  const jumpType= myRoute.query.jumpType
-  if(!jumpType) return
-  const obj=tipsList.value.find(v=>v.id===jumpType)
-  const index=tipsList.value.findIndex(v=>v.id===jumpType)
-  handleTipsIndexChange(obj,index)
+const jumpFn = () => {
+  const jumpType = myRoute.query.jumpType
+  if (!jumpType) return
+  const obj = tipsList.value.find(v => v.id === jumpType)
+  const index = tipsList.value.findIndex(v => v.id === jumpType)
+  handleTipsIndexChange(obj, index)
 }
 
 // 获取详情
@@ -1754,7 +1756,7 @@ const initDetail = () => {
       }
       imageEcho(res.data.order.quoteNo)
 
-      nextTick(()=>jumpFn())
+      nextTick(() => jumpFn())
       // if (res.data.imageVoList && res.data.imageVoList.length > 0) {
       //   images.value = res.data.imageVoList.map(a => {
       //     return {
@@ -2137,7 +2139,7 @@ onMounted(() => {
 
     .tipsList {
       width: 100%;
-      padding: 12px 24px;
+      padding: 12px 0;
       display: flex;
       align-items: center;
       justify-content: space-between;
@@ -2152,6 +2154,12 @@ onMounted(() => {
         padding: 4px 18px;
         border-radius: 4px;
         border: 1px solid #EEEEEE;
+        margin-right: 20px;
+
+        &:last-of-type {
+          margin-right: 0;
+        }
+
         cursor: pointer;
 
         img {

src/views/receivable/handingFee/index.vue

@@ -507,6 +507,8 @@ import { useRouter } from 'vue-router'
 
 import api from '@/api'
 
+const route = useRoute()
+
 let myRouter = useRouter()
 
 let activeName = ref('1')
@@ -893,6 +895,7 @@ const reset = () => {
 // 车险列表
 const getCommissionReceivableList = () => {
   let params = {
+    invoiceId: receivableForm.value?.invoiceId,
     licenseNo: receivableForm.value?.licenseNo,
     typeAttr: receivableForm.value?.typeAttr,
     companyId: receivableForm.value?.companyId,
@@ -957,6 +960,9 @@ const getJyReceivableList = () => {
 }
 
 onMounted(() => {
+  if (route.query.id) {
+    receivableForm.value.invoiceId=route.query.id
+  }
   dictDetails();
   initCompany();
   initDept();

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" v-if="scope.row.settlementStatus==='已结清'" @click="handleView(scope.row)">明细查询</el-button>
+          <el-button link type="primary" @click="handleView(scope.row)">明细查询</el-button>
           <el-button link type="primary" @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>
@@ -159,8 +159,8 @@ const getCompanyName = (row) => {
 let pages = ref(1)
 let size = ref(10)
 let total = ref(0)
-const handleSizeChange = (size) => {
-  size.value = size
+const handleSizeChange = (val) => {
+  size.value = val
   initList()
 }
 const handleCurrentChange = (pages) => {
@@ -168,8 +168,6 @@ const handleCurrentChange = (pages) => {
   initList()
 }
 const search = () => {
-  pages.value = 1
-  size.value = 10
   initList()
 }
 const reset = () => {
@@ -222,14 +220,14 @@ const uploadImage = async (file, fileList) => {
 // 明细查询
 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)
+  const newHref=href[0]+'#/receivable/private/handingFee?activeName=2&id='+row.id
   window.open(newHref, '_blank');
 }
 // 删除
 const handleDelete = (row) => {
   api.financeApi.deleteInvoiceById(row.id).then((res: any) => {
     if (res.code == 200) {
+      reset()
       ElMessage({
         message: res.msg,
         type: 'success'