Merge branch 'master' of http://120.26.64.82:3000/BFFE/SZYGM1.0

src/components/minheader/index.vue

@@ -167,15 +167,19 @@ const emits = defineEmits([
   "addSlotForm",
   "showForm",
   "searchForm",
+  "searchForms",
+  "clearForm",
 ]);
 const addBbut = () => {
   emits("addForm");
 };
 const search = (val) => {
   emits("searchForm", [startTime, endTime, val]);
+  emits("searchForms", val);
   // ElMessage.success(`搜索成功：${val}`);
 };
 const clear = () => {
+  emits("clearForm");
   ElMessage.success(`清除`);
 };
 //保存

src/router/routes/routes-file-two.ts

@@ -4,54 +4,75 @@ const HomeRoutes = {
   path: '/userManagement',
   component: Layout,
   name: 'UserManagement',
-  redirect: '/userManagement/role',
+  redirect: '/userManagement/permission',
   //using el svg icon, the elSvgIcon first when at the same time using elSvgIcon and icon
   meta: { title: '权限管理', elSvgIcon: 'Fold' },
   children: [
     {
-      path: 'permission',
+      path: '/userManagement/permission',
       name: 'Permission',
       meta: { title: '权限项管理' },
       component: () => import('@/views/userManagement/permission/index.vue'),
     },
     {
-      path: 'role',
+      path: '/userManagement/role',
       name: 'Role',
       meta: { title: '角色管理' },
-      component: () => import('@/views/userManagement/role/index.vue'),
+      redirect: '/userManagement/role',
+      component: {
+        render: () => h(resolveComponent('router-view')),
+      },
+      children: [
+        {
+          path: '/userManagement/role',
+          name: 'Role',
+          hidden: true,
+          component: () => import('@/views/userManagement/role/index.vue'),
+        },
+        {
+          path: '/userManagement/role/auth',
+          name: 'Auth',
+          hidden: true,
+          meta: { title: '角色授权' },
+          component: () => import('@/views/userManagement/role/auth.vue'),
+        },
+      ],
     },
     {
-      path: 'account',
+      path: '/userManagement/account',
       name: 'Account',
       meta: { title: '账号管理' },
-      component: () => import('@/views/userManagement/account/index.vue'),
+      redirect: '/userManagement/account',
+      component: {
+        render: () => h(resolveComponent('router-view')),
+      },
+      children: [
+        {
+          path: '/userManagement/account',
+          component: () => import('@/views/userManagement/account/index.vue'),
+          hidden: true,
+        },
+        {
+          path: '/userManagement/account/accountAuth',
+          name: 'AccountAuth',
+          hidden: true,
+          meta: { title: '账号权限' },
+          component: () => import('@/views/userManagement/account/auth.vue'),
+        },
+      ],
     },
     {
-      path: 'accountGroup',
+      path: '/userManagement/accountGroup',
       name: 'AccountGroup',
       meta: { title: '账号组管理' },
       component: () => import('@/views/userManagement/accountGroup/index.vue'),
     },
     {
-      path: 'application',
+      path: '/userManagement/application',
       name: 'Application',
       meta: { title: '应用管理' },
       component: () => import('@/views/userManagement/application/index.vue'),
     },
-    {
-      path: 'auth',
-      name: 'Auth',
-      hidden: true,
-      meta: { title: '角色授权' },
-      component: () => import('@/views/userManagement/role/auth.vue'),
-    },
-    {
-      path: 'accountAuth',
-      name: 'AccountAuth',
-      hidden: true,
-      meta: { title: '账号权限' },
-      component: () => import('@/views/userManagement/account/auth.vue'),
-    },
   ],
 }
 

src/views/systemSettings/queryTemplate/index.vue

@@ -1,7 +1,14 @@
 <template>
   <div class="airportInfo scroll-y">
     <div class="wrap">
-      <Minheader :is-auth="true" :is-statuser="true" @addForm="addForm">
+      <Minheader
+        :is-auth="true"
+        :is-statuser="true"
+        :is-Search="true"
+        @addForm="addForm"
+        @searchForms="searchForms"
+        @clearForm="clearForm"
+      >
         <template #header>
           <div class="status flex-wrap">
             <div class="manageTitle">查询模板</div>
@@ -37,7 +44,8 @@ import Minheader from "@/components/minheader/index.vue";
 import Dialog from "@/components/dialog/index.vue";
 import { Query, GeneralDataReception } from "@/api/webApi";
 import { ElMessage } from "element-plus";
