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

src/views/insurancePolicy/index.vue

@@ -880,7 +880,7 @@
               报价公司
             </span>
           </template>
-          <el-table :data="quoteData" style="width: calc(100% - 48px); margin: 0 24px" row-key="id"
+          <el-table :data="showQuoteData" style="width: calc(100% - 48px); margin: 0 24px" row-key="id"
             :preserve-expanded-content="true" @selection-change="handleSelect" @select="handelSelectRow"
             @row-click="handleClickRow" @expand-change="handelExpend">
             <el-table-column type="expand">
@@ -1129,7 +1129,7 @@
               <template #header>
                 <div style="">
                   <span style="margin-right: 10px">报价结果</span>
-                  <el-checkbox @change="handleViewSuccess">仅查看报价成功</el-checkbox>
+                  <el-checkbox v-model="isViewSuccess">仅查看报价成功</el-checkbox>
                 </div>
               </template>
               <template #default="scope">
@@ -1495,7 +1495,7 @@ const initDetail = () => {
       // 设置车主信息
       insurancePolicyForm.value.name1 = obj?.ownersInfo?.name
       insurancePolicyForm.value.mobile1 = obj?.ownersInfo?.mobile
-      insurancePolicyForm.value.identifyType1 = obj?.ownersInfo?.identifyType
+      insurancePolicyForm.value.identifyType1 = obj?.ownersInfo?.identifyType?('0'+obj.ownersInfo.identifyType):''
       insurancePolicyForm.value.identifyNumber1 = obj?.ownersInfo?.identifyNumber
       insurancePolicyForm.value.identifyValidDate1 = obj?.ownersInfo?.identifyValidDate
       insurancePolicyForm.value.addr1 = obj?.ownersInfo?.addr
@@ -1512,7 +1512,7 @@ const initDetail = () => {
       // 设置投保人信息
       insurancePolicyForm.value.name2 = obj?.policyHolderInfo?.name
       insurancePolicyForm.value.mobile2 = obj?.policyHolderInfo?.mobile
-      insurancePolicyForm.value.identifyType2 = obj?.policyHolderInfo?.identifyType
+      insurancePolicyForm.value.identifyType2 = obj?.policyHolderInfo?.identifyType?('0'+obj.policyHolderInfo.identifyType):''
       insurancePolicyForm.value.identifyNumber2 = obj?.policyHolderInfo?.identifyNumber
       insurancePolicyForm.value.identifyValidDate2 = obj?.policyHolderInfo?.identifyValidDate
       insurancePolicyForm.value.addr2 = obj?.policyHolderInfo?.addr
@@ -1526,7 +1526,7 @@ const initDetail = () => {
       // 设置被保人信息
       insurancePolicyForm.value.name3 = obj?.insuredPersonInfo?.name
       insurancePolicyForm.value.mobile3 = obj?.insuredPersonInfo?.mobile
-      insurancePolicyForm.value.identifyType3 = obj?.insuredPersonInfo?.identifyType
+      insurancePolicyForm.value.identifyType3 = obj?.insuredPersonInfo?.identifyType?('0'+obj.insuredPersonInfo.identifyType):''
       insurancePolicyForm.value.identifyNumber3 = obj?.insuredPersonInfo?.identifyNumber
       insurancePolicyForm.value.identifyValidDate3 = obj?.insuredPersonInfo?.identifyValidDate
       insurancePolicyForm.value.addr3 = obj?.insuredPersonInfo?.addr
@@ -2602,9 +2602,18 @@ const handelExpend = (e: any) => {
 const handleClickRow = (a: any, b: any) => {
 
 }
-const handleViewSuccess = (e: any) => {
-  console.log(11111, quoteData.value)
-}
+
+/**
+ * 根据视图成功状态过滤报价数据
+ * @returns {Array} 过滤后的报价数据列表。当 isViewSuccess 为 true 时，仅返回报价结果成功的记录（code === 200）；否则返回全部报价数据
+ */
+const showQuoteData=computed(()=>{
+  if(isViewSuccess.value) return quoteData.value.filter(v=>v.quoteResult?.code===200)
+  return quoteData.value
+})
+// 是否仅查看报价成功
+const isViewSuccess=ref(false)
+
 // 选择险种
 let insuranceShow = ref(false)
 const handlePopover = (scope: any) => {

src/views/insurancePolicy/order.vue

@@ -14,7 +14,7 @@
               end-placeholder="结束时间" value-format="YYYY-MM-DD HH:mm:ss" />
           </el-form-item>
           <el-form-item label="订单状态">
-            <el-select v-model="orderForm.adjustStatus" placeholder="请选择" clearable>
+            <el-select v-model="orderForm.orderStatus" placeholder="请选择" clearable>
               <el-option v-for="item in orderStatusList" :key="item.value" :value="item.value"
                 :label="item.label"></el-option>
             </el-select>
@@ -61,7 +61,7 @@
               start-placeholder="开始时间" end-placeholder="结束时间" value-format="YYYY-MM-DD HH:mm:ss" />
           </el-form-item>
           <el-form-item>
-            <el-button plain @click="handleCancel">重置</el-button>
+            <el-button plain @click="handleReset">重置</el-button>
             <el-button type="primary" @click="handleSearch">查询</el-button>
             <el-button plain @click="isExportShow = true">导出</el-button>
 
@@ -221,7 +221,7 @@ import DialogInsuranceCancel from '@/views/orderBatchAdjust/DialogInsuranceCance
 import { dictData } from '@/views/localDict/index';
 import { ElMessage } from "element-plus";
 import { useRouter } from 'vue-router';
-import { TableInstance } from 'element-plus';
+import { FormInstance } from 'element-plus';
 import QRCode from 'qrcode'
 
 const router = useRouter()
@@ -319,29 +319,19 @@ const orderStatusList = ref([
   },
 ],)
 
-let initialForm = {
+// 初始化默认数据
+const initializationOrderForm={
   orderNo: '',
   licenseNo: '',
-  adjustStatus: '',
+  orderStatus: '',
   companyId: '',//保险公司
   vinNo: '',//车架号
   productCode: '',//险种
   recorder: '',//业务员
   salesmanType: '',//业务员类型
   deptId: '',//出单机构
-
 }
-let orderForm = ref({
-  orderNo: '',
-  licenseNo: '',
-  adjustStatus: '',
-  companyId: '',//保险公司
-  vinNo: '',//车架号
-  productCode: '',//险种
-  recorder: '',//业务员
-  salesmanType: '',//业务员类型
-  deptId: '',//出单机构
-})
+let orderForm = ref({...initializationOrderForm})
 let tableData = ref([])
 // 分页
 let pages = ref(1)
@@ -354,7 +344,7 @@ onMounted(async () => {
   await company()
   await handleResize()
 });
-const multipleTableRef = ref<TableInstance>();
+const multipleTableRef = ref<FormInstance>();
 const tableHeight = ref(); // 初始化表格高度
 
 function handleResize() {
@@ -433,6 +423,12 @@ const initDept = () => {
     }
   })
 }
+// 重置列表筛选
+const handleReset = () => {
+    orderForm.value= {...initializationOrderForm}
+
+    handleSearch()
+}
 const initData = () => {
   loading.value = true;
   let { ...params } = orderForm.value;

src/views/payCredit/agentCount.vue

@@ -253,7 +253,9 @@
                             {{ scope.row.typeAttr=='5'?'团队':scope.row.typeAttr=='6'?'个代':scope.row.typeAttr=='7'?'渠道':scope.row.typeAttr=='8'?'电销组':'--' }}
                         </template>
                     </el-table-column>
-                    <el-table-column prop="applyTime" label="申请时间"></el-table-column>
+                    <!-- <el-table-column prop="applyTime" label="申请时间"></el-table-column> -->
+                    <el-table-column prop="lastRejectReason" label="驳回原因"></el-table-column>
+                    <el-table-column prop="lastRejectTime" label="驳回时间"></el-table-column>
                     <el-table-column prop="bankCardNumber" label="银行卡号"></el-table-column>
                     <el-table-column prop="bankName" label="银行"></el-table-column>
                     <el-table-column prop="name" label="姓名"></el-table-column>