修改查询

.env

@@ -2,10 +2,10 @@
 VITE_PORT = 8001
 
 # spa-title
-VITE_GLOB_APP_TITLE = NaiveAdminElement
+VITE_GLOB_APP_TITLE = 云恒WMS
 
 # spa shortname
-VITE_GLOB_APP_SHORT_NAME = NaiveAdminElement
+VITE_GLOB_APP_SHORT_NAME = 云恒WMS
 
 # 生产环境 开启mock
-VITE_GLOB_PROD_MOCK = true
+VITE_GLOB_PROD_MOCK = false

.env.test

@@ -1,5 +1,5 @@
 # 是否开启mock
-VITE_USE_MOCK = true
+VITE_USE_MOCK = false
 
 # 网站根目录
 VITE_PUBLIC_PATH = /

src/api/logger/emailLog.ts

@@ -1,7 +1,7 @@
 import { http } from '@/utils/http/axios';
 
 /**
- * @description: 登录日志列表
+ * @description: 邮件日志列表
  */
 export function getEmailLogList(params?) {
   return http.request({
@@ -20,7 +20,7 @@ export function getEmailLogDetail(id) {
   });
 }
 /**
- * @description: 删除登录日志
+ * @description: 删除邮件日志
  */
 export function emailLogDelete(id) {
   return http.request({
@@ -29,7 +29,7 @@ export function emailLogDelete(id) {
   });
 }
 /**
- * @description: 批量删除登录日志
+ * @description: 批量删除邮件日志
  */
 export function emailLogBatchDelete(data:any) {
   return http.request({

src/api/logger/fileLog.ts

@@ -1,11 +1,11 @@
 import { http } from '@/utils/http/axios';
 
 /**
- * @description: 登录日志列表
+ * @description: 文件日志列表
  */
 export function getFileLogList(params?) {
   return http.request({
-    url: '/file/log/page',
+    url: '/file/page',
     method: 'GET',
     params,
   });
@@ -15,25 +15,25 @@ export function getFileLogList(params?) {
  */
 export function getFileLogDetail(id) {
   return http.request({
-    url: '/file/log/detail/'+id,
+    url: '/file/detail/'+id,
     method: 'get',
   });
 }
 /**
- * @description: 删除登录日志
+ * @description: 删除文件日志
  */
 export function fileLogDelete(id) {
   return http.request({
-    url: '/file/log/delete/'+id,
+    url: '/file/delete/'+id,
     method: 'DELETE',
   });
 }
 /**
- * @description: 批量删除登录日志
+ * @description: 批量删除文件日志
  */
 export function fileLogBatchDelete(data:any) {
   return http.request({
-    url: '/file/log/batchDelete',
+    url: '/file/batchDelete',
     method: 'DELETE',
     data
   });

src/views/content/adSort/index.vue

@@ -115,10 +115,9 @@ const selectionData = ref([])
     schemas
   });
   function handleSubmit(values: Recordable) {
-    for (const key in formParams) {
-      if (values[key] != null && values[key] != undefined) {
-        formParams[key] = values[key];
-      }
+    handleReset()
+    for (const key in values) {
+      formParams[key] = values[key]
     }
     reloadTable();
   }

src/views/content/adSort/querySchemas.ts

@@ -14,6 +14,7 @@ export const schemas: FormSchema[] = [
     label: '类型',
     componentProps: {
       placeholder: '请选择广告位类型',
+      clearable: true,
       options: [
         {
           label: '网站',

src/views/content/article/index.vue

@@ -117,10 +117,9 @@ const selectionData = ref([])
     schemas
   });
   function handleSubmit(values: Recordable) {
-    for (const key in formParams) {
-      if (values[key] != null && values[key] != undefined) {
-        formParams[key] = values[key];
-      }
+    handleReset()
+    for (const key in values) {
+      formParams[key] = values[key]
     }
     reloadTable();
   }

src/views/content/article/querySchemas.ts

@@ -14,6 +14,7 @@ export const schemas: FormSchema[] = [
     label: '文章状态',
     componentProps: {
       placeholder: '请选择文章状态',
+      clearable: true,
       options: [
         {
           label: '下架',

src/views/content/layout/index.vue

@@ -113,10 +113,9 @@ const selectionData = ref([])
     schemas
   });
   function handleSubmit(values: Recordable) {
-    for (const key in formParams) {
-      if (values[key] != null && values[key] != undefined) {
-        formParams[key] = values[key];
-      }
+    handleReset()
+    for (const key in values) {
+      formParams[key] = values[key]
     }
     reloadTable();
   }

src/views/content/layoutItem/index.vue

@@ -115,10 +115,9 @@ const selectionData = ref([])
     schemas
   });
   function handleSubmit(values: Recordable) {
-    for (const key in formParams) {
-      if (values[key] != null && values[key] != undefined) {
-        formParams[key] = values[key];
-      }
+    handleReset()
+    for (const key in values) {
+      formParams[key] = values[key]
     }
     reloadTable();
   }

src/views/content/layoutItem/querySchemas.ts

@@ -18,6 +18,7 @@ export const schemas: FormSchema[] = [
     label: '页面布局',
     componentProps: {
       placeholder: '请选择页面布局',
+      clearable: true,
       block:true,
       request: loadSelectData,
       onChange: (e: any) => {
@@ -31,6 +32,7 @@ export const schemas: FormSchema[] = [
     label: '页面类型',
     componentProps: {
       placeholder: '请选择页面类型',
+      clearable: true,
       options: [
         {
           label: 'CMS文章',

src/views/content/link/index.vue

@@ -113,10 +113,9 @@ const selectionData = ref([])
     schemas
   });
   function handleSubmit(values: Recordable) {
-    for (const key in formParams) {
-      if (values[key] != null && values[key] != undefined) {
-        formParams[key] = values[key];
-      }
+    handleReset()
+    for (const key in values) {
+      formParams[key] = values[key]
     }
     reloadTable();
   }

src/views/content/tag/index.vue

@@ -113,10 +113,9 @@ const selectionData = ref([])
     schemas
   });
   function handleSubmit(values: Recordable) {
-    for (const key in formParams) {
-      if (values[key] != null && values[key] != undefined) {
-        formParams[key] = values[key];
-      }
+    handleReset()
+    for (const key in values) {
+      formParams[key] = values[key]
     }
     reloadTable();
   }

src/views/data/city/edit.vue

@@ -1,66 +1,55 @@
 <template>
-  <el-dialog
-      v-model="props.visible"
-      :title="props.deptId?'编辑':'新增'"
-      width="600"
-      :close-on-click-modal="false"
-      :before-close="dialogClose"
-  >
-    <el-form
-        ref="formRef"
-        :model="formData"
-        label-width="80px"
-    >
-      <el-form-item label="部门类型" prop="type">
-          <el-select v-model="formData.type" class="flex-1" clearable placeholder="请选择部门类型">
-            <el-option v-for="(item, index) in optionData.deptTypeList" :key="index" :label="item.name" :value="item.id" />
-          </el-select>
+  <el-dialog v-model="props.visible" v-if="props.visible" :title="props.cityId ? '编辑' : '新增'" width="600" :close-on-click-modal="false"
+    :before-close="dialogClose">
+    <el-form ref="formRef" :model="formData" label-width="80px">
+      <div class="flex">
+        <el-form-item label="上级城市" prop="pid" class="flex-1" :rules="{ required: true, message: '请选择上级城市', trigger: 'change' }">
+        <el-tree-select v-model="formData.pid" :data="cityOptions" lazy :load="loadTree" :cacheData="caCheData"
+          node-key="id" @node-click="handleNodeClick" :props="treeProps" :check-strictly="true"
+          placeholder="上级城市" />
       </el-form-item>
-      <el-form-item
-          label="父级部门"
-          prop="parentId"
-          :rules="{ required: true, message: '请选择父级部门', trigger: 'change' }"
-      >
-        <el-tree-select
-            class="flex-1"
-            v-model="formData.parentId"
-            :data="deptOptions"
-            clearable
-            node-key="id"
-            :props="{
-              label: 'name',
-            }"
-            :default-expand-all="true"
-            placeholder="请选择父级菜单"
-            check-strictly
-        />
-      </el-form-item>
-      <el-form-item
-          label="部门名称"
-          prop="name"
-          :rules="{ required: true, message: '请输入部门名称', trigger: 'blur' }"
-      >
-        <el-input
-            v-model="formData.name"
-            placeholder="请输入部门名称"
-            clearable
-        />
-      </el-form-item>
-      <el-form-item label="部门排序" prop="sort"  class="flex-1">
-        <div>
-          <el-input-number v-model="formData.sort" :max="9999"/>
-          <div class="form-tips">数值越小越排前</div>
-        </div>
-      </el-form-item>
-      <el-form-item label="部门备注" prop="note">
-          <el-input
-            class="flex-1"
-            v-model="formData.note"
-            type="textarea"
-            placeholder="请输入部门名称"
-            clearable
-        />
+        <el-form-item label="城市级别" prop="level" class="flex-1">
+        <el-select v-model="formData.level" clearable placeholder="请选择城市级别">
+          <el-option v-for="(item, index) in optionData.cityTypeList" :key="index" :label="item.name"
+            :value="item.id" />
+        </el-select>
       </el-form-item>
+      </div>
+      <div class="flex">
+        <el-form-item label="城市名称" prop="name" class="flex-1"
+          :rules="{ required: true, message: '请输入城市名称', trigger: 'blur' }">
+          <el-input v-model="formData.name" placeholder="请输入城市名称" clearable />
+        </el-form-item>
+        <el-form-item label="城市简称" prop="shortName" class="flex-1"
+          :rules="{ required: true, message: '城市简称称', trigger: 'blur' }">
+          <el-input v-model="formData.shortName" placeholder="请输入城市简称称" clearable />
+        </el-form-item>
+      </div>
+      <div class="flex">
+        <el-form-item label="城市区号" prop="cityCode" class="flex-1"
+          :rules="{ required: true, message: '城市区号', trigger: 'blur' }">
+          <el-input v-model="formData.cityCode" placeholder="请输入城市区号" clearable />
+        </el-form-item>
+        <el-form-item label="行政编码" prop="areaCode" class="flex-1"
+          :rules="{ required: true, message: '行政编码', trigger: 'blur' }">
+          <el-input v-model="formData.areaCode" placeholder="请输入行政编码" clearable />
+        </el-form-item>
+      </div>
+      <div class="flex">
+        <el-form-item label="城市经度" prop="lng" class="flex-1"
+          :rules="{ required: true, message: '城市经度', trigger: 'blur' }">
+          <el-input v-model="formData.lng" placeholder="请输入城市经度" clearable />
+        </el-form-item>
+        <el-form-item label="城市纬度" prop="lat" class="flex-1"
+          :rules="{ required: true, message: '城市纬度', trigger: 'blur' }">
+          <el-input v-model="formData.lat" placeholder="请输入城市纬度" clearable />
+        </el-form-item>
+      </div>
+      <div class="flex">
+        <el-form-item label="邮政编码" prop="zipCode" class="flex-1">
+          <el-input v-model="formData.zipCode" placeholder="请输入邮政编码" clearable />
+        </el-form-item>
+      </div>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
@@ -73,95 +62,105 @@
   </el-dialog>
 </template>
 <script lang="ts" setup>
-import type {FormInstance} from "element-plus";
-import { deptAdd,deptUpdate,getDeptList,getDeptDetail } from '@/api/system/dept';
-import {onMounted, reactive, ref, shallowRef} from "vue";
-import {getModulesKey} from "@/router";
-import {message,buildTree} from "@/utils/auth";
-import {useLockFn} from "@/utils/useLockFn";
+import type { FormInstance } from "element-plus";
+import { cityAdd, cityUpdate, getCityList, getCityDetail } from '@/api/data/city';
+import { onMounted, reactive, ref, shallowRef,nextTick } from "vue";
+import { getCityByList } from "@/api/system/user";
+import { getModulesKey } from "@/router";
+import { message } from "@/utils/auth";
+import { useLockFn } from "@/utils/useLockFn";
 const props = defineProps({
   visible: {
     type: Boolean,
     required: true,
     default: false
   },
-  deptId: {
+  cityId: {
     type: Number,
     required: true,
     default: 0
   },
-  pid: {
-    type: Number,
-    default: 0
+  parentData: {
+    type: Object,
+    default: () => {},
   }
 });
 const optionData = reactive({
-  deptTypeList: [{
-    id:1,
-    name:'公司'
+  cityTypeList: [{
+    id: 0,
+    name: '省份'
   },
   {
-    id:2,
-    name:'子公司'
+    id: 1,
+    name: '城市'
   },
   {
-    id:3,
-    name:'部门'
+    id: 2,
+    name: '县区'
   },
   {
-    id:4,
-    name:'小组'
+    id: 3,
+    name: '街道'
   }],
 });
-const emit = defineEmits(["success","update:visible"]);
+const emit = defineEmits(["success", "update:visible"]);
 const formRef = shallowRef<FormInstance>();
 
-const componentsOptions = ref(getModulesKey());
-const querySearch = (queryString: string, cb: any) => {
-  const results = queryString
-      ? componentsOptions.value.filter((item) =>
-          item.toLowerCase().includes(queryString.toLowerCase())
-      )
-      : componentsOptions.value;
-  cb(results.map((item) => ({value: item})));
-};
 
 const formData = reactive({
   id: "",
-  //父级id
-  parentId: 0,
-  //类型
-  type: 1,
-  //名称
+  pid: '',
+  level: '',
   name: "",
-  //排序
-  sort: 0,
-  note:''
+  cityCode: '',
+  areaCode: '',
+  parentCode: '',
+  zipCode: '',
+  shortName: '',
+  lng: '',
+  lat: ''
 });
-
+const caCheData = ref([])
 const dialogClose = () => {
   emit("update:visible", false);
 };
-
-const deptOptions = ref<any[]>([]);
-
-const getMenu = async () => {
-  const data: any = await getDeptList();
-  const menu: any = [{id: 0, name: "顶级", children: []}];
-  const lists = buildTree(data)
-  menu[0].children.push(...lists)
-  deptOptions.value = menu
+const treeProps = {
+  label: 'name',
+  children: 'children',
+  isLeaf: 'isLeaf',
+}
+const cityOptions = ref<any[]>([]);
+const menu: any = [{ areaCode: 0, name: "根目录",id:0 }];
+const loadTree = async (node: Node, resolve: (data: Tree[]) => void) => {
+  if (node.level === 0) {
+    return resolve(menu)
+  }
+  let data = []
+  data = await getCityByList(parseInt(node.data.areaCode))
+  data.map(item => {
+    if(item.level<=3){
+      item.isLeaf = false
+    } else {
+      item.isLeaf = true
+    }
+  })
+  resolve(data)
 };
-
+const handleNodeClick = (data: Tree) => {
+  formData.pid = data.id
+}
 const handleSubmit = async () => {
-    await formRef.value?.validate();
-    props.deptId ? await deptUpdate(formData) : await deptAdd(formData);
-    message("操作成功");
-    emit("update:visible", false);
-    emit("success");
+  await formRef.value?.validate();
+  if(formData.pid==0){
+    formData.parentCode ='0'
+  }
+  props.cityId ? await cityUpdate(formData) : await cityAdd(formData);
+  message("操作成功");
+  emit("update:visible", false);
+  emit("success");
 };
 
-const { isLock:subLoading,lockFn: submit } = useLockFn(handleSubmit);
+const { isLock: subLoading, lockFn: submit } = useLockFn(handleSubmit);
 
 
 const setFormData = (data: Record<any, any>) => {
@@ -170,27 +169,25 @@ const setFormData = (data: Record<any, any>) => {
       formData[key] = data[key];
     }
   }
+  caCheData.value = [{ id: formData.pid, name: data.parentName}]
 };
 
 const getDetail = async () => {
-  const data = await getDeptDetail(
-    props.deptId
+  const data = await getCityDetail(
+    props.cityId
   );
   setFormData(data);
 };
 
-const handleClose = () => {
-  emit("close");
-};
-
-
-
 onMounted(() => {
-  getMenu()
-  if (props.deptId) {
+  if (props.cityId) {
     getDetail()
-  }else{
-    formData.parentId=props.pid
+  } else {
+    if(props.parentData) {
+      formData.pid=props.parentData.id
+      formData.parentCode=props.parentData.areaCode
+      caCheData.value = [{ id: props.parentData.id, name: props.parentData.name}]   
   }
+}
 });
 </script>

src/views/data/city/index.vue

@@ -10,31 +10,30 @@
           </template>
           新增
         </el-button>
-        <el-button @click="handleExpand"> 展开/折叠</el-button>
+        <!-- <el-button @click="handleExpand"> 展开/折叠</el-button> -->
       </div>
       </el-card>
       <el-card :bordered="false" class="pt-3 mb-3 proCard">
       <el-table border v-loading="loading" ref="tableRef" :data="lists" row-key="id" lazy
       :load="loadTree" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
         <el-table-column label="城市名称" prop="name" min-width="150" show-overflow-tooltip/>
-        <el-table-column label="城市拼音" prop="name" min-width="150" show-overflow-tooltip/>
+        <el-table-column label="城市拼音" prop="pinyin" min-width="150" show-overflow-tooltip/>
         <el-table-column align="center" label="城市级别" prop="level" min-width="80">
           <template #default="{ row }">
-            <div v-if="row.level ==1">公司</div>
-            <div v-else-if="row.level == 2">子公司</div>
-            <div v-else-if="row.level == 3">部门</div>
-            <div v-else-if="row.level == 4">小组</div>
+            <div v-if="row.level ==0">省份</div>
+            <div v-else-if="row.level == 1">城市</div>
+            <div v-else-if="row.level == 2">县区</div>
+            <div v-else-if="row.level == 3">街道</div>
+            <div v-else-if="row.level == 4">居委会</div>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="城市区号" prop="sort" min-width="100"/>
-        <el-table-column align="center" label="行政编码" prop="note" min-width="100"/>
-        <el-table-column align="center" label="城市邮编" prop="note" min-width="100"/>
-        <el-table-column align="center" label="创建人" prop="createUser" min-width="180"></el-table-column>
-        <el-table-column align="center" label="创建时间" prop="createTime" min-width="180"></el-table-column>
+        <el-table-column align="center" label="城市区号" prop="cityCode" min-width="100"/>
+        <el-table-column align="center" label="行政编码" prop="areaCode" min-width="100"/>
+        <el-table-column align="center" label="城市邮编" prop="zipCode" min-width="100"/>
         <el-table-column align="center" label="操作" width="160" fixed="right">
           <template #default="{ row }">
             <el-button type="primary" link
-                       @click="handleAdd(row.id)">
+                       @click="handleAdd(row)">
               新增
             </el-button>
             <el-button type="primary" link @click="handleEdit(row)">
@@ -50,10 +49,10 @@
     <editDialog
         ref="editRef"
         v-if="editVisible"
-        :deptId="deptId"
-        :pid="pid"
+        :cityId="cityId"
+        :parentData="parentData"
         v-model:visible="editVisible"
-        @success="getLists"
+        @success="getDataList(0)"
     >
     </editDialog>
   </div>
@@ -61,10 +60,11 @@
 
 <script lang="ts" setup name="menu">
 import {defineAsyncComponent, nextTick, onMounted, ref, shallowRef} from "vue";
-import {getCityList,cityDelete} from "@/api/data/city";
+import {cityDelete} from "@/api/data/city";
+import {getCityByList} from "@/api/system/user";
 import type {ElTable} from "element-plus";
 const tableRef = shallowRef<InstanceType<typeof ElTable>>();
-import {confirm, message,buildTree} from "@/utils/auth";
+import {confirm, message} from "@/utils/auth";
 
 const editDialog = defineAsyncComponent(() =>
     import('./edit.vue')
@@ -73,41 +73,61 @@ const editDialog = defineAsyncComponent(() =>
 const isExpand = ref(false);
 const loading = ref(false);
 const editVisible=ref(false);
-const deptId=ref(0);
-const pid=ref(0)
+const cityId=ref(0);
+const parentData=ref()
 const lists = ref([]);
 
-const getLists = async () => {
-  loading.value = true;
+const getDataList = async (typeId: any, resolve?: any) => {
   try {
-    const data = await getCityList();
-    lists.value = buildTree(data);
-    loading.value = false;
-  } catch (error) {
+    loading.value = true;
+    let res = await getCityByList(typeId);
+    let data = res.length>0 ?res: [];
+    data.map(item => {
+      if (item.level <=3) {
+        item.hasChildren = true;
+      } else {
+        item.hasChildren = false;
+      }
+    });
+    if (resolve) {
+      resolve(data);
+    } else {
+      lists.value = data;
+    }
+  } catch (e) {
+    if (resolve) {
+      resolve([]);
+    } else {
+      lists.value = [];
+    }
+  } finally {
     loading.value = false;
   }
 };
 
-const handleAdd = async (parentId:any) => {
-  deptId.value=0
-  pid.value=parentId?parentId:0
+const loadTree = (tree: any, treeNode: any, resolve: any) => {
+  getDataList(tree.areaCode, resolve);
+};
+const handleAdd = async (data:any) => {
+  cityId.value=0
+  parentData.value=data
   await nextTick();
   editVisible.value=true
 };
 
 const handleEdit = async (data: any) => {
-  deptId.value=data.id
+  cityId.value=data.id
   await nextTick();
   editVisible.value=true
 };
 
-const handleDelete = async (deptId: number) => {
+const handleDelete = async (cityId: number) => {
   await confirm("确定要删除？");
   try {
     loading.value = true;
-    await cityDelete(deptId);
+    await cityDelete(cityId);
     message("删除成功");
-    getLists();
+    getDataList(0);
   } catch (e) {
     loading.value = false;
   }
@@ -127,18 +147,10 @@ const toggleExpand = (children: any[], unfold = true) => {
   }
 };
 
-const getAll=()=>{
-  getLists();
-}
-
-
 onMounted(() => {
-  getAll()
+  getDataList(0)
 });
 
-// onActivated(() => {
-//   getAll()
-// });
 
 </script>
 

src/views/data/config/index.vue

@@ -115,10 +115,9 @@ const editVisible=ref(false)
     schemas
   });
   function handleSubmit(values: Recordable) {
-    for (const key in formParams) {
-      if (values[key] != null && values[key] != undefined) {
-        formParams[key] = values[key];
-      }
+    handleReset()
+    for (const key in values) {
+      formParams[key] = values[key]
     }
     reloadTable();
   }

src/views/data/notice/index.vue

@@ -117,10 +117,9 @@
     schemas
   });
   function handleSubmit(values: Recordable) {
-    for (const key in formParams) {
-      if (values[key] != null && values[key] != undefined) {
-        formParams[key] = values[key];
-      }
+    handleReset()
+    for (const key in values) {
+      formParams[key] = values[key]
     }
     reloadTable();
   }

src/views/data/notice/querySchemas.ts

@@ -14,6 +14,7 @@ export const schemas: FormSchema[] = [
     label: '状态',
     componentProps: {
       placeholder: '请选择类型',
+      clearable: true,
       options: [
         {
           label: '通知',
@@ -32,6 +33,7 @@ export const schemas: FormSchema[] = [
     label: '状态',
     componentProps: {
       placeholder: '请选择状态',
+      clearable: true,
       options: [
         {
           label: '正常',

src/views/data/param/index.vue

@@ -115,10 +115,9 @@ const editVisible=ref(false)
     schemas
   });
   function handleSubmit(values: Recordable) {
-    for (const key in formParams) {
-      if (values[key] != null && values[key] != undefined) {
-        formParams[key] = values[key];
-      }
+    handleReset()
+    for (const key in values) {
+      formParams[key] = values[key]
     }
     reloadTable();
   }

src/views/data/param/querySchemas.ts

@@ -14,6 +14,7 @@ export const schemas: FormSchema[] = [
     label: '参数类型',
     componentProps: {
       placeholder: '请选择参数类型',
+      clearable: true,
       options: [
         {
           label: '正常',
@@ -32,6 +33,7 @@ export const schemas: FormSchema[] = [
     label: '参数状态',
     componentProps: {
       placeholder: '请选择状态',
+      clearable: true,
       options: [
         {
           label: '正常',

src/views/file/emailTemplate/index.vue

@@ -117,10 +117,9 @@ const editVisible=ref(false)
     schemas
   });
   function handleSubmit(values: Recordable) {
-    for (const key in formParams) {
-      if (values[key] != null && values[key] != undefined) {
-        formParams[key] = values[key];
-      }
+    handleReset()
+    for (const key in values) {
+      formParams[key] = values[key]
     }
     reloadTable();
   }

src/views/file/emailTemplate/querySchemas.ts

@@ -14,6 +14,7 @@ export const schemas: FormSchema[] = [
     label: '邮件类型',
     componentProps: {
       placeholder: '请选择邮件类型',
+      clearable: true,
       options: [
         {
           label: '普通邮件',

src/views/file/fileTemplate/index.vue

@@ -116,10 +116,9 @@ const editVisible=ref(false)
     schemas
   });
   function handleSubmit(values: Recordable) {
-    for (const key in formParams) {
-      if (values[key] != null && values[key] != undefined) {
-        formParams[key] = values[key];
-      }
+    handleReset()
+    for (const key in values) {
+      formParams[key] = values[key]
     }
     reloadTable();
   }

src/views/file/smsTemplate/index.vue

@@ -117,10 +117,9 @@ const editVisible=ref(false)
     schemas
   });
   function handleSubmit(values: Recordable) {
-    for (const key in formParams) {
-      if (values[key] != null && values[key] != undefined) {
-        formParams[key] = values[key];
-      }
+    handleReset()
+    for (const key in values) {
+      formParams[key] = values[key]
     }
     reloadTable();
   }

src/views/file/smsTemplate/querySchemas.ts

@@ -14,6 +14,7 @@ export const schemas: FormSchema[] = [
     label: '模板类型',
     componentProps: {
       placeholder: '请选择模板类型',
+      clearable: true,
       options: [
         {
           label: '阿里云',

src/views/logger/emailLog/index.vue

@@ -111,10 +111,9 @@ const editVisible=ref(false)
     schemas
   });
   function handleSubmit(values: Recordable) {
-    for (const key in formParams) {
-      if (values[key] != null && values[key] != undefined) {
-        formParams[key] = values[key];
-      }
+    handleReset()
+    for (const key in values) {
+      formParams[key] = values[key]
     }
     reloadTable();
   }

src/views/logger/emailLog/querySchemas.ts

@@ -14,6 +14,7 @@ export const schemas: FormSchema[] = [
     label: '接收类型',
     componentProps: {
       placeholder: '请选择接收类型',
+      clearable: true,
       options: [
         {
           label: '系统用户',
@@ -36,6 +37,7 @@ export const schemas: FormSchema[] = [
     label: '业务类型',
     componentProps: {
       placeholder: '请选择业务类型',
+      clearable: true,
       options: [
         {
           label: '订单',
@@ -54,6 +56,7 @@ export const schemas: FormSchema[] = [
     label: '状态',
     componentProps: {
       placeholder: '请选择状态',
+      clearable: true,
       options: [
         {
           label: '已读',

src/views/logger/smsLog/index.vue

@@ -111,10 +111,9 @@ const editVisible=ref(false)
     schemas
   });
   function handleSubmit(values: Recordable) {
-    for (const key in formParams) {
-      if (values[key] != null && values[key] != undefined) {
-        formParams[key] = values[key];
-      }
+    handleReset()
+    for (const key in values) {
+      formParams[key] = values[key]
     }
     reloadTable();
   }

src/views/logger/smsLog/querySchemas.ts

@@ -14,6 +14,7 @@ export const schemas: FormSchema[] = [
     label: '接收类型',
     componentProps: {
       placeholder: '请选择接收类型',
+      clearable: true,
       options: [
         {
           label: '系统用户',
@@ -36,6 +37,7 @@ export const schemas: FormSchema[] = [
     label: '业务类型',
     componentProps: {
       placeholder: '请选择业务类型',
+      clearable: true,
       options: [
         {
           label: '订单',
@@ -54,6 +56,7 @@ export const schemas: FormSchema[] = [
     label: '状态',
     componentProps: {
       placeholder: '请选择状态',
+      clearable: true,
       options: [
         {
           label: '已读',

src/views/system/dept/edit.vue

@@ -76,7 +76,6 @@
 import type {FormInstance} from "element-plus";
 import { deptAdd,deptUpdate,getDeptList,getDeptDetail } from '@/api/system/dept';
 import {onMounted, reactive, ref, shallowRef} from "vue";
-import {getModulesKey} from "@/router";
 import {message,buildTree} from "@/utils/auth";
 import {useLockFn} from "@/utils/useLockFn";
 const props = defineProps({
@@ -115,17 +114,6 @@ const optionData = reactive({
 });
 const emit = defineEmits(["success","update:visible"]);
 const formRef = shallowRef<FormInstance>();
-
-const componentsOptions = ref(getModulesKey());
-const querySearch = (queryString: string, cb: any) => {
-  const results = queryString
-      ? componentsOptions.value.filter((item) =>
-          item.toLowerCase().includes(queryString.toLowerCase())
-      )
-      : componentsOptions.value;
-  cb(results.map((item) => ({value: item})));
-};
-
 const formData = reactive({
   id: "",
   //父级id
@@ -179,9 +167,6 @@ const getDetail = async () => {
   setFormData(data);
 };
 
-const handleClose = () => {
-  emit("close");
-};
 
 
 

src/views/system/level/index.vue

@@ -150,10 +150,9 @@
     schemas
   });
   function handleSubmit(values: Recordable) {
-    for (const key in formParams) {
-      if (values[key] != null && values[key] != undefined) {
-        formParams[key] = values[key];
-      }
+    handleReset()
+    for (const key in values) {
+      formParams[key] = values[key]
     }
     reloadTable();
   }

src/views/system/level/querySchemas.ts

@@ -14,6 +14,8 @@ export const schemas: FormSchema[] = [
     label: '状态',
     componentProps: {
       placeholder: '请选择状态',
+      clearable: true,
+      clearable:true,
       options: [
         {
           label: '正常',

src/views/system/logger/loginLog/querySchemas.ts

@@ -6,6 +6,7 @@ export const schemas: FormSchema[] = [
     label: '请求类型',
     componentProps: {
       placeholder: '请选择请求类型',
+      clearable:true,
       options: [
         {
           label: '登录',
@@ -24,6 +25,7 @@ export const schemas: FormSchema[] = [
     label: '请求状态',
     componentProps: {
       placeholder: '请选择状态',
+      clearable:true,
       options: [
         {
           label: '正常',

src/views/system/logger/loginlog.vue

@@ -105,10 +105,9 @@ const editVisible=ref(false)
     schemas
   });
   function handleSubmit(values: Recordable) {
-    for (const key in formParams) {
-      if (values[key] != null && values[key] != undefined) {
-        formParams[key] = values[key];
-      }
+    handleReset()
+    for (const key in values) {
+      formParams[key] = values[key]
     }
     reloadTable();
   }

src/views/system/logger/operLog/querySchemas.ts

@@ -6,6 +6,7 @@ export const schemas: FormSchema[] = [
     label: '请求类型',
     componentProps: {
       placeholder: '请选择请求类型',
+      clearable:true,
       options: [
         {
           label: '登录',
@@ -24,6 +25,7 @@ export const schemas: FormSchema[] = [
     label: '请求状态',
     componentProps: {
       placeholder: '请选择状态',
+      clearable:true,
       options: [
         {
           label: '正常',

src/views/system/logger/operlog.vue

@@ -105,10 +105,9 @@ const editVisible=ref(false)
     schemas
   });
   function handleSubmit(values: Recordable) {
-    for (const key in formParams) {
-      if (values[key] != null && values[key] != undefined) {
-        formParams[key] = values[key];
-      }
+    handleReset()
+    for (const key in values) {
+      formParams[key] = values[key]
     }
     reloadTable();
   }

src/views/system/position/index.vue

@@ -114,10 +114,9 @@ const selectionData = ref([])
     schemas
   });
   function handleSubmit(values: Recordable) {
-    for (const key in formParams) {
-      if (values[key] != null && values[key] != undefined) {
-        formParams[key] = values[key];
-      }
+    handleReset()
+    for (const key in values) {
+      formParams[key] = values[key]
     }
     reloadTable();
   }

src/views/system/position/querySchemas.ts

@@ -14,6 +14,7 @@ export const schemas: FormSchema[] = [
     label: '状态',
     componentProps: {
       placeholder: '请选择状态',
+      clearable:true,
       options: [
         {
           label: '正常',

src/views/system/role/index.vue

@@ -136,10 +136,9 @@ const authVisible=ref(false)
     schemas
   });
   function handleSubmit(values: Recordable) {
-    for (const key in formParams) {
-      if (values[key] != null && values[key] != undefined) {
-        formParams[key] = values[key];
-      }
+    handleReset()
+    for (const key in values) {
+      formParams[key] = values[key]
     }
     reloadTable();
   }

src/views/system/tenant/index.vue

@@ -137,10 +137,9 @@
   }
   
   function handleSubmit(values: Recordable) {
-    for (const key in formParams) {
-      if (values[key] != null && values[key] != undefined) {
-        formParams[key] = values[key];
-      }
+    handleReset()
+    for (const key in values) {
+      formParams[key] = values[key]
     }
     reloadTable();
   }

src/views/system/tenant/querySchemas.ts

@@ -26,6 +26,7 @@ export const schemas: FormSchema[] = [
     label: '状态',
     componentProps: {
       placeholder: '请选择状态',
+      clearable:true,
       options: [
         {
           label: '正常',

src/views/system/user/index.vue

@@ -183,10 +183,9 @@
   }
   
   function handleSubmit(values: Recordable) {
-    for (const key in formParams) {
-      if (values[key] != null && values[key] != undefined) {
-        formParams[key] = values[key];
-      }
+    handleReset()
+    for (const key in values) {
+      formParams[key] = values[key]
     }
     reloadTable();
   }