1.修复部分弹窗无法关闭，分页导致查询无效，关键字查询无效等问题，调整菜单页面布局，删除不需要的元素

src/views/basic/BussinessType.vue

@@ -25,7 +25,7 @@
                 <el-form-item>
                     <el-button-group style="margin-left: 10px;display:flex;">
                         <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                        <el-button type="primary" icon="search" @click="getList">查询</el-button>
+                        <el-button type="primary" icon="search" @click="search">查询</el-button>
                         <el-button type="primary" icon="search" @click="handleAddClick"
                                    :disabled="!configParms.typeScan"
                         >新增
@@ -164,6 +164,7 @@ import axios from "axios";
 import store from "@/store";
 import {getLocalJoinBusType} from "@/api/basic/busLocalType";
 import {findConfig} from "@/api/thrsys/spsSyncStatus";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
     data() {
@@ -262,9 +263,10 @@ export default {
             this.modifyDialogVisible = false;
             this.addDialogVisible = false;
         },
-        // handleChange() {
-        //     this.getList();
-        // },
+        search() {
+            this.filterQuery.page = 1;
+            this.getList();
+        },
         getList() {
             this.loading = true;
             getJoinBussinessType(this.filterQuery)
@@ -285,6 +287,10 @@ export default {
         },
 
         onAddSubmit() {
+            if (isBlank(this.inputQuery.name)) {
+                this.$message.error("扫码单据类型名称不能为空！");
+                return;
+            }
             if (this.inputQuery.enable && this.inputQuery.localAction == "") {
                 this.$message.error("本地单据不能为空！");
                 return;

src/views/userManage/admin/authAdmin.vue

@@ -353,6 +353,9 @@ export default {
             } else if (this.formData.roles.length === 0) {
                 this.$message.error("未指定角色！")
                 return;
+            } else if (this.formData.passWord !== this.formData.checkPassword) {
+                this.$message.error("两次输入密码不一致!")
+                return;
             }
 
             this.$refs["dataForm"].validate(valid => {

src/views/userManage/admin/authPermissionRule.vue

@@ -1,26 +1,11 @@
 <template>
     <div>
         <el-form :inline="true" :model="query" class="query-form" size="mini">
-      <el-form-item class="query-form-item">
-        <el-select v-model="query.status" placeholder="状态">
-          <el-option label="全部" value=""></el-option>
-          <el-option label="禁用" value="0"></el-option>
-          <el-option label="正常" value="1"></el-option>
-        </el-select>
-      </el-form-item>
-
             <el-form-item>
                 <el-button-group>
-          <el-button
-            type="primary"
-            icon="el-icon-refresh"
-            @click="onReset"
-          ></el-button>
-          <el-button type="primary" icon="search" @click="onSubmit"
-            >查询</el-button
-          >
                     <el-button type="primary" @click.native="handleForm(null, null)"
-            >新增</el-button
+                    >新增
+                    </el-button
                     >
                 </el-button-group>
             </el-form-item>
@@ -76,7 +61,7 @@
                     ></el-input>
                 </el-form-item>
                 <el-form-item label="状态" prop="status">
-          <el-radio-group v-model="formData.status">
+                    <el-radio-group v-model="formData.status" :disabled="true">
                         <el-radio :label="0">禁用</el-radio>
                         <el-radio :label="1">正常</el-radio>
                     </el-radio-group>
@@ -84,13 +69,6 @@
                 <!-- <el-form-item label="额外的规则表达式">
                             <el-input type="textarea" v-model="formData.condition"></el-input>
                         </el-form-item> -->
-        <el-form-item label="排序" prop="listorder">
-          <el-input
-            type=""
-            v-model="formData.listorder"
-            auto-complete="off"
-          ></el-input>
-        </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button @click.native="hideForm">取消</el-button>
@@ -98,7 +76,8 @@
                     type="primary"
                     @click.native="formSubmit()"
                     :loading="formLoading"
-          >提交</el-button
+                >提交
+                </el-button
                 >
             </div>
         </el-dialog>
@@ -111,6 +90,7 @@ import {
     authPermissionRuleSave,
     authPermissionRuleDelete
 } from "../../../api/auth/authPermissionRule";
+
 const formJson = {
     id: "",
     pid: "2",
@@ -146,13 +126,13 @@ export default {
             formData: formJson,
             formRules: {
                 name: [
-                    { required: true, message: "请输入规则名", trigger: "blur" }
+                    {required: true, message: "请输入规则名", trigger: "blur"}
                 ],
                 title: [
-                    { required: true, message: "请输入标题", trigger: "blur" }
+                    {required: true, message: "请输入标题", trigger: "blur"}
                 ],
                 status: [
-                    { required: true, message: "请选择状态", trigger: "change" }
+                    {required: true, message: "请选择状态", trigger: "change"}
                 ]
             },
             pidData: {},
@@ -161,9 +141,10 @@ export default {
     },
     methods: {
         /*eslint-disable */
-    renderContent(h, { node, data, store }) {
+        renderContent(h, {node, data, store}) {
             return (
-        <span style="flex: 1; display: flex; align-items: center; justify-content: space-between; font-size: 14px; padding-right: 8px;">
+                <span
+                    style="flex: 1; display: flex; align-items: center; justify-content: space-between; font-size: 14px; padding-right: 8px;">
           <span>
             <span title={data.name}>{node.label}</span>
           </span>
@@ -238,6 +219,7 @@ export default {
         },
         // 显示表单
         handleForm(node, data, formName) {
+            this.resetForm();
             this.formVisible = true;
             this.pidData = data || null;
             formJson.pid = (data && parseInt(data.id)) || "";
@@ -307,7 +289,7 @@ export default {
                 })
                     .then(() => {
                         this.deleteLoading = true;
-            let para = { id: data.id };
+                        let para = {id: data.id};
                         authPermissionRuleDelete(para)
                             .then((response) => {
                                 this.deleteLoading = false;
@@ -347,7 +329,8 @@ export default {
             return statusMap[status];
         },
     },
-  mounted() {},
+    mounted() {
+    },
     created() {
         // 加载表格数据
         this.getList();

src/views/userManage/admin/authRole.vue

@@ -235,6 +235,7 @@ export default {
             this.getList();
         },
         onSubmit() {
+            this.query.page = 1;
             this.getList();
         },
         handleCurrentChange(val) {

src/views/userManage/param/phoneRegisterManage.vue

@@ -189,7 +189,7 @@
                 </el-col>
             </el-row>
             <span slot="footer" class="dialog-footer" style="margin-top: 40px">
-                <el-button @click="editDialogVisible = false">取消</el-button>
+                <el-button @click="cancelDialog">取消</el-button>
                 <el-button type="primary" @click="confirmEdit">确定</el-button>
             </span>
         </el-dialog>
@@ -276,13 +276,9 @@ export default {
             this.editDialogVisible = true;
         },
         cancelDialog() {
-            this.addDialogVisible = false;
-        },
-
-        handleCheckedChange(val) {
-            console.log(val);
+            this.editDialogVisible = false;
+            this.getList();
         },
-
         handleSizeChange(val) {
             this.filterQuery.limit = val;
             this.getList();
@@ -294,10 +290,10 @@ export default {
 
         checkRegister() {
             this.loading = true;
-
             check(this.checkQuery)
                 .then((response) => {
                     if (response.code === 20000) {
+                        this.editDialogVisible = false;
                         this.getList();
                         this.$message({
                             type: "success",
@@ -316,7 +312,6 @@ export default {
             this.centerDialogVisible = true;
         },
         confirmEdit() {
-            this.ch
             this.checkRegister();
         },
 

src/views/userManage/param/systemParamConfig.vue

@@ -5,12 +5,12 @@
         <el-form :inline="true" :model="query" class="query-form" size="mini">
             <el-row>
                 <el-form-item class="query-form-item">
-                    <el-input v-model="query.key" placeholder="参数关键字搜索"></el-input>
+                    <el-input v-model="query.paramName" placeholder="参数关键字搜索" clearable></el-input>
                 </el-form-item>
 
                 <el-form-item>
                     <el-button-group>
-                        <el-button type="primary" @click.native="getList"
+                        <el-button type="primary" @click.native="search"
                         >搜索
                         </el-button
                         >
@@ -182,6 +182,10 @@
                 this.query.page = val;
                 this.getList();
             },
+            search() {
+                this.query.page = 1;
+                this.getList();
+            },
             getList() {
                 this.loading = true;
                 systemParamConfigList(this.query)