1
0
lsw 9 ヶ月 前
コミット
6787c9b9f0

+ 2 - 2
admin-ui/src/views/monitor/job/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true"  label-width="68px">
       <el-form-item label="任务名称" prop="jobName">
         <el-input v-model="queryParams.jobName" placeholder="请输入任务名称" clearable @keyup.enter.native="handleQuery" class="se"/>
       </el-form-item>
@@ -26,7 +26,7 @@
       <el-col :span="1.5"><el-button type="danger" icon="el-icon-delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['monitor:job:remove']">删除</el-button></el-col>
       <el-col :span="1.5"><el-button type="warning" icon="el-icon-download" @click="handleExport" v-hasPermi="['monitor:job:export']">导出</el-button></el-col>
       <el-col :span="1.5"><el-button type="info" icon="el-icon-s-operation" @click="handleJobLog" v-hasPermi="['monitor:job:query']">日志</el-button></el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      
     </el-row>
 
     <el-table border :data="jobList" @selection-change="handleSelectionChange">

+ 2 - 2
admin-ui/src/views/monitor/job/log.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true"  label-width="68px">
       <el-form-item label="任务名称" prop="jobName">
         <el-input v-model="queryParams.jobName" placeholder="请输入任务名称" clearable @keyup.enter.native="handleQuery" class="se"/>
       </el-form-item>
@@ -31,7 +31,7 @@
       <el-col :span="1.5"><el-button type="danger" icon="el-icon-delete" @click="handleClean" v-hasPermi="['monitor:job:remove']">清空</el-button></el-col>
       <el-col :span="1.5"><el-button type="warning" icon="el-icon-download" @click="handleExport" v-hasPermi="['monitor:job:export']">导出</el-button></el-col>
       <el-col :span="1.5"><el-button type="warning" icon="el-icon-close" @click="handleClose">关闭</el-button></el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      
     </el-row>
 
     <el-table border :data="jobLogList" @selection-change="handleSelectionChange">

+ 2 - 2
admin-ui/src/views/monitor/logininfor/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true"  label-width="68px">
       <el-form-item label="账号" prop="userName"><el-input v-model="queryParams.userName" placeholder="请输入账号" clearable @keyup.enter.native="handleQuery" class="se"/></el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="登录状态" clearable>
@@ -32,7 +32,7 @@
         <el-button type="primary" icon="el-icon-unlock" :disabled="single" @click="handleUnlock" v-hasPermi="['monitor:logininfor:unlock']">解锁</el-button>
       </el-col>
       <el-col :span="1.5"><el-button type="warning" icon="el-icon-download" @click="handleExport" v-hasPermi="['monitor:logininfor:export']">导出</el-button></el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      
     </el-row>
     <el-table ref="tables" border :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange" height="calc(100vh - 273px)">
       <el-table-column type="selection" width="55" align="center" />

+ 2 - 2
admin-ui/src/views/monitor/operlog/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" >
       <el-form-item label="模块" prop="title">
         <el-input v-model="queryParams.title" placeholder="请输入系统模块" clearable @keyup.enter.native="handleQuery" class="se" />
       </el-form-item>
@@ -39,7 +39,7 @@
       </el-col>
       <el-col :span="1.5"><el-button type="danger" icon="el-icon-delete" @click="handleClean" v-hasPermi="['monitor:operlog:remove']">清空</el-button></el-col>
       <el-col :span="1.5"><el-button type="warning" icon="el-icon-download" @click="handleExport" v-hasPermi="['monitor:operlog:export']">导出</el-button></el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      
     </el-row>
     <el-table ref="tables" border :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange" height="calc(100vh - 328px)">
       <el-table-column type="selection" width="55" align="center" />

+ 2 - 2
admin-ui/src/views/system/config/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true"  label-width="68px">
       <el-form-item label="参数名称" prop="configName">
         <el-input v-model="queryParams.configName" placeholder="请输入参数名称" clearable @keyup.enter.native="handleQuery" class="se"/>
       </el-form-item>
