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

src/views/finance/audit.vue

@@ -7,7 +7,7 @@
             <span>待审核</span>
           </el-badge>
         </template>
-        <el-form v-model="firstForm" label-width="100">
+        <el-form v-model="firstForm" label-width="120">
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="保险公司">
@@ -113,12 +113,25 @@
                   @change="handleChange" :props="tableProps"></el-cascader>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="起保时间">
-                <el-date-picker v-model="firstForm.riskStartDate" type="daterange" range-separator="至"
+            <el-col v-show="isTrue" :span="8">
+              <el-form-item label="交强险起保时间">
+                <el-date-picker v-model="firstForm.jqRiskStartDate" type="daterange" range-separator="至"
+                  start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+              </el-form-item>
+            </el-col>
+            <el-col v-show="isTrue" :span="8">
+              <el-form-item label="商业险起保时间">
+                <el-date-picker v-model="firstForm.syRiskStartDate" type="daterange" range-separator="至"
                   start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
+            <el-col v-show="isTrue" :span="8">
+              <el-form-item label="非车险起保时间">
+                <el-date-picker v-model="firstForm.jyRiskStartDate" type="daterange" range-separator="至"
+                  start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+              </el-form-item>
+            </el-col>
+
             <el-col v-show="isTrue" :span="8">
               <el-form-item label="交强保单号">
                 <el-input v-model="firstForm.jqPolicyNo" placeholder="请输入" clearable></el-input>
@@ -156,7 +169,7 @@
           <el-table-column prop="orderType" label="订单类型" width="120"></el-table-column>
           <el-table-column prop="agreementName" label="出单协议" width="120"></el-table-column>
           <el-table-column prop="companyALlName" label="保险公司" width="120"></el-table-column>
-          <el-table-column prop="partnerCompanyId" label="保险机构" width="120"></el-table-column>
+          <el-table-column prop="partnerCompanyName" label="保险机构" width="120"></el-table-column>
           <el-table-column prop="dockingPerson" label="对接人" width="120"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
           <el-table-column prop="insurName" label="被保人" width="120"></el-table-column>
@@ -186,7 +199,7 @@
             <span>审核通过</span>
           </el-badge>
         </template>
-        <el-form v-model="firstForm" label-width="100">
+        <el-form v-model="firstForm" label-width="120">
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="保险公司">
@@ -306,6 +319,24 @@
                   @change="handleChange" :props="tableProps"></el-cascader>
               </el-form-item>
             </el-col>
+            <el-col v-show="isTrue" :span="8">
+              <el-form-item label="交强险起保时间">
+                <el-date-picker v-model="firstForm.jqRiskStartDate" type="daterange" range-separator="至"
+                  start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+              </el-form-item>
+            </el-col>
+            <el-col v-show="isTrue" :span="8">
+              <el-form-item label="商业险起保时间">
+                <el-date-picker v-model="firstForm.syRiskStartDate" type="daterange" range-separator="至"
+                  start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+              </el-form-item>
+            </el-col>
+            <el-col v-show="isTrue" :span="8">
+              <el-form-item label="非车险起保时间">
+                <el-date-picker v-model="firstForm.jyRiskStartDate" type="daterange" range-separator="至"
+                  start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+              </el-form-item>
+            </el-col>
             <el-col v-show="isTrue" :span="8">
               <el-form-item label="交强保单号">
                 <el-input v-model="firstForm.jyPolicyNo" placeholder="请输入" clearable></el-input>
@@ -336,14 +367,14 @@
         </el-form>
         <el-table :data="secondData" height="calc(100% - 294px )" style="width: 100%; margin-top: 20px;"
           highlight-current-row>
-           <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
+          <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
           <el-table-column prop="attrType" label="业务员类型" width="120"></el-table-column>
           <el-table-column prop="mobile" label="业务员手机号" width="120"></el-table-column>
           <el-table-column prop="name" label="业务员" width="120"></el-table-column>
           <el-table-column prop="orderType" label="订单类型" width="120"></el-table-column>
           <el-table-column prop="agreementName" label="出单协议" width="120"></el-table-column>
           <el-table-column prop="companyALlName" label="保险公司" width="120"></el-table-column>