-const width = ref('200px')
+import { el } from "element-plus/es/locale";
+const width = ref("200px");
 const router = useRouter();
 const dataId = ref<String>("4"); //请求id
 const page = ref<number>(0); //分页参数
@@ -65,6 +73,7 @@ const tableForm = reactive({
 }); //弹窗内容
 //列表
 const tableData = ref([]);
+const tableDatcopy = ref([]);
 //表头
 const state = reactive({
   list: [
@@ -185,6 +194,7 @@ const getQuery = async () => {
         rowTitle.value = titleColumn.columnName;
       }
       tableData.value.push(...returnData.listValues);
+      tableDatcopy.value.push(...returnData.listValues);
       tableCols.value = returnData.columnSet;
       tableCols.value.forEach((element) => {
         element.label = element.columnLabel;
@@ -245,6 +255,29 @@ const generalDataReception = async (data) => {
     resetForm();
   }
 };
+//搜索
+const searchForms = (data) => {
+  if (data) {
+    tableData.value = [];
+    tableDatcopy.value.forEach((element) => {
+      if (element.queryTemplateID == data) {
+        tableData.value.push(element);
+      }
+    });
+  } else {
+    tableData.value = [];
+    tableDatcopy.value = [];
+    page.value = 0;
+    getQuery();
+  }
+};
+//清除
+const clearForm = () => {
+  tableData.value = [];
+  tableDatcopy.value = [];
+  page.value = 0;
+  getQuery();
+};
 onMounted(() => {
   getQuery();
 });

src/views/systemSettings/queryTemplate/queryTemplateColumn.vue

@@ -28,10 +28,19 @@
         @delRemove="delRemove"
       >
         <div class="diacont">
-          <el-form :model="tableForm">
+          <el-form
+            :model="tableForm"
+            :rules="formRules"
+            ref="queryTemplateColumnForm"
+          >
             <el-row :gutter="24">
               <el-col :span="12">
-                <el-form-item label="名称" size="default">
+                <el-form-item
+                  label="名称"
+                  size="default"
+                  prop="columnName"
+                  :rules="formRules.isNotNull"
+                >
                   <el-input
                     v-model="tableForm.columnName"
                     placeholder="请输入名称"
@@ -39,7 +48,12 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="标签" size="default">
+                <el-form-item
+                  label="标签"
+                  size="default"
+                  prop="columnLabel"
+                  :rules="formRules.isNotNull"
+                >
                   <el-input
                     v-model="tableForm.columnLabel"
                     placeholder="请输入标签"
@@ -223,6 +237,7 @@ import Dialog from "@/components/dialog/index.vue";
 import { Query, GeneralDataReception } from "@/api/webApi";
 import { ElMessage } from "element-plus";
 const route = useRoute();
+const formRules = useElement().formRules;
 const page = ref<number>(0); //分页参数
 const dataContent = ref<object>({});
 const noMore = ref<Boolean>(false);
@@ -348,7 +363,7 @@ const btnClick = (row, index, param) => {
       index.listqueryTemplateID === "需要" ? "1" : "0";
     tableForm.needCount = index.needCount === "需要" ? "1" : "0";
     tableForm.orderNumber = index.orderNumber === "需要" ? "1" : "0";
-    tableForm.needSearch = index.needSearch;
+    tableForm.needSearch = index.needSearch === "需要" ? "1" : "0";
   } else if (param === 3) {
     msgTitle.value = "删除查询项";
     flag.value = true;
@@ -421,8 +436,15 @@ const getQuery = async () => {
   }
 };
 //确认提交
+const queryTemplateColumnForm: any = ref(null);
 const submitForm = () => {
-  generalDataReception(tableForm);
+  queryTemplateColumnForm.value.validate((valid: any) => {
+    if (valid) {
+      generalDataReception(tableForm);
+    } else {
+      return false;
+    }
+  });
 };
 const resetTable = () => {
   page.value = 0;

src/views/userManagement/account/index.vue

@@ -208,7 +208,7 @@ const btnClick = (index, row, param) => {
     ruleForm.value = _.cloneDeep(row);
   } else {
     router.push({
-      path: "/userManagement/accountAuth",
+      path: "/userManagement/account/accountAuth",
       query: {
         id: row.user_id,
       },

src/views/userManagement/role/index.vue

@@ -105,7 +105,7 @@ const btnClick = (index, row, param) => {
     ruleForm.value = _.cloneDeep(row);
   } else {
     router.push({
-      path: "/userManagement/auth",
+      path: "/userManagement/role/auth",
       query: {
         role_id: row.role_id,
       },