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

src/api/modules/consoleManage.ts

@@ -19,10 +19,10 @@ const manageApi = (axiosInstance: ApiInstance) => ({
     companyDataManageDetailPageList: (params: any) => axiosInstance.post('/console/businessReport/company/detail/page',params),//明细接口
     companyDataManageDetailToTask: (params: any) => axiosInstance.post('/console/businessReport/company/detail/export',params),//明细出接口
     //险种报表
-    riskDataManagePageList: (params: any) => axiosInstance.post('/console/businessDataManage/riskDataManagePageList',params),//列表接口
-    riskDataManageToTask: (params: any) => axiosInstance.post('/console/businessDataManage/riskDataManageToTask',params),//列表导出接口
-    riskDataManageDetailPageList: (params: any) => axiosInstance.post('/console/businessDataManage/riskDataManageDetailPageList',params),//明细接口
-    riskDataManageDetailToPage: (params: any) => axiosInstance.post('/console/businessDataManage/riskDataManageDetailToPage',params),//明细出接口
+    riskDataManagePageList: (params: any) => axiosInstance.post('/console/businessReport/risk/page',params),//列表接口
+    riskDataManageToTask: (params: any) => axiosInstance.post('/console/businessReport/risk/export',params),//列表导出接口
+    riskDataManageDetailPageList: (params: any) => axiosInstance.post('/console/businessReport/risk/detail/page',params),//明细接口
+    riskDataManageDetailToPage: (params: any) => axiosInstance.post('/console/businessReport/risk/detail/export',params),//明细出接口
     //对接人
     contactPersonDataManagePageList: (params: any) => axiosInstance.post('/console/businessDataManage/contactPersonDataManagePageList',params),//列表接口
     contactPersonDataManageToTask: (params: any) => axiosInstance.post('/console/businessDataManage/contactPersonDataManageToTask',params),//列表导出接口

src/layouts/components/DrivingType/index.vue

@@ -92,15 +92,7 @@ const handleCheckChange = (data, row) => {
 
 // 选择驾意险
 let selectedList = ref([])
-const handleType = (item, index) => {
-  item.checked = !item.checked
-  selectedList.value = []
-  JYXList.value.forEach(sub => {
-    if (sub.checked) {
-      selectedList.value.push(sub)
-    }
-  })
-}
+
 // 清空
 const clear = () => {
   selectedList.value = selectedList.value.filter(a => a.selectedStatus === '2')
@@ -121,6 +113,7 @@ const handleDel = (item, index) => {
 // 编辑
 let editIndex = ref(0)
 const initEditData = (data, index, id, arr = []) => {
+console.log("🚀 ~ initEditData ~ data:", data)
 
   editIndex.value = index
   const setList = (list) => {
@@ -136,7 +129,9 @@ const initEditData = (data, index, id, arr = []) => {
     //   selectedKeys.value = selectedList.value.map(a => a.drivingIntentionId)
     // }
   }
-  if(arr.length){
+  if (arr.length) {
+    selectedList.value = data
+    selectedKeys.value = data.map(a => a.drivingIntentionId)
     setList(arr)
     return
   }

src/views/consoleManage/businessDataManage/riskDataManage/index.vue

@@ -224,6 +224,7 @@ const handleSortUpdate = (sortInfo: {
 
 //查询
 const query = (item) => {
+  console.log("🚀 ~ query ~ item:", item)
   queryFormRes.value = item;
   queryList();
 };
@@ -241,6 +242,8 @@ const queryList = async () => {
       ? globalSortKey.value + " " + globalSortOrder.value
       : "",
     ...query,
+    createTimeBegin: query.createTime[0] ?? '',
+    createTimeEnd: query.createTime[1] ?? '',
   });
   tableData.value = data.records;
   pageInfo.value.pageNum = data.current;

src/views/consoleManage/businessDataManage/riskDataManage/riskDataManageDetail.vue

@@ -70,7 +70,7 @@ const listOption = reactive({
     {
       prop: "orderNo",
       label: "订单号",
-      width: "120",
+      width: "180",
     },
     {
       prop: "licenseNo",
@@ -87,13 +87,13 @@ const listOption = reactive({
       label: "险种",
       width: "180",
     },
-    {
-      prop: "quoteCountNum",
-      label: "报价次数",
-      width: "180",
-      align: "right",
-      sortable: true,
-    },
+    // {
+    //   prop: "quoteCountNum",
+    //   label: "报价次数",
+    //   width: "180",
+    //   align: "right",
+    //   sortable: true,
+    // },
     {
       prop: "sumPremium",
       label: "保费",

src/views/consoleManage/components/queryForm.vue

@@ -24,14 +24,15 @@
           @mouseleave="option.isShowDelIcon = false">
 
           <el-select class='min-w ' v-if="option.label == '保险公司'" v-model="queryForm.data[option.key]" placeholder=""
-            @change='singleChange($event, option, false)'>
+            @change='singleChange($event, option, false)' clearable>
             <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
-            <el-option v-for="item in option.listOption" :key="item.value" :label="item.label" :value="item.value==='0'?'':item.value">
+            <el-option v-for="item in option.listOption" :key="item.value" :label="item.label"
+              :value="item.value === '0' ? '' : item.value">
             </el-option>
           </el-select>
-          <el-cascader   v-if="option.label == '合作保险公司'" v-model="queryForm.data[option.key]" :options="option.listOption"
-            :props="tableProps"></el-cascader>
+          <el-cascader v-if="option.label == '合作保险公司'" v-model="queryForm.data[option.key]" :options="option.listOption"
+            :props="tableProps" clearable></el-cascader>
           <template v-if='!option.defaultFlag'>
             <view class='icon-del' @click='del(option)' v-show='option.isShowDelIcon'>
               <el-icon>
@@ -149,10 +150,10 @@ const optionProps = {
 
 let companyoption = ref([])
 const tableProps = ref({
-    value: "id",
-    label: "name",
-    children: "children",
-    checkStrictly: true,
+  value: "id",
+  label: "name",
+  children: "children",
+  checkStrictly: true,
 });
 const showDelete = ref(false);
 let queryForm = reactive({ data: {} });
@@ -225,16 +226,16 @@ const initDefaultSaveForm = () => {
       return [formatTime(currentTimestamp, "YYYY")];
     },
     "select-multiple": (item, baseValue) => {
-      const base = item.listOption ? baseValue : "0";
+      const base = item.listOption ? baseValue : "";
       const resultValue =
-        base == "0" ? ["0"] : Array.isArray(base) ? base : [base];
+        base == "0" ? [] : Array.isArray(base) ? base : [base];
       if (base != "0" && base != 0) {
         moreChange(resultValue, item, item.listOption);
       }
       return resultValue;
     },
     "select-single": (item, baseValue) => {
-      const value = item.listOption || item.defaultValue ? baseValue : "";
+      const value = item.listOption || item.defaultValue ? (baseValue === '0' ? '' : baseValue) : "";
       if (item.isFirst) {
         singleChange(baseValue, item, true);
       }
@@ -300,11 +301,10 @@ const getMultiLabels = (selectedValues, foodList, key) => {
 const singleChange = async (val, option, isDefault) => {
   if (option.isFirst) {
     //查询合作的保险公司数据
-    const  info=option.listOption.find((a)=>a.value==val)//获取选中的保险公司名称
-    const { data } = await api.agreementApi.findTree({name:info.label});
+    const info = companyList.value.find((a) => a.id === val)//获取选中的保险公司名称
     propsOption.queryFormFields.forEach((e) => {
       if (e.key == "partnerCompanyIds") {
-        e.listOption = data;
+        e.listOption = info.children ?? [];
         queryForm.data.partnerCompanyIds =
           option.defaultValue && isDefault ? option.defaultValue : "";
       }
@@ -370,14 +370,14 @@ const del = (option) => {
   emit("delSelect", id);
 };
 
-const companyList=ref([])
+const companyList = ref([])
 // 保险公司
 const initCompany = () => {
-    api.agreementApi.findTree({ name: "", systemCode: localStorage.getItem('login_system') }).then((res: any) => {
-        if (res.code == '200') {
-            companyList.value = res.data;
-        }
-    });
+  api.agreementApi.findTree({ name: "", systemCode: localStorage.getItem('login_system') }).then((res: any) => {
+    if (res.code == '200') {
+      companyList.value = res.data;
+    }
+  });
 }
 
 initCompany()
@@ -494,5 +494,4 @@ defineExpose({
     box-shadow: 0 0 0 0px var(--el-input-border-color, var(--el-border-color)) inset;
   }
 }
-
 </style>

src/views/platform/index.vue

@@ -546,9 +546,9 @@ const companyIdprops = {
 }
 // 保险公司选择器改变时触发
 const handleCompanyChange = (e) => {
-  if (e) {
-    receivableForm.value.companyId = e[e.length - 1] || ''
-  }
+  console.log(e)
+
+  receivableForm.value.companyId = e[e.length - 1] || ''
 }
 let ReceiveDataRef1 = ref()
 // 选中的数据

src/views/platform/ticket.vue

@@ -517,17 +517,12 @@ const handelComfirm = (formEl: FormInstance | undefined) => {
   formEl.validate((valid) => {
     console.log(countForm.value)
     if (valid) {
-      let contactPersonObj = {}
-      if (options.value) {
-        contactPersonObj = options.value.find(v => v.contactPerson === contactPerson.value)
-      }
       api.financeApi.platformSettlement({
         settlementVo: countForm.value,
         invoicingVo: {
           incomeIds: tableData.value.map(item => item.id),
           orderNos: tableData.value.map(item => item.orderNo),
           contactPerson: contactPerson.value,
-          contactPerson: contactPersonObj.contactPerson || '',
           receivablePremium: receivablePremium.value,
           invoiceType: "5"
         }