-          <el-table-column prop="partnerCompanyId" label="保险机构" width="120"></el-table-column>
+          <el-table-column prop="partnerCompanyName" label="保险机构" width="120"></el-table-column>
           <el-table-column prop="dockingPerson" label="对接人" width="120"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
           <el-table-column prop="insurName" label="被保人" width="120"></el-table-column>
@@ -442,12 +473,12 @@
         </el-form>
         <el-table :data="thirdData" height="calc(100% - 294px )" style="width: 100%; margin-top: 20px;"
           highlight-current-row>
-         <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
+          <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
           <el-table-column prop="attrType" label="业务员类型" width="120"></el-table-column>
           <el-table-column prop="mobile" label="业务员手机号" width="120"></el-table-column>
           <el-table-column prop="name" label="业务员" width="120"></el-table-column>
           <el-table-column prop="companyALlName" label="保险公司" width="120"></el-table-column>
-          <el-table-column prop="partnerCompanyId" label="保险机构" width="120"></el-table-column>
+          <el-table-column prop="partnerCompanyName" label="保险机构" width="120"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
           <el-table-column prop="insurName" label="被保人" width="120"></el-table-column>
           <el-table-column prop="createBy" label="录入人" width="120"></el-table-column>
@@ -475,7 +506,7 @@
           </el-badge>
         </template>
         <el-form v-model="firstForm" label-width="100">
-           <el-row :gutter="20">
+          <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="保险公司">
                 <el-select v-model="firstForm.companyId" placeholder="请选择" clearable filterable>
@@ -567,7 +598,7 @@
         </el-form>
         <el-table :data="forthData" height="calc(100% - 294px )" style="width: 100%; margin-top: 20px;"
           highlight-current-row>
