联调交割库管理

src/layout/components/ToolHeader.vue

@@ -1,17 +1,11 @@
 <script lang="tsx">
-import { defineComponent, computed } from 'vue'
-import { Message } from '@/layout/components//Message'
-import { Collapse } from '@/layout/components/Collapse'
-import { UserInfo } from '@/layout/components/UserInfo'
-import { Screenfull } from '@/layout/components/Screenfull'
-import { Breadcrumb } from '@/layout/components/Breadcrumb'
-import { SizeDropdown } from '@/layout/components/SizeDropdown'
-import { LocaleDropdown } from '@/layout/components/LocaleDropdown'
-import RouterSearch from '@/components/RouterSearch/index.vue'
-import { useAppStore } from '@/store/modules/app'
-import { useDesign } from '@/hooks/web/useDesign'
-import { ThemeSwitch } from '@/layout/components/ThemeSwitch'
-const { getPrefixCls, variables } = useDesign()
+import {computed, defineComponent} from 'vue'
+import {UserInfo} from '@/layout/components/UserInfo'
+import {useAppStore} from '@/store/modules/app'
+import {useDesign} from '@/hooks/web/useDesign'
+import router from "@/router";
+
+const {getPrefixCls, variables} = useDesign()
 
 const prefixCls = getPrefixCls('tool-header')
 
@@ -86,7 +80,11 @@ export default defineComponent({
           ) : undefined}
           <ThemeSwitch />
             */}
-
+          <div class="mr-20px">
+            <span class="cursor-pointer" onClick={()=>router.push('/')}>版本</span>
+            &nbsp;&nbsp;  |  &nbsp;&nbsp;
+            <span class="cursor-pointer" onClick={()=>router.push('/')}>帮助</span>
+          </div>
 
           <UserInfo></UserInfo>
         </div>

src/layout/components/useRenderLayout.tsx

@@ -8,6 +8,7 @@ import AppView from './AppView.vue'
 import ToolHeader from './ToolHeader.vue'
 import { ElScrollbar } from 'element-plus'
 import { useDesign } from '@/hooks/web/useDesign'
+import router from "@/router";
 
 const { getPrefixCls } = useDesign()
 