@@ -23,7 +23,7 @@
       <el-col :span="1.5"><el-button type="danger" icon="el-icon-delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:config:remove']">删除</el-button></el-col>
       <el-col :span="1.5"><el-button type="warning" icon="el-icon-download" @click="handleExport" v-hasPermi="['system:config:export']">导出</el-button></el-col>
       <el-col :span="1.5"><el-button type="danger" icon="el-icon-refresh" @click="handleRefreshCache" v-hasPermi="['system:config:remove']">刷新缓存</el-button></el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      
     </el-row>
     <el-table border :data="configList" @selection-change="handleSelectionChange" height="calc(100vh - 273px)">
       <el-table-column type="selection" width="55" align="center" />

+ 25 - 54
admin-ui/src/views/system/dept/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" >
       <el-form-item label="部门名称" prop="deptName">
-        <el-input v-model="queryParams.deptName" placeholder="请输入部门名称" clearable @keyup.enter.native="handleQuery" class="se"/>
+        <el-input v-model="queryParams.deptName" placeholder="请输入部门名称" clearable @keyup.enter.native="handleQuery" class="se" />
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="部门状态" clearable>
@@ -16,9 +16,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5"><el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-hasPermi="['system:dept:add']">新增</el-button></el-col>
       <el-col :span="1.5"><el-button type="info" icon="el-icon-sort" @click="toggleExpandAll">展开/折叠</el-button></el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-if="refreshTable" :data="deptList" row-key="deptId" :default-expand-all="isExpandAll" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
@@ -34,13 +32,11 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" >
+      <el-table-column label="操作" align="center">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dept:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)" v-hasPermi="['system:dept:add']">新增</el-button>
-          <el-button v-if="scope.row.parentId != 0" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">
-            删除
-          </el-button>
+          <el-button v-if="scope.row.parentId != 0" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">删除</el-button>
         </template>
       </el-table-column>
       <template slot="empty">
@@ -51,41 +47,16 @@
     <!-- 添加或修改部门对话框 -->
     <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