-            <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
+          <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
           <el-table-column prop="attrType" label="业务员类型" width="120">
             <template #default="scope">
               {{ scope.row.attrType == '5' ? '团队' : scope.row.attrType == '6' ? '个代' : scope.row.attrType ==
@@ -584,7 +615,7 @@
           </el-table-column>
           <el-table-column prop="agreementName" label="出单协议" width="120"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="120"></el-table-column>
-          <el-table-column prop="partnerCompanyId" label="保险机构" width="120"></el-table-column>
+          <el-table-column prop="partnerCompanyName" label="保险机构" width="120"></el-table-column>
           <el-table-column prop="dockingPerson" label="对接人" width="120"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
           <el-table-column prop="insurName" label="被保人" width="120"></el-table-column>
@@ -729,8 +760,12 @@ const initList = (type) => {
       signingTimeEnd: firstForm.value?.signingTime?.[1],
       payingTimeBegin: firstForm.value?.payingTime?.[0],
       payingTimeEnd: firstForm.value?.payingTime?.[1],
-      riskStartDateBegin: firstForm.value?.riskStartDate?.[0],
-      riskStartDateEnd: firstForm.value?.riskStartDate?.[1],
+      jqRiskStartDateBegin: firstForm.value?.jqRiskStartDate?.[0],
+      jqRiskStartDateEnd: firstForm.value?.jqRiskStartDate?.[1],
+      syRiskStartDateBegin: firstForm.value?.syRiskStartDate?.[0],
+      syRiskStartDateEnd: firstForm.value?.syRiskStartDate?.[1],
+      jyRiskStartDateBegin: firstForm.value?.jyRiskStartDate?.[0],
+      jyRiskStartDateEnd: firstForm.value?.jyRiskStartDate?.[1],
       auditTimeBegin: firstForm.value?.auditTime?.[0],
       auditTimeEnd: firstForm.value?.auditTime?.[1],
       problemTimeBegin: firstForm.value?.problemTime?.[0],
@@ -750,9 +785,13 @@ const initList = (type) => {
       signingTimeEnd: firstForm.value?.signingTime?.[1],
       payingTimeBegin: firstForm.value?.payingTime?.[0],
       payingTimeEnd: firstForm.value?.payingTime?.[1],
-      riskStartDateBegin: firstForm.value?.riskStartDate?.[0],
-      riskStartDateEnd: firstForm.value?.riskStartDate?.[1],
-       auditTimeBegin: firstForm.value?.auditTime?.[0],
+      jqRiskStartDateBegin: firstForm.value?.jqRiskStartDate?.[0],
+      jqRiskStartDateEnd: firstForm.value?.jqRiskStartDate?.[1],
+      syRiskStartDateBegin: firstForm.value?.syRiskStartDate?.[0],
+      syRiskStartDateEnd: firstForm.value?.syRiskStartDate?.[1],
+      jyRiskStartDateBegin: firstForm.value?.jyRiskStartDate?.[0],
+      jyRiskStartDateEnd: firstForm.value?.jyRiskStartDate?.[1],
+      auditTimeBegin: firstForm.value?.auditTime?.[0],
       auditTimeEnd: firstForm.value?.auditTime?.[1],
       problemTimeBegin: firstForm.value?.problemTime?.[0],
       problemTimeEnd: firstForm.value?.problemTime?.[1],

src/views/finance/index.vue

@@ -7,7 +7,7 @@
             <span>待审核</span>
           </el-badge>
         </template>
-        <el-form v-model="firstForm" label-width="100">
+        <el-form v-model="firstForm" label-width="120">
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="保险公司">
@@ -114,8 +114,20 @@
               </el-form-item>
             </el-col>
             <el-col v-show="isTrue" :span="8">
-              <el-form-item label="起保时间">
-                <el-date-picker v-model="firstForm.riskStartDate" type="daterange" range-separator="至"
+              <el-form-item label="交强险起保时间">
+                <el-date-picker v-model="firstForm.jqRiskStartDate" type="daterange" range-separator="至"
+                  start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+              </el-form-item>
+            </el-col>
+            <el-col v-show="isTrue" :span="8">
+              <el-form-item label="商业险起保时间">
+                <el-date-picker v-model="firstForm.syRiskStartDate" type="daterange" range-separator="至"
+                  start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+              </el-form-item>
+            </el-col>
+            <el-col v-show="isTrue" :span="8">
+              <el-form-item label="非车险起保时间">
+                <el-date-picker v-model="firstForm.jyRiskStartDate" type="daterange" range-separator="至"
                   start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
@@ -156,7 +168,7 @@
           <el-table-column prop="orderType" label="订单类型" width="120"></el-table-column>
           <el-table-column prop="agreementName" label="出单协议" width="120"></el-table-column>
           <el-table-column prop="companyALlName" label="保险公司" width="120"></el-table-column>
-          <el-table-column prop="partnerCompanyId" label="保险机构" width="120"></el-table-column>
+          <el-table-column prop="partnerCompanyName" label="保险机构" width="120"></el-table-column>
           <el-table-column prop="dockingPerson" label="对接人" width="120"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
           <el-table-column prop="insurName" label="被保人" width="120"></el-table-column>
@@ -187,7 +199,7 @@
             <span>审核通过</span>
           </el-badge>
         </template>
-        <el-form v-model="firstForm" label-width="100">
+        <el-form v-model="firstForm" label-width="120">
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="保险公司">
@@ -312,6 +324,24 @@
                   @change="handleChange" :props="tableProps"></el-cascader>
               </el-form-item>
             </el-col>
+            <el-col v-show="isTrue" :span="8">
+              <el-form-item label="交强险起保时间">
+                <el-date-picker v-model="firstForm.jqRiskStartDate" type="daterange" range-separator="至"
+                  start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+              </el-form-item>
+            </el-col>
+            <el-col v-show="isTrue" :span="8">
+              <el-form-item label="商业险起保时间">
+                <el-date-picker v-model="firstForm.syRiskStartDate" type="daterange" range-separator="至"
+                  start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+              </el-form-item>
+            </el-col>
+            <el-col v-show="isTrue" :span="8">
+              <el-form-item label="非车险起保时间">
+                <el-date-picker v-model="firstForm.jyRiskStartDate" type="daterange" range-separator="至"
+                  start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+              </el-form-item>
+            </el-col>
             <el-col v-show="isTrue" :span="8">
               <el-form-item label="交强保单号">
                 <el-input v-model="firstForm.jyPolicyNo" placeholder="请输入" clearable></el-input>
@@ -349,7 +379,7 @@
           <el-table-column prop="orderType" label="订单类型" width="120"></el-table-column>
           <el-table-column prop="agreementName" label="出单协议" width="120"></el-table-column>
           <el-table-column prop="companyALlName" label="保险公司" width="120"></el-table-column>
-          <el-table-column prop="partnerCompanyId" label="保险机构" width="120"></el-table-column>
+          <el-table-column prop="partnerCompanyName" label="保险机构" width="120"></el-table-column>
           <el-table-column prop="dockingPerson" label="对接人" width="120"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
           <el-table-column prop="insurName" label="被保人" width="120"></el-table-column>
@@ -454,7 +484,7 @@
           <el-table-column prop="mobile" label="业务员手机号" width="120"></el-table-column>
           <el-table-column prop="name" label="业务员" width="120"></el-table-column>
           <el-table-column prop="companyALlName" label="保险公司" width="120"></el-table-column>
-          <el-table-column prop="partnerCompanyId" label="保险机构" width="120"></el-table-column>
+          <el-table-column prop="partnerCompanyIdName" label="保险机构" width="120"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
           <el-table-column prop="insurName" label="被保人" width="120"></el-table-column>
           <el-table-column prop="createBy" label="录入人" width="120"></el-table-column>
@@ -595,7 +625,7 @@
           </el-table-column>
           <el-table-column prop="agreementName" label="出单协议" width="120"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="120"></el-table-column>
-          <el-table-column prop="partnerCompanyId" label="保险机构" width="120"></el-table-column>
+          <el-table-column prop="partnerCompanyName" label="保险机构" width="120"></el-table-column>
           <el-table-column prop="dockingPerson" label="对接人" width="120"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
           <el-table-column prop="insurName" label="被保人" width="120"></el-table-column>
@@ -819,9 +849,13 @@ const initData = (type) => {
       signingTimeEnd: firstForm.value?.signingTime?.[1],
       payingTimeBegin: firstForm.value?.payingTime?.[0],
       payingTimeEnd: firstForm.value?.payingTime?.[1],
-      riskStartDateBegin: firstForm.value?.riskStartDate?.[0],
-      riskStartDateEnd: firstForm.value?.riskStartDate?.[1],
-       auditTimeBegin: firstForm.value?.auditTime?.[0],
+      jqRiskStartDateBegin: firstForm.value?.jqRiskStartDate?.[0],
+      jqRiskStartDateEnd: firstForm.value?.jqRiskStartDate?.[1],
+      syRiskStartDateBegin: firstForm.value?.syRiskStartDate?.[0],
+      syRiskStartDateEnd: firstForm.value?.syRiskStartDate?.[1],
+      jyRiskStartDateBegin: firstForm.value?.jyRiskStartDate?.[0],
+      jyRiskStartDateEnd: firstForm.value?.jyRiskStartDate?.[1],
+      auditTimeBegin: firstForm.value?.auditTime?.[0],
       auditTimeEnd: firstForm.value?.auditTime?.[1],
       problemTimeBegin: firstForm.value?.problemTime?.[0],
       problemTimeEnd: firstForm.value?.problemTime?.[1],
@@ -840,9 +874,13 @@ const initData = (type) => {
       signingTimeEnd: firstForm.value?.signingTime?.[1],
       payingTimeBegin: firstForm.value?.payingTime?.[0],
       payingTimeEnd: firstForm.value?.payingTime?.[1],
-      riskStartDateBegin: firstForm.value?.riskStartDate?.[0],
-      riskStartDateEnd: firstForm.value?.riskStartDate?.[1],
-       auditTimeBegin: firstForm.value?.auditTime?.[0],
+      jqRiskStartDateBegin: firstForm.value?.jqRiskStartDate?.[0],
+      jqRiskStartDateEnd: firstForm.value?.jqRiskStartDate?.[1],
+      syRiskStartDateBegin: firstForm.value?.syRiskStartDate?.[0],
+      syRiskStartDateEnd: firstForm.value?.syRiskStartDate?.[1],
+      jyRiskStartDateBegin: firstForm.value?.jyRiskStartDate?.[0],
+      jyRiskStartDateEnd: firstForm.value?.jyRiskStartDate?.[1],
+      auditTimeBegin: firstForm.value?.auditTime?.[0],
       auditTimeEnd: firstForm.value?.auditTime?.[1],
       problemTimeBegin: firstForm.value?.problemTime?.[0],
       problemTimeEnd: firstForm.value?.problemTime?.[1],