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

src/views/consoleManage/businessDataManage/companyDataManage/companyDataManageDetail.vue

@@ -1,27 +1,27 @@
 <template>
   <div class="log">
     <PageMain class="vh100">
-    <div class='btn-box'>
-      <el-button type="primary" plain class='query-btn'
-        @click='dialogShow'>{{selectedKeys.length?`已选${selectedKeys.length}项`:'筛选条件'}}</el-button>
-      <div class='query-btn'>
-        <DowButton @endAnim='downloadFile'></DowButton>
+      <div class='btn-box'>
+        <el-button type="primary" plain class='query-btn'
+          @click='dialogShow'>{{ selectedKeys.length ? `已选${selectedKeys.length}项` : '筛选条件' }}</el-button>
+        <div class='query-btn'>
+          <DowButton @endAnim='downloadFile'></DowButton>
+        </div>
       </div>
-    </div>
-    <QueryForm :option="listOption" @query='query' @delSelect='delSelect' ref='queryFormRef'></QueryForm>
+      <QueryForm :option="listOption" @query='query' @delSelect='delSelect' ref='queryFormRef'></QueryForm>
 
-    <!-- 表格 -->
-    <ComplexTable :tableData="tableData" :showSelect='false' :columns="listOption.columns" :showIndex="false"
-      :columnwidth="120" :pageInfo="pageInfo" @getList="getList" :showOperation='false'>
-      <template v-slot:search="scope">
-        <Sort :scope="scope.slotData" :globalSortKey="globalSortKey" :globalSortOrder="globalSortOrder"
-          @update:sort="handleSortUpdate"></Sort>
-      </template>
-    </ComplexTable>
+      <!-- 表格 -->
+      <ComplexTable :tableData="tableData" :showSelect='false' :columns="listOption.columns" :showIndex="false"
+        :columnwidth="120" :pageInfo="pageInfo" @getList="getList" :showOperation='false'>
+        <template v-slot:search="scope">
+          <Sort :scope="scope.slotData" :globalSortKey="globalSortKey" :globalSortOrder="globalSortOrder"
+            @update:sort="handleSortUpdate"></Sort>
+        </template>
+      </ComplexTable>
 
-    <FilterDialog :show='isShow' @close='isShow=false' @sure='filterSure' ref='filterDialogRef' @selectedKeys='selected'
-      routerKey='routerKey'>
-    </FilterDialog>
+      <FilterDialog :show='isShow' @close='isShow = false' @sure='filterSure' ref='filterDialogRef'
+        @selectedKeys='selected' routerKey='routerKey'>
+      </FilterDialog>
     </PageMain>
   </div>
 </template>
@@ -129,7 +129,8 @@ const initDefaultList = async () => {
   const queryParamsMap = route.query;
   const processedData = data.map((item) => {
     if (queryParamsMap.hasOwnProperty(item.key)) {
-      return { ...item, defaultValue: queryParamsMap[item.key] };
+      let defaultValue = queryParamsMap[item.key]
+      return { ...item, defaultValue };
     }
     return item;
   });
@@ -246,7 +247,7 @@ function getList(item: PageInfo) {
 
 //导出
 const downloadFile = async () => {
- let query = { ...queryFormRes.value, ...isFilterFrom.value };
+  let query = { ...queryFormRes.value, ...isFilterFrom.value };
   const { data, msg } = await api.manageApi.companyDataManageDetailToTask({
     pageNo: pageInfo.value.pageNum,
     pageSize: pageInfo.value.pageSize,
@@ -274,6 +275,7 @@ onMounted(() => {
   .query-btn {
     margin-left: 20px;
   }
+
   .btn-box {
     padding-bottom: 15px;
     margin-bottom: 24px;
@@ -282,6 +284,7 @@ onMounted(() => {
     justify-content: flex-end;
   }
 }
+
 :deep(.caret-wrapper) {
   display: none !important;
 }

src/views/consoleManage/components/queryForm.vue

@@ -154,6 +154,7 @@ const tableProps = ref({
   label: "name",
   children: "children",
   checkStrictly: true,
+  emitPath: false,
 });
 const showDelete = ref(false);
 let queryForm = reactive({ data: {} });
@@ -304,9 +305,7 @@ const singleChange = async (val, option, isDefault) => {
     const info = companyList.value.find((a) => a.id === val)//获取选中的保险公司名称
     propsOption.queryFormFields.forEach((e) => {
       if (e.key == "partnerCompanyIds") {
-        e.listOption = info.children ?? [];
-        queryForm.data.partnerCompanyIds =
-          option.defaultValue && isDefault ? option.defaultValue : "";
+        e.listOption = info?.children ?? [];
       }
     });
   }
@@ -355,6 +354,7 @@ const querySelect = () => {
 
 const initQuery = () => {
   const from = querySelect();
+  if (from.partnerCompanyIds) from.partnerCompanyIds = from.partnerCompanyIds.filter(v => v)
   emit("query", from);
 };
 //删除
@@ -376,6 +376,12 @@ const initCompany = () => {
   api.agreementApi.findTree({ name: "", systemCode: localStorage.getItem('login_system') }).then((res: any) => {
     if (res.code == '200') {
       companyList.value = res.data;
+      const info = companyList.value.find((a) => a.id === queryForm.data.companyId)//获取选中的保险公司名称
+      propsOption.queryFormFields.forEach((e) => {
+        if (e.key == "partnerCompanyIds") {
+          e.listOption = info?.children ?? [];
+        }
+      });
     }
   });
 }