-          <el-col :span="24" v-if="form.parentId !== 0">
-            <el-form-item label="上级部门" prop="parentId">
-              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="部门名称" prop="deptName"><el-input v-model="form.deptName" placeholder="请输入部门名称" /></el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="显示排序" prop="orderNum"><el-input-number v-model="form.orderNum" controls-position="right" :min="0" /></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="负责人" prop="leader"><el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" /></el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="联系电话" prop="phone"><el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" /></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="邮箱" prop="email"><el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" /></el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="部门状态">
-              <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <el-form-item label="上级科室" prop="parentId" v-if="form.parentId !== 0">
+          <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级科室" />
+        </el-form-item>
+        <el-form-item label="科室名称" prop="deptName"><el-input v-model="form.deptName" placeholder="请输入科室名称" /></el-form-item>
+        <el-form-item label="显示排序" prop="orderNum"><el-input-number v-model="form.orderNum" controls-position="right" :min="0" /></el-form-item>
+        <el-form-item label="科室状态">
+          <el-radio-group v-model="form.status">
+            <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -155,7 +126,7 @@ export default {
   methods: {
     /** 查询部门列表 */
     getList() {
-      listDept(this.queryParams).then(response => {
+      listDept(this.queryParams).then((response) => {
         this.deptList = this.handleTree(response.data, 'deptId');
       });
     },
@@ -205,8 +176,8 @@ export default {
         this.form.parentId = row.deptId;
       }
       this.open = true;
-      this.title = '添加部门';
-      listDept().then(response => {
+      this.title = '添加科室';
+      listDept().then((response) => {
         this.deptOptions = this.handleTree(response.data, 'deptId');
       });
     },
@@ -222,10 +193,10 @@ export default {
     handleUpdate(row) {
       this.reset();
       this.open = true;
-      this.title = '修改部门';
-      getDept(row.deptId).then(response => {
+      this.title = '修改科室';
+      getDept(row.deptId).then((response) => {
         this.form = response.data;
-        listDeptExcludeChild(row.deptId).then(response => {
+        listDeptExcludeChild(row.deptId).then((response) => {
           this.deptOptions = this.handleTree(response.data, 'deptId');
           if (this.deptOptions.length == 0) {
             const noResultsOptions = { deptId: this.form.parentId, deptName: this.form.parentName, children: [] };
@@ -235,17 +206,17 @@ export default {
       });
     },
     /** 提交按钮 */
-    submitForm: function() {
-      this.$refs['form'].validate(valid => {
+    submitForm: function () {
+      this.$refs['form'].validate((valid) => {
         if (valid) {
           if (this.form.deptId != undefined) {
-            updateDept(this.form).then(response => {
+            updateDept(this.form).then((response) => {
               this.$modal.msgSuccess('修改成功');
               this.open = false;
               this.getList();
             });
           } else {
-            addDept(this.form).then(response => {
+            addDept(this.form).then((response) => {
               this.$modal.msgSuccess('新增成功');
               this.open = false;
               this.getList();
@@ -258,7 +229,7 @@ export default {
     handleDelete(row) {
       this.$modal
         .confirm('是否确认删除名称为"' + row.deptName + '"的数据项?')
-        .then(function() {
+        .then(function () {
           return delDept(row.deptId);
         })
         .then(() => {

+ 2 - 2
admin-ui/src/views/system/dict/data.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true"  label-width="68px">
       <el-form-item label="字典名称" prop="dictType">
         <el-select v-model="queryParams.dictType"><el-option v-for="item in typeOptions" :key="item.dictId" :label="item.dictName" :value="item.dictType"/></el-select>
       </el-form-item>
@@ -13,7 +13,7 @@
       <el-col :span="1.5"><el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-hasPermi="['system:dict:add']">新增</el-button></el-col>
       <el-col :span="1.5"><el-button type="success" icon="el-icon-edit" :disabled="single" @click="handleUpdate" v-hasPermi="['system:dict:edit']">修改</el-button></el-col>
       <el-col :span="1.5"><el-button type="danger" icon="el-icon-delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:dict:remove']">删除</el-button></el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      
     </el-row>
     <el-table border :data="dataList" @selection-change="handleSelectionChange" height="calc(100vh - 273px)">
       <el-table-column type="selection" width="55" align="center" />

+ 2 - 2
admin-ui/src/views/system/dict/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true"  label-width="68px">
       <el-form-item label="字典名称" prop="dictName">
         <el-input v-model="queryParams.dictName" placeholder="请输入字典名称" clearable @keyup.enter.native="handleQuery" class="se" />
       </el-form-item>
@@ -22,7 +22,7 @@
       <el-col :span="1.5"><el-button type="success" icon="el-icon-edit" :disabled="single" @click="handleUpdate" v-hasPermi="['system:dict:edit']">修改</el-button></el-col>
       <el-col :span="1.5"><el-button type="danger" icon="el-icon-delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:dict:remove']">删除</el-button></el-col>
       <el-col :span="1.5"><el-button type="danger" icon="el-icon-refresh" @click="handleRefreshCache" v-hasPermi="['system:dict:remove']">刷新缓存</el-button></el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      
     </el-row>
     <el-table border :data="typeList" @selection-change="handleSelectionChange" height="calc(100vh - 273px)">
       <el-table-column type="selection" width="55" align="center" />

+ 2 - 2
admin-ui/src/views/system/menu/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container" style="overflow:auto;">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" >
       <el-form-item label="菜单名称" prop="menuName">
         <el-input v-model="queryParams.menuName" placeholder="请输入菜单名称" clearable @keyup.enter.native="handleQuery" class="se"/>
       </el-form-item>
@@ -17,7 +17,7 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5"><el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-hasPermi="['system:menu:add']">新增</el-button></el-col>
       <el-col :span="1.5"><el-button type="info" icon="el-icon-sort" @click="toggleExpandAll">展开/折叠</el-button></el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      
     </el-row>
     <el-table v-if="refreshTable" :data="menuList" border row-key="menuId" :default-expand-all="isExpandAll" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
       <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>

+ 2 - 2
admin-ui/src/views/system/notice/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true"  label-width="68px">
       <el-form-item label="公告标题" prop="noticeTitle">
         <el-input v-model="queryParams.noticeTitle" placeholder="请输入公告标题" clearable @keyup.enter.native="handleQuery" class="se" />
       </el-form-item>
@@ -18,7 +18,7 @@
       <el-col :span="1.5"><el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-hasPermi="['system:notice:add']">新增</el-button></el-col>
       <el-col :span="1.5"><el-button type="success" icon="el-icon-edit" :disabled="single" @click="handleUpdate" v-hasPermi="['system:notice:edit']">修改</el-button></el-col>
       <el-col :span="1.5"><el-button type="danger" icon="el-icon-delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:notice:remove']">删除</el-button></el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      
     </el-row>
     <el-table border :data="noticeList" @selection-change="handleSelectionChange" height="calc(100vh - 273px)">
       <el-table-column type="selection" width="55" align="center" />

+ 2 - 2
admin-ui/src/views/system/post/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true"  label-width="68px">
       <el-form-item label="岗位名称" prop="postName">
         <el-input v-model="queryParams.postName" placeholder="请输入岗位名称" clearable @keyup.enter.native="handleQuery" class="se"/>
       </el-form-item>
@@ -19,7 +19,7 @@
       <el-col :span="1.5"><el-button type="success" icon="el-icon-edit" :disabled="single" @click="handleUpdate" v-hasPermi="['system:post:edit']">修改</el-button></el-col>
       <el-col :span="1.5"><el-button type="danger" icon="el-icon-delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:post:remove']">删除</el-button></el-col>
       <el-col :span="1.5"><el-button type="warning" icon="el-icon-download" @click="handleExport" v-hasPermi="['system:post:export']">导出</el-button></el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      
     </el-row>
     <el-table :data="postList" border @selection-change="handleSelectionChange" height="calc(100vh - 273px)">
       <el-table-column type="selection" width="55" align="center" />

+ 2 - 2
admin-ui/src/views/system/role/authUser.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" >
       <el-form-item label="账号" prop="userName">
         <el-input v-model="queryParams.userName" placeholder="请输入账号" clearable @keyup.enter.native="handleQuery" class="se" />
       </el-form-item>
@@ -18,7 +18,7 @@
         <el-button type="danger" icon="el-icon-circle-close" :disabled="multiple" @click="cancelAuthUserAll" v-hasPermi="['system:role:remove']">批量取消授权</el-button>
       </el-col>
       <el-col :span="1.5"><el-button type="warning" icon="el-icon-close" @click="handleClose">关闭</el-button></el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      
     </el-row>
     <el-table :data="userList" border @selection-change="handleSelectionChange" height="calc(100vh - 273px)">
       <el-table-column type="selection" width="55" align="center" />

+ 2 - 2
admin-ui/src/views/system/role/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" >
       <el-form-item label="角色名称" prop="roleName">
         <el-input v-model="queryParams.roleName" placeholder="请输入角色名称" clearable @keyup.enter.native="handleQuery" class="se" />
       </el-form-item>
@@ -22,7 +22,7 @@
       <el-col :span="1.5"><el-button type="success" icon="el-icon-edit" :disabled="single" @click="handleUpdate" v-hasPermi="['system:role:edit']">修改</el-button></el-col>
       <el-col :span="1.5"><el-button type="danger" icon="el-icon-delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:role:remove']">删除</el-button></el-col>
       <el-col :span="1.5"><el-button type="warning" icon="el-icon-download" @click="handleExport" v-hasPermi="['system:role:export']">导出</el-button></el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      
     </el-row>
     <el-table :data="roleList" border @selection-change="handleSelectionChange" height="calc(100vh - 273px)">
       <el-table-column type="selection" width="55" align="center" />

+ 2 - 2
admin-ui/src/views/system/user/index.vue

@@ -19,7 +19,7 @@
 			</el-col>
 			<!--用户数据-->
 			<el-col :span="20" :xs="24">
-				<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+				<el-form :model="queryParams" ref="queryForm" :inline="true" >
 					<el-form-item label="账号" prop="userName">
 						<el-input v-model="queryParams.userName" placeholder="请输入账号" clearable @keyup.enter.native="handleQuery" class="se" />
 					</el-form-item>
@@ -51,7 +51,7 @@
 					</el-col>
 					<el-col :span="1.5"><el-button type="info" icon="el-icon-upload2" @click="handleImport" v-hasPermi="['system:user:import']">导入</el-button></el-col>
 					<el-col :span="1.5"><el-button type="warning" icon="el-icon-download" @click="handleExport" v-hasPermi="['system:user:export']">导出</el-button></el-col>
-					<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+					
 				</el-row>
 				<el-table border :data="userList" @selection-change="handleSelectionChange" height="calc(100vh - 273px)">
 					<el-table-column type="selection" align="center" width="50" />

+ 0 - 108
admin-ui/src/views/work/dept/edit.vue

@@ -1,108 +0,0 @@
-<template>
-  <div class="cmain">
-    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-      <el-form-item label="父级科室" prop="parentId">
-        <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="请选择父级科室" />
-      </el-form-item>
-      <el-form-item label="科室名称" prop="deptname">
-        <el-input v-model="form.deptname" placeholder="请输入科室名称" />
-      </el-form-item>
-      <el-form-item label="科室描述">
-        <editor v-model="form.deptdesc" :min-height="192"/>
-      </el-form-item>
-    </el-form>
-    <div class="mfooter">
-      <el-button type="primary" @click="submitForm">确 定</el-button>
-      <el-button @click="$layer.close(layerid)">取 消</el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-import Treeselect from "@riophae/vue-treeselect";
-export default {
-  components: {
-    Treeselect
-  },
-  data() {
-    return {
-      // 医院科室树选项
-      deptOptions: [],
-      form: { orderNum: 0, state: 0 },
-      // 表单校验
-      rules: {
-        parentId: [
-          { required: true, message: "父级科室不能为空", trigger: "blur" }
-        ],
-        deptname: [
-          { required: true, message: "科室名称不能为空", trigger: "blur" }
-        ],
-        deptdesc: [
-          { required: true, message: "科室描述不能为空", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  props: {
-    param: {
-      type: Object,
-      default: () => {
-        return {};
-      }
-    },
-    layerid: {
-      type: String
-    }
-  },
-  mounted() {
-    this.getTreeselect()
-    if (this.param.id) {
-      this.ajax({ url: '/work/dept/detail/' + this.param.id }).then((response) => {
-        this.form = response.data;
-      });
-    }else{
-      this.form.parentId = this.param.parentId
-    }
-  },
-  methods: {
-    getTreeselect() {
-      this.ajax({ url: '/work/dept/list' }).then((response) => {
-        this.deptOptions = [];
-        const data = { id: 0, deptname: '全科科室', children: [] };
-        data.children = this.handleTree(response.rows, "id", "parentId");
-        this.deptOptions.push(data);
-      });
-    },
-    /** 转换医院科室数据结构 */
-    normalizer(node) {
-      if (node.children && !node.children.length) {
-        delete node.children;
-      }
-      return {
-        id: node.id,
-        label: node.deptname,
-        children: node.children
-      };
-    },
-    submitForm() {
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          if (this.form.id) {
-            this.ajax({ method: 'post', url: '/work/dept/edit', data: this.form }).then((response) => {
-              this.$modal.msgSuccess('修改成功');
-              this.$layer.close(this.layerid);
-              this.$parent.getList();
-            });
-          } else {
-            this.ajax({ method: 'post', url: '/work/dept/add', data: this.form }).then((response) => {
-              this.$modal.msgSuccess('新增成功');
-              this.$layer.close(this.layerid);
-              this.$parent.getList();
-            });
-          }
-        }
-      });
-    }
-  }
-};
-</script>

+ 0 - 260
admin-ui/src/views/work/dept/index.vue

@@ -1,260 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="auto">
-      <el-form-item label="科室名称" prop="deptname">
-        <el-input
-          v-model="queryParams.deptname"
-          placeholder="请输入科室名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-	    <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          @click="op('add')"
-          v-hasPermi="['work:dept:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          plain
-          icon="el-icon-sort"
-          @click="toggleExpandAll"
-        >展开/折叠</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table
-      v-if="refreshTable"
-      border
-      :data="deptList"
-      row-key="id"
-      :default-expand-all="isExpandAll"
-      @selection-change="selects"
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-      height="calc(100vh - 270px)"
-    >
-      <el-table-column label="科室名称" align="center" prop="deptname" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            type="text"
-            icon="el-icon-edit"
-            @click="op('edit', scope.row)"
-            v-hasPermi="['work:dept:edit']"
-          >修改</el-button>
-          <el-button
-            type="text"
-            icon="el-icon-plus"
-            @click="op('add', scope.row)"
-            v-hasPermi="['work:dept:add']"
-          >新增</el-button>
-          <el-button
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['work:dept:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-  </div>
-</template>
-
-<script>
-import { listDept, getDept, delDept, addDept, updateDept } from "@/api/work/dept";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import edit from './edit';
-
-export default {
-  name: "Dept",
-  components: {
-    Treeselect
-  },
-  data() {
-    return {
-      ids: [],
-      // 显示搜索条件
-      showSearch: true,
-      // 医院科室表格数据
-      deptList: [],
-      // 医院科室树选项
-      deptOptions: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 是否展开,默认全部展开
-      isExpandAll: false,
-      // 重新渲染表格状态
-      refreshTable: true,
-      // 查询参数
-      queryParams: {
-        deptname: null,
-        deptdesc: null,
-        parentId: 0,
-        pageNum: 1,
-        pageSize: 10,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        parentId: [
-          { required: true, message: "父级ID不能为空", trigger: "blur" }
-        ],
-        deptname: [
-          { required: true, message: "科室名称不能为空", trigger: "blur" }
-        ],
-        deptdesc: [
-          { required: true, message: "科室描述不能为空", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    selects(rows) {
-      this.ids = rows.map((item) => item.id);
-    },
-    op(tag, row) {
-      if (tag == 'add') {
-        const parentId = row != null && row.id ? row.id : 0;
-        this.iframe({ obj: edit, param: { parentId: parentId}, title: '新增科室', width: '1000px', height: '700px' });
-      }
-      if (tag == 'edit') {
-        const id = row.id || this.ids[0];
-        this.iframe({ obj: edit, param: { id: id}, title: '编辑科室', width: '1000px', height: '700px' });
-      }
-    },
-    /** 查询医院科室列表 */
-    getList() {
-      this.ajax({ url: '/work/dept/list', data: this.queryParams }).then((response) => {
-        this.deptList = this.handleTree(response.rows, "id", "parentId");
-      });
-    },
-    /** 转换医院科室数据结构 */
-    normalizer(node) {
-      if (node.children && !node.children.length) {
-        delete node.children;
-      }
-      return {
-        id: node.id,
-        label: node.deptname,
-        children: node.children
-      };
-    },
-	/** 查询医院科室下拉树结构 */
-    getTreeselect() {
-      listDept().then(response => {
-        this.deptOptions = [];
-        const data = { id: 0, deptname: '顶级节点', children: [] };
-        data.children = this.handleTree(response.rows, "id", "parentId");
-        this.deptOptions.push(data);
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        parentId: null,
-        deptname: null,
-        deptdesc: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd(row) {
-      this.reset();
-      this.getTreeselect();
-      if (row != null && row.id) {
-        this.form.parentId = row.id;
-      } else {
-        this.form.parentId = 0;
-      }
-      this.open = true;
-      this.title = "添加医院科室";
-    },
-    /** 展开/折叠操作 */
-    toggleExpandAll() {
-      this.refreshTable = false;
-      this.isExpandAll = !this.isExpandAll;
-      this.$nextTick(() => {
-        this.refreshTable = true;
-      });
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      this.getTreeselect();
-      if (row != null) {
-        this.form.parentId = row.id;
-      }
-      this.ajax({ url: '/work/dept/detail/' + row.id }).then((response) => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改医院科室";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            this.ajax({ method: 'post',url: '/work/dept/edit', data: this.form }).then((response) => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            this.ajax({ method: 'post',url: '/work/dept/add', data: this.form }).then((response) => {
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      this.$modal.confirm('是否确认删除医院科室编号为"' + row.id + '"的数据项?').then(function() {
-        return delDept(row.id);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    }
-  }
-};
-</script>

+ 1 - 1
admin-ui/src/views/work/introduction/index.vue

@@ -13,7 +13,7 @@
         <el-button type="primary" icon="el-icon-plus" :disabled="ids.length > 0" @click="op('add')" v-hasPermi="['work:introduction:add']">新增</el-button>
         <el-button type="success" icon="el-icon-edit" :disabled="ids.length != 1" @click="op('edit',ids)" v-hasPermi="['work:introduction:edit']">修改</el-button>
         <el-button type="danger" icon="el-icon-delete" :disabled="ids.length == 0" @click="del" v-hasPermi="['work:introduction:remove']">删除{{ids.length>0?'('+ids.length+')':''}}</el-button>
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        
     </el-row>
 
     <el-table :data="response.rows" border @selection-change="selects" height="calc(100vh - 270px)">

+ 1 - 2
admin-ui/src/views/work/knowledge/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" @submit.native.prevent v-show="showSearch">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" @submit.native.prevent>
       <el-form-item label="标题" prop="title">
         <el-input v-model="queryParams.title" placeholder="请输入标题" @keyup.enter.native="handleQuery" clearable />
       </el-form-item>
@@ -21,7 +21,6 @@
       <el-button type="primary" icon="el-icon-plus" :disabled="ids.length > 0" @click="op('add')" v-hasPermi="['work:knowledge:add']">新增</el-button>
       <el-button type="success" icon="el-icon-edit" :disabled="ids.length != 1" @click="op('edit', ids)" v-hasPermi="['work:knowledge:edit']">修改</el-button>
       <el-button type="danger" icon="el-icon-delete" :disabled="ids.length == 0" @click="del" v-hasPermi="['work:knowledge:remove']">删除{{ ids.length > 0 ? '(' + ids.length + ')' : '' }}</el-button>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table :data="response.rows" border @selection-change="selects" height="calc(100vh - 270px)">

+ 0 - 11
ruoyi-generator/src/main/resources/vm/vue/edit.vue.vm

@@ -130,17 +130,6 @@ export default {
       }
     };
   },
-  props: {
-    param: {
-      type: Object,
-      default: () => {
-        return {};
-      }
-    },
-    layerid: {
-      type: String
-    }
-  },
   mounted() {
     if (this.param.id) {
       this.ajax({ url: '/${moduleName}/${businessName}/detail/' + this.param.id }).then(response => {

+ 1 - 5
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" @submit.native.prevent v-show="showSearch">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" @submit.native.prevent>
 #foreach($column in $columns)
 #if($column.query)
 #set($dictType=$column.dictType)
@@ -55,7 +55,6 @@
         <el-button type="primary" icon="el-icon-plus" :disabled="ids.length > 0" @click="op('add')" v-hasPermi="['${moduleName}:${businessName}:add']">新增</el-button>
         <el-button type="success" icon="el-icon-edit" :disabled="ids.length != 1" @click="op('edit',ids)" v-hasPermi="['${moduleName}:${businessName}:edit']">修改</el-button>
         <el-button type="danger" icon="el-icon-delete" :disabled="ids.length == 0" @click="del" v-hasPermi="['${moduleName}:${businessName}:remove']">删除{{ids.length>0?'('+ids.length+')':''}}</el-button>
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table :data="response.rows" border @selection-change="selects" height="calc(100vh - 270px)">
@@ -119,9 +118,6 @@ export default {
 #end
   data() {
     return {
-      ids: [],
-      showSearch:true,
-      response: {},
 #if($table.sub)
       // ${subTable.functionName}表格数据
       ${subclassName}List: [],