@@ -123,10 +124,10 @@ export const useRenderLayout = () => {
       <>
         <div class="relative headerBackImg flex items-center bg-[var(--top-header-bg-color)] layout-border__bottom dark:bg-[var(--el-bg-color)]">
           {/*{logo.value ? <Logo class="custom-hover"></Logo> : undefined}*/}
-           <div class="w-333px h-67px ml-20px title-logo">
+           <div onClick={()=>router.push('/')} class="cursor-pointer w-333px h-67px ml-20px title-logo">
                {/*<img  />*/}
            </div>
-          <ToolHeader class="flex-1"></ToolHeader>
+          <ToolHeader  class="flex-1"></ToolHeader>
         </div>
         <div class="absolute left-0 top-[var(--logo-height)] h-[calc(100%-var(--logo-height))] w-full flex">
           <Menu class="relative menuBackImg layout-border__right !h-full"></Menu>

src/views/DeliveryWarehouse/DeliveryWarehouseList/index.vue

@@ -1,6 +1,5 @@
 <script lang="ts" setup>
-import {onMounted, onUnmounted, ref, watch} from 'vue'
-import {AdministrativeDivisionApi} from '@/api/system/administrativeDivision'
+import {onMounted, onUnmounted, ref} from 'vue'
 import {DeliveryWarehouseListApi} from "@/api/DeliveryWarehouse/DeliveryWarehouseList";
 import CreateForm from "@/views/DeliveryWarehouse/compontents/CreateForm.vue";
 import AddFinancialInformationForm
@@ -12,6 +11,7 @@ import {ElMessageBox} from "element-plus";
 import {DICT_TYPE} from "@/utils/dict";
 import {useCache} from "@/hooks/web/useCache";
 import FilesForm from "@/views/DeliveryWarehouse/compontents/FilesForm.vue";
+import {handleTree4} from "@/utils/tree";
 
 defineOptions({name: 'DeliveryWarehouseList'})
 
@@ -120,6 +120,11 @@ const handleSelectionChange = (selection: any) => {
  */
 const resetQuery = () => {
   queryParams.value.pageNo = 1
+  queryParams.value.areaCode = ''
+  queryParams.value.shengCode = ''
+  queryParams.value.shiCode = ''
+  queryParams.value.xianCode = ''
+  queryParams.value.areaLevel = ''
   refQueryForm.value.resetFields()
   handleQuery()
 }
@@ -151,7 +156,8 @@ const handleBack = async () => {
   try {
     await ElMessageBox.confirm('确认要退回的所选的库区？', '提示', {
       confirmButtonText: '确 认',
-      cancelButtonText: '取 消'
+      cancelButtonText: '取 消',
+      type: 'warning'
     })
     await DeliveryWarehouseListApi.revertKqxx({kqIds: selectRows.value.map((item) => item.kqId)})
     await handleQuery()
@@ -185,7 +191,7 @@ const openCreateForm = (type: string) => {
 const refFilesForm = ref();
 //打开附件信息的表单
 const openFilesForm = (row: any) => {
-  if(!row.fileIds){
+  if (!row.fileIds) {
     Message.warning('该库区没有附件!')
     return
   }
@@ -198,63 +204,66 @@ const openFilesForm = (row: any) => {
  * @param areaCode - 区域代码
  * @returns Promise<DivisionItem[]> 行政区划列表
  */
-const getDivision = async (areaCode?: string): Promise<DivisionItem[]> => {
-  try {
-    return await AdministrativeDivisionApi.getList({areaCode})
-  } catch (err) {
-    throw err
-  }
-}
-// 监听省份变化
-stopWatches.push(
-  watch(() => queryParams.value.shengCode, async (newValue) => {
-    queryParams.value.shiCode = ''
-    queryParams.value.xianCode = ''
-    if (newValue) {
-      shiList.value = await getDivision(newValue)
-    } else {
-      shiList.value = []
-    }
-  })
-)
-// 监听市区变化
-stopWatches.push(
-  watch(() => queryParams.value.shiCode, async (newValue) => {
-    queryParams.value.xianCode = ''
-    if (newValue) {
-      xianList.value = await getDivision(newValue)
-    } else {
-      xianList.value = []
-    }
-  })
-)
+
 const {wsCache} = useCache()
-const showSheng = ref(true)
+const areaList = ref([]);
+let division = []
 // 生命周期钩子：组件挂载时获取省份数据
 onMounted(async () => {
-  shengList.value = await getDivision();
-  const loginForm = wsCache.get('user')
-  console.log(loginForm, 'loginForm')
-  // const all = await  AdministrativeDivisionApi.getAll()
-  // console.log(all,'aaaaa')
-  if (loginForm.roles.includes('provincial_trading_center')) {
-    if (loginForm.user.areaLevel == 1) {
-      queryParams.value.shengCode = loginForm.user.areaCode
-      showSheng.value = false
-    }
-
-  }
+  const divisionAll = wsCache.get('divisionAll').map((item) => {
+    item.label = item.areaName
+    item.value = item.areaCode
+    return item
+  })
+  division = divisionAll
+  areaList.value = handleTree4(divisionAll);
   await handleQuery();
+  stopWatches.push(
+    watch(() => queryParams.value.areaCode, async (newValue, oldValue) => {
+      if (newValue && newValue != '') {
+        const temp = division.filter(item => item.areaCode == newValue)
+        if (temp && temp.length == 1) {
+          if (temp[0].areaLevel == 1) {
+            queryParams.value.shengCode = temp[0].areaCode
+            queryParams.value.areaLevel = temp[0].areaLevel
+            queryParams.value.shiCode = null
+            queryParams.value.xianCode = null
+          } else if (temp[0].areaLevel == 2) {
+            queryParams.value.shengCode = division.filter(item=>item.areaCode == temp[0].parentCode)[0].areaCode
+            queryParams.value.areaLevel = temp[0].areaLevel
+            queryParams.value.shiCode = newValue
+            queryParams.value.xianCode = null
+          } else if (temp[0].areaLevel == 3) {
+            const shi = division.filter(item => item.areaCode == temp[0].parentCode)[0]
+            queryParams.value.shengCode = division.filter(item => item.areaCode == shi.parentCode)[0].areaCode
+            queryParams.value.shiCode = shi.areaCode
+            queryParams.value.xianCode = newValue
+            queryParams.value.areaLevel = temp[0].areaLevel
+          } else {
+            queryParams.value.areaCode = ''
+            queryParams.value.shengCode = ''
+            queryParams.value.shiCode = ''
+            queryParams.value.xianCode = ''
+            queryParams.value.areaLevel = ''
+          }
+        }
+        console.log(temp, 'aaa')
+      }
+      else {
+        queryParams.value.areaCode = ''
+        queryParams.value.shengCode = ''
+        queryParams.value.shiCode = ''
+        queryParams.value.xianCode = ''
+        queryParams.value.areaLevel = ''
+      }
+    })
+  )
 })
 // 组件卸载时清理
 onUnmounted(() => {
   // 停止所有监听
   stopWatches.forEach(stop => stop())
-
   // 清空数据
-  shengList.value = []
-  shiList.value = []
-  xianList.value = []
   list.value = []
 })
 </script>
@@ -268,43 +277,15 @@ onUnmounted(() => {
       class="-mb-15px"
       label-width="68px"
     >
-      <el-form-item v-if="showSheng" label="所属省份" prop="shengCode">
-        <el-select
-
-          v-model="queryParams.shengCode"
-          class="!w-240px"
-          clearable
-          placeholder="所属省份">
-          <el-option
-            v-for="item in shengList" :key="item.id" :label="item.areaName"
-            :value="item.areaCode"/>
-
-        </el-select>
-
-      </el-form-item>
-      <el-form-item label="所属市区" prop="shiCode">
-        <el-select
-          v-model="queryParams.shiCode"
+      <el-form-item label="行政区划" prop="areaCode">
+        <el-tree-select
+          v-model="queryParams.areaCode"
+          :check-strictly="true"
+          :data="areaList"
           class="!w-240px"
           clearable
-          placeholder="所属市区">
-          <el-option
-            v-for="item in shiList" :key="item.id" :label="item.areaName"
-            :value="item.areaCode"/>
-
-        </el-select>
-      </el-form-item>
-      <el-form-item label="所属县区" prop="xianCode">
-        <el-select
-          v-model="queryParams.xianCode"
-          class="!w-240px"
-          clearable
-          placeholder="所属县区">
-          <el-option
-            v-for="item in xianList" :key="item.id" :label="item.areaName"
-            :value="item.areaCode"/>
-
-        </el-select>
+          filterable
+          placeholder="行政区划"/>
       </el-form-item>
       <el-form-item label="企业名称" prop="dwmc">
         <el-input
@@ -456,7 +437,7 @@ onUnmounted(() => {
     />
     <DeliveryWarehouseSelectFrom ref="refForm" @success="handleQuery"/>
     <CreateForm ref="refCreateForm" @success="handleQuery"/>
-    <FilesForm ref="refFilesForm" />
+    <FilesForm ref="refFilesForm"/>
     <AddFinancialInformationForm ref="refAddFinancialInformationForm" @success="handleQuery"/>
   </ContentWrap>
 </template>

src/views/DeliveryWarehouse/DetermineDeliveryWarehouse/index.vue

@@ -7,6 +7,8 @@ import AddFinancialInformationForm
   from "@/views/DeliveryWarehouse/compontents/AddFinancialInformationForm.vue";
 import {DeliveryWarehouseListApi} from "@/api/DeliveryWarehouse/DeliveryWarehouseList";
 import download from "@/utils/download";
+import {handleTree4} from "@/utils/tree";
+import {useCache} from "@/hooks/web/useCache";
 
 // 接口定义
 interface QueryParams {
@@ -79,6 +81,11 @@ const handleQuery = async () => {
  */
 const resetQuery = () => {
   queryParams.value.pageNo = 1
+  queryParams.value.areaCode = ''
+  queryParams.value.shengCode = ''
+  queryParams.value.shiCode = ''
+  queryParams.value.xianCode = ''
+  queryParams.value.areaLevel = ''
   queryFormRef.value?.resetFields()
   handleQuery()
 }
@@ -124,16 +131,6 @@ const handleExport = async () => {
   } finally {
   }
 }
-/**
- * 获取行政区划数据
- */
-const getDivision = async (areaCode?: string) => {
-  try {
-    return await AdministrativeDivisionApi.getList({areaCode})
-  } catch (err) {
-    throw err
-  }
-}
 
 /**
  * 打开表单
@@ -146,31 +143,60 @@ const refAddFinancialInformationForm = ref()
 const openCwxxForm = (row: any) => {
   refAddFinancialInformationForm.value.open('create', row)
 }
-// 监听省份变化
-watch(() => queryParams.value.shengCode, async (newValue) => {
-  queryParams.value.shiCode = ''
-  queryParams.value.xianCode = ''
-  if (newValue) {
-    shiList.value = await getDivision(newValue)
-  } else {
-    shiList.value = []
-  }
-})
-
-// 监听市区变化
-watch(() => queryParams.value.shiCode, async (newValue) => {
-  queryParams.value.xianCode = ''
-  if (newValue) {
-    xianList.value = await getDivision(newValue)
-  } else {
-    xianList.value = []
-  }
-})
 
+const {wsCache} = useCache()
+const areaList = ref([]);
+let division = []
 // 初始化加载
 onMounted(async () => {
-  shengList.value = await getDivision()
-  await handleQuery()
+  const divisionAll = wsCache.get('divisionAll').map((item) => {
+    item.label = item.areaName
+    item.value = item.areaCode
+    return item
+  })
+  division = divisionAll
+  areaList.value = handleTree4(divisionAll);
+  await handleQuery();
+  stopWatches.push(
+    watch(() => queryParams.value.areaCode, async (newValue, oldValue) => {
+      if (newValue && newValue != '') {
+        const temp = division.filter(item => item.areaCode == newValue)
+        if (temp && temp.length == 1) {
+          if (temp[0].areaLevel == 1) {
+            queryParams.value.shengCode = temp[0].areaCode
+            queryParams.value.areaLevel = temp[0].areaLevel
+            queryParams.value.shiCode = null
+            queryParams.value.xianCode = null
+          } else if (temp[0].areaLevel == 2) {
+            queryParams.value.shengCode = division.filter(item=>item.areaCode == temp[0].parentCode)[0].areaCode
+            queryParams.value.areaLevel = temp[0].areaLevel
+            queryParams.value.shiCode = newValue
+            queryParams.value.xianCode = null
+          } else if (temp[0].areaLevel == 3) {
+            const shi = division.filter(item => item.areaCode == temp[0].parentCode)[0]
+            queryParams.value.shengCode = division.filter(item => item.areaCode == shi.parentCode)[0].areaCode
+            queryParams.value.shiCode = shi.areaCode
+            queryParams.value.xianCode = newValue
+            queryParams.value.areaLevel = temp[0].areaLevel
+          } else {
+            queryParams.value.areaCode = ''
+            queryParams.value.shengCode = ''
+            queryParams.value.shiCode = ''
+            queryParams.value.xianCode = ''
+            queryParams.value.areaLevel = ''
+          }
+        }
+        console.log(temp, 'aaa')
+      }
+      else {
+        queryParams.value.areaCode = ''
+        queryParams.value.shengCode = ''
+        queryParams.value.shiCode = ''
+        queryParams.value.xianCode = ''
+        queryParams.value.areaLevel = ''
+      }
+    })
+  )
 })
 </script>
 
@@ -183,42 +209,15 @@ onMounted(async () => {
       class="-mb-15px"
       label-width="68px"
     >
-      <el-form-item label="所属省份" prop="shengCode">
-        <el-select
-          v-model="queryParams.shengCode"
-          class="!w-240px"
-          clearable
-          placeholder="所属省份">
-          <el-option
-            v-for="item in shengList" :key="item.id" :label="item.areaName"
-            :value="item.areaCode"/>
-
-        </el-select>
-
-      </el-form-item>
-      <el-form-item label="所属市区" prop="shiCode">
-        <el-select
-          v-model="queryParams.shiCode"
+      <el-form-item label="行政区划" prop="areaCode">
+        <el-tree-select
+          v-model="queryParams.areaCode"
+          :check-strictly="true"
+          :data="areaList"
           class="!w-240px"
           clearable
-          placeholder="所属市区">
-          <el-option
-            v-for="item in shiList" :key="item.id" :label="item.areaName"
-            :value="item.areaCode"/>
-
-        </el-select>
-      </el-form-item>
-      <el-form-item label="所属县区" prop="xianCode">
-        <el-select
-          v-model="queryParams.xianCode"
-          class="!w-240px"
-          clearable
-          placeholder="所属县区">
-          <el-option
-            v-for="item in xianList" :key="item.id" :label="item.areaName"
-            :value="item.areaCode"/>
-
-        </el-select>
+          filterable
+          placeholder="行政区划"/>
       </el-form-item>
       <el-form-item label="企业名称" prop="dwmc">
         <el-input

src/views/DeliveryWarehouse/ProvinceSelectedPage/index.vue

@@ -12,6 +12,8 @@ import {ElMessageBox} from "element-plus";
 import {ProvinceSelectedPageApi} from "@/api/DeliveryWarehouse/ProvinceSelectedPage";
 import {DICT_TYPE} from "@/utils/dict";
 import FilesForm from "@/views/DeliveryWarehouse/compontents/FilesForm.vue";
+import {handleTree4} from "@/utils/tree";
+import {useCache} from "@/hooks/web/useCache";
 
 defineOptions({name: 'ProvinceSelectedPage'})
 
@@ -158,6 +160,11 @@ const handleExport = async () => {
  */
 const resetQuery = () => {
   queryParams.value.pageNo = 1
+  queryParams.value.areaCode = ''
+  queryParams.value.shengCode = ''
+  queryParams.value.shiCode = ''
+  queryParams.value.xianCode = ''
+  queryParams.value.areaLevel = ''
   refQueryForm.value.resetFields()
   handleQuery()
 }
@@ -187,7 +194,7 @@ const openForm = async (row: any, type: number) => {
 const refFilesForm = ref();
 //打开附件信息的表单
 const openFilesForm = (row: any) => {
-  if(!row.fileIds){
+  if (!row.fileIds) {
     Message.warning('该库区没有附件!')
     return
   }
@@ -206,54 +213,71 @@ const openCreateForm = (type: string) => {
  * @param areaCode - 区域代码
  * @returns Promise<DivisionItem[]> 行政区划列表
  */
-const getDivision = async (areaCode?: string): Promise<DivisionItem[]> => {
-  try {
-    return await AdministrativeDivisionApi.getList({areaCode})
-  } catch (err) {
-    throw err
-  }
-}
 
-// 监听省份变化
-stopWatches.push(
-  watch(() => queryParams.value.shengCode, async (newValue) => {
-    queryParams.value.shiCode = ''
-    queryParams.value.xianCode = ''
-    if (newValue) {
-      shiList.value = await getDivision(newValue)
-    } else {
-      shiList.value = []
-    }
-  })
-)
-
-// 监听市区变化
-stopWatches.push(
-  watch(() => queryParams.value.shiCode, async (newValue) => {
-    queryParams.value.xianCode = ''
-    if (newValue) {
-      xianList.value = await getDivision(newValue)
-    } else {
-      xianList.value = []
-    }
-  })
-)
 
+const {wsCache} = useCache()
+const areaList = ref([]);
+let division = []
 // 生命周期钩子：组件挂载时获取省份数据
 onMounted(async () => {
-  shengList.value = await getDivision();
+  const divisionAll = wsCache.get('divisionAll').map((item) => {
+    item.label = item.areaName
+    item.value = item.areaCode
+    return item
+  })
+  division = divisionAll
+  areaList.value = handleTree4(divisionAll);
   await handleQuery();
+
+  stopWatches.push(
+    watch(() => queryParams.value.areaCode, async (newValue, oldValue) => {
+      if (newValue && newValue != '') {
+        const temp = division.filter(item => item.areaCode == newValue)
+        if (temp && temp.length == 1) {
+          if (temp[0].areaLevel == 1) {
+            queryParams.value.shengCode = temp[0].areaCode
+            queryParams.value.areaLevel = temp[0].areaLevel
+            queryParams.value.shiCode = null
+            queryParams.value.xianCode = null
+          } else if (temp[0].areaLevel == 2) {
+            queryParams.value.shengCode = division.filter(item=>item.areaCode == temp[0].parentCode)[0].areaCode
+            queryParams.value.areaLevel = temp[0].areaLevel
+            queryParams.value.shiCode = newValue
+            queryParams.value.xianCode = null
+          } else if (temp[0].areaLevel == 3) {
+            const shi = division.filter(item => item.areaCode == temp[0].parentCode)[0]
+            queryParams.value.shengCode = division.filter(item => item.areaCode == shi.parentCode)[0].areaCode
+            queryParams.value.shiCode = shi.areaCode
+            queryParams.value.xianCode = newValue
+            queryParams.value.areaLevel = temp[0].areaLevel
+          } else {
+            queryParams.value.areaCode = ''
+            queryParams.value.shengCode = ''
+            queryParams.value.shiCode = ''
+            queryParams.value.xianCode = ''
+            queryParams.value.areaLevel = ''
+          }
+        }
+        console.log(temp, 'aaa')
+      }
+      else {
+        queryParams.value.areaCode = ''
+        queryParams.value.shengCode = ''
+        queryParams.value.shiCode = ''
+        queryParams.value.xianCode = ''
+        queryParams.value.areaLevel = ''
+      }
+    })
+  )
+
+
 })
 
 // 组件卸载时清理
 onUnmounted(() => {
   // 停止所有监听
   stopWatches.forEach(stop => stop())
-
   // 清空数据
-  shengList.value = []
-  shiList.value = []
-  xianList.value = []
   list.value = []
 })
 </script>
@@ -267,42 +291,15 @@ onUnmounted(() => {
       class="-mb-15px"
       label-width="68px"
     >
-      <el-form-item label="所属省份" prop="shengCode">
-        <el-select
-          v-model="queryParams.shengCode"
+      <el-form-item label="行政区划" prop="areaCode">
+        <el-tree-select
+          v-model="queryParams.areaCode"
+          :check-strictly="true"
+          :data="areaList"
           class="!w-240px"
           clearable
-          placeholder="所属省份">
-          <el-option
-            v-for="item in shengList" :key="item.id" :label="item.areaName"
-            :value="item.areaCode"/>
-
-        </el-select>
-
-      </el-form-item>
-      <el-form-item label="所属市区" prop="shiuCode">
-        <el-select
-          v-model="queryParams.shiCode"
-          class="!w-240px"
-          clearable
-          placeholder="所属市区">
-          <el-option
-            v-for="item in shiList" :key="item.id" :label="item.areaName"
-            :value="item.areaCode"/>
-
-        </el-select>
-      </el-form-item>
-      <el-form-item label="所属县区" prop="xianCode">
-        <el-select
-          v-model="queryParams.xianCode"
-          class="!w-240px"
-          clearable
-          placeholder="所属县区">
-          <el-option
-            v-for="item in xianList" :key="item.id" :label="item.areaName"
-            :value="item.areaCode"/>
-
-        </el-select>
+          filterable
+          placeholder="行政区划"/>
       </el-form-item>
       <el-form-item label="企业名称" prop="dwmc">
         <el-input
@@ -320,11 +317,11 @@ onUnmounted(() => {
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary"  @click="handleQuery">
+        <el-button type="primary" @click="handleQuery">
           <Icon class="mr-5px" icon="ep:search"/>
           查询
         </el-button>
-        <el-button type="primary" plain @click="resetQuery">
+        <el-button plain type="primary" @click="resetQuery">
           <Icon class="mr-5px" icon="ep:refresh"/>
           重置
         </el-button>
@@ -350,11 +347,11 @@ onUnmounted(() => {
       v-loading="loading"
       :border="true"
       :data="list"
-      tooltip-effect="dark"
-      show-overflow-tooltip
       :header-cell-style="{
             background: 'var(--table-header-bg-color) ', color: 'var(--table-header-text-color)', height: 'var(--table-header-height)'
            }"
+      show-overflow-tooltip
+      tooltip-effect="dark"
       @selection-change="handleSelectionChange"
     >
       <el-table-column align="center" fixed="left" min-width="40" type="selection"/>
@@ -366,12 +363,16 @@ onUnmounted(() => {
       <el-table-column align="center" label="库区名称" min-width="180" prop="kqmc"/>
       <el-table-column align="center" label="总资产(万元)" min-width="120" prop="syndzzc">
         <template #default="scope">
-          <div class="w-full color-[var(--el-color-primary)] cursor-pointer" @click="openForm(scope.row,1)"> {{ scope.row.syndzzc }}</div>
+          <div class="w-full color-[var(--el-color-primary)] cursor-pointer"
+               @click="openForm(scope.row,1)"> {{ scope.row.syndzzc }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column align="center" label="上一年度净利润(万元)" min-width="180" prop="jlr">
         <template #default="scope">
-          <div class="w-full color-[var(--el-color-primary)] cursor-pointer" @click="openForm(scope.row,1)"> {{ scope.row.jlr }}</div>
+          <div class="w-full color-[var(--el-color-primary)] cursor-pointer"
+               @click="openForm(scope.row,1)"> {{ scope.row.jlr }}
+          </div>
         </template>
       </el-table-column>
       <!--      <el-table-column align="center" label="备选交收仓(个)" min-width="280" prop="yxcfnum">-->
@@ -383,9 +384,9 @@ onUnmounted(() => {
       <el-table-column align="center" label="联系电话" min-width="120" prop="lxdh"/>
       <el-table-column align="center" label="核验人员" min-width="120" prop="hyryName"/>
       <el-table-column align="center" label="查看状态" min-width="120" prop="hyState">
-      <template #default="scope">
-        <dict-tag :type="DICT_TYPE.HY_STATE" :value="scope.row.hyState"/>
-      </template>
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.HY_STATE" :value="scope.row.hyState"/>
+        </template>
       </el-table-column>
       <el-table-column align="center" label="附件信息" min-width="120" prop="fileNumber">
         <template #default="scope">
@@ -404,7 +405,7 @@ onUnmounted(() => {
     />
     <DeliveryWarehouseSelectFrom ref="refForm" @success="handleQuery"/>
     <CreateForm ref="refCreateForm" @success="handleQuery"/>
-    <FilesForm ref="refFilesForm" />
+    <FilesForm ref="refFilesForm"/>
     <AddFinancialInformationForm ref="refAddFinancialInformationForm" @success="handleQuery"/>
   </ContentWrap>
 </template>

src/views/DeliveryWarehouse/SelectDeliveryWarehouse/index.vue

@@ -1,11 +1,12 @@
 <script lang="ts" setup>
 import {onMounted, ref, watch} from 'vue'
-import {AdministrativeDivisionApi} from '@/api/system/administrativeDivision'
 import {SelectDeliveryWarehouseApi} from "@/api/DeliveryWarehouse/SelectDeliveryWarehouse";
 import DeliveryWarehouseSelectFrom from '@/views/DeliveryWarehouse/compontents/Form.vue'
 import AddFinancialInformationForm
   from "@/views/DeliveryWarehouse/compontents/AddFinancialInformationForm.vue";
 import download from "@/utils/download";
+import {useCache} from "@/hooks/web/useCache";
+import {handleTree4} from "@/utils/tree";
 
 // 接口定义
 interface QueryParams {
@@ -78,6 +79,11 @@ const handleQuery = async () => {
  */
 const resetQuery = () => {
   queryParams.value.pageNo = 1
+  queryParams.value.areaCode = ''
+  queryParams.value.shengCode = ''
+  queryParams.value.shiCode = ''
+  queryParams.value.xianCode = ''
+  queryParams.value.areaLevel = ''
   queryFormRef.value?.resetFields()
   handleQuery()
 }
@@ -94,16 +100,6 @@ const handleExport = async () => {
   } finally {
   }
 }
-/**
- * 获取行政区划数据
- */
-const getDivision = async (areaCode?: string) => {
-  try {
-    return await AdministrativeDivisionApi.getList({areaCode})
-  } catch (err) {
-    throw err
-  }
-}
 
 /**
  * 打开表单
@@ -117,31 +113,59 @@ const refAddFinancialInformationForm = ref()
 const openCwxxForm = (row: any) => {
   refAddFinancialInformationForm.value.open('create', row)
 }
-// 监听省份变化
-watch(() => queryParams.value.shengCode, async (newValue) => {
-  queryParams.value.shiCode = ''
-  queryParams.value.xianCode = ''
-  if (newValue) {
-    shiList.value = await getDivision(newValue)
-  } else {
-    shiList.value = []
-  }
-})
 
-// 监听市区变化
-watch(() => queryParams.value.shiCode, async (newValue) => {
-  queryParams.value.xianCode = ''
-  if (newValue) {
-    xianList.value = await getDivision(newValue)
-  } else {
-    xianList.value = []
-  }
-})
-
-// 初始化加载
+const {wsCache} = useCache()
+const areaList = ref([]);
+let division = []
+// 生命周期钩子：组件挂载时获取省份数据
 onMounted(async () => {
-  shengList.value = await getDivision()
-  await handleQuery()
+  const divisionAll = wsCache.get('divisionAll').map((item) => {
+    item.label = item.areaName
+    item.value = item.areaCode
+    return item
+  })
+  division = divisionAll
+  areaList.value = handleTree4(divisionAll);
+  await handleQuery();
+  stopWatches.push(
+    watch(() => queryParams.value.areaCode, async (newValue, oldValue) => {
+      if (newValue && newValue != '') {
+        const temp = division.filter(item => item.areaCode == newValue)
+        if (temp && temp.length == 1) {
+          if (temp[0].areaLevel == 1) {
+            queryParams.value.shengCode = temp[0].areaCode
+            queryParams.value.areaLevel = temp[0].areaLevel
+            queryParams.value.shiCode = null
+            queryParams.value.xianCode = null
+          } else if (temp[0].areaLevel == 2) {
+            queryParams.value.shengCode = division.filter(item => item.areaCode == temp[0].parentCode)[0].areaCode
+            queryParams.value.areaLevel = temp[0].areaLevel
+            queryParams.value.shiCode = newValue
+            queryParams.value.xianCode = null
+          } else if (temp[0].areaLevel == 3) {
+            const shi = division.filter(item => item.areaCode == temp[0].parentCode)[0]
+            queryParams.value.shengCode = division.filter(item => item.areaCode == shi.parentCode)[0].areaCode
+            queryParams.value.shiCode = shi.areaCode
+            queryParams.value.xianCode = newValue
+            queryParams.value.areaLevel = temp[0].areaLevel
+          } else {
+            queryParams.value.areaCode = ''
+            queryParams.value.shengCode = ''
+            queryParams.value.shiCode = ''
+            queryParams.value.xianCode = ''
+            queryParams.value.areaLevel = ''
+          }
+        }
+        console.log(temp, 'aaa')
+      } else {
+        queryParams.value.areaCode = ''
+        queryParams.value.shengCode = ''
+        queryParams.value.shiCode = ''
+        queryParams.value.xianCode = ''
+        queryParams.value.areaLevel = ''
+      }
+    })
+  )
 })
 </script>
 
@@ -154,42 +178,15 @@ onMounted(async () => {
       class="-mb-15px"
       label-width="68px"
     >
-      <el-form-item label="所属省份" prop="shengCode">
-        <el-select
-          v-model="queryParams.shengCode"
-          class="!w-240px"
-          clearable
-          placeholder="所属省份">
-          <el-option
-            v-for="item in shengList" :key="item.id" :label="item.areaName"
-            :value="item.areaCode"/>
-
-        </el-select>
-
-      </el-form-item>
-      <el-form-item label="所属市区" prop="shiCode">
-        <el-select
-          v-model="queryParams.shiCode"
+      <el-form-item label="行政区划" prop="areaCode">
+        <el-tree-select
+          v-model="queryParams.areaCode"
+          :check-strictly="true"
+          :data="areaList"
           class="!w-240px"
           clearable
-          placeholder="所属市区">
-          <el-option
-            v-for="item in shiList" :key="item.id" :label="item.areaName"
-            :value="item.areaCode"/>
-
-        </el-select>
-      </el-form-item>
-      <el-form-item label="所属县区" prop="xianCode">
-        <el-select
-          v-model="queryParams.xianCode"
-          class="!w-240px"
-          clearable
-          placeholder="所属县区">
-          <el-option
-            v-for="item in xianList" :key="item.id" :label="item.areaName"
-            :value="item.areaCode"/>
-
-        </el-select>
+          filterable
+          placeholder="行政区划"/>
       </el-form-item>
       <el-form-item label="企业名称" prop="dwmc">
         <el-input
@@ -216,10 +213,10 @@ onMounted(async () => {
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="handleQuery">
-          <Icon  class="mr-5px" icon="ep:search"/>
+          <Icon class="mr-5px" icon="ep:search"/>
           查询
         </el-button>
-        <el-button type="primary" plain @click="resetQuery">
+        <el-button plain type="primary" @click="resetQuery">
           <Icon class="mr-5px" icon="ep:refresh"/>
           重置
         </el-button>
@@ -239,11 +236,11 @@ onMounted(async () => {
       v-loading="loading"
       :border="true"
       :data="list"
-      tooltip-effect="dark"
-      show-overflow-tooltip
       :header-cell-style="{
             background: 'var(--table-header-bg-color) ', color: 'var(--table-header-text-color)', height: 'var(--table-header-height)'
            }"
+      show-overflow-tooltip
+      tooltip-effect="dark"
     >
       <el-table-column align="center" fixed="left" min-width="40" type="selection"/>
       <el-table-column align="center" fixed="left" label="序号" min-width="60" type="index"/>
@@ -256,14 +253,18 @@ onMounted(async () => {
         v-hasPermi="['column:SelectDeliveryWarehouse:zzc']" align="center"
         label="总资产（万元）" min-width="150" prop="zzc">
         <template #default="scope">
-          <div class="w-full color-[var(--el-color-primary)] cursor-pointer" @click="openCwxxForm(scope.row)">{{ scope.row.zzc }}</div>
+          <div class="w-full color-[var(--el-color-primary)] cursor-pointer"
+               @click="openCwxxForm(scope.row)">{{ scope.row.zzc }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column
         v-hasPermi="['column:SelectDeliveryWarehouse:sndjlr']" align="center"
         label="上一年度净利润（万元）" min-width="180" prop="sndjlr">
         <template #default="scope">
-          <div class="w-full color-[var(--el-color-primary)] cursor-pointer" @click="openCwxxForm(scope.row)">{{ scope.row.sndjlr }}</div>
+          <div class="w-full color-[var(--el-color-primary)] cursor-pointer"
+               @click="openCwxxForm(scope.row)">{{ scope.row.sndjlr }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column align="center" label="库区联系人" min-width="280" prop="kqfzr"/>
@@ -272,14 +273,18 @@ onMounted(async () => {
         v-hasPermi="['column:SelectDeliveryWarehouse:yhrdnum']" align="center"
         label="银行认定仓房数量(个)" min-width="180" prop="yhrdnum">
         <template #default="scope">
-          <div class="w-full color-[var(--el-color-primary)] cursor-pointer" @click="openForm('look', {...scope.row,yxcf:3})">{{ scope.row.yhrdnum }}</div>
+          <div class="w-full color-[var(--el-color-primary)] cursor-pointer"
+               @click="openForm('look', {...scope.row,yxcf:3})">{{ scope.row.yhrdnum }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column
         v-hasPermi="['column:SelectDeliveryWarehouse:yxcfnum']" align="center"
         label="选定仓房数量(个)" min-width="180" prop="xdnum">
         <template #default="scope">
-          <div class="w-full color-[var(--el-color-primary)] cursor-pointer" @click="openForm('look', {...scope.row,yxcf:4})">{{ scope.row.xdnum }}</div>
+          <div class="w-full color-[var(--el-color-primary)] cursor-pointer"
+               @click="openForm('look', {...scope.row,yxcf:4})">{{ scope.row.xdnum }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column align="center" label="认定银行" min-width="100" prop="rdyhName"/>