1.授权菜单

src/views/system/UserList.vue

@@ -18,23 +18,23 @@
             </a-form-item>
           </a-col>
 
-<!--          <a-col :md="6" :sm="8">-->
-<!--            <a-form-item label="性别">-->
-<!--              <a-select v-model="queryParam.sex" placeholder="请选择性别">-->
-<!--                <a-select-option value="">请选择</a-select-option>-->
-<!--                <a-select-option value="1">男</a-select-option>-->
-<!--                <a-select-option value="2">女</a-select-option>-->
-<!--              </a-select>-->
-<!--            </a-form-item>-->
-<!--          </a-col>-->
+          <!--          <a-col :md="6" :sm="8">-->
+          <!--            <a-form-item label="性别">-->
+          <!--              <a-select v-model="queryParam.sex" placeholder="请选择性别">-->
+          <!--                <a-select-option value="">请选择</a-select-option>-->
+          <!--                <a-select-option value="1">男</a-select-option>-->
+          <!--                <a-select-option value="2">女</a-select-option>-->
+          <!--              </a-select>-->
+          <!--            </a-form-item>-->
+          <!--          </a-col>-->
 
 
           <template v-if="toggleSearchStatus">
-<!--            <a-col :md="6" :sm="8">-->
-<!--              <a-form-item label="真实名字">-->
-<!--                <a-input placeholder="请输入真实名字" v-model="queryParam.realname"></a-input>-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
+            <!--            <a-col :md="6" :sm="8">-->
+            <!--              <a-form-item label="真实名字">-->
+            <!--                <a-input placeholder="请输入真实名字" v-model="queryParam.realname"></a-input>-->
+            <!--              </a-form-item>-->
+            <!--            </a-col>-->
 
             <a-col :md="6" :sm="8">
               <a-form-item label="手机号码">
@@ -75,7 +75,7 @@
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
-      <a-button type="primary" icon="hdd" @click="recycleBinVisible=true">回收站</a-button>
+<!--      <a-button type="primary" icon="hdd" @click="recycleBinVisible=true">回收站</a-button>-->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay" @click="handleMenuClick">
           <a-menu-item key="1">
@@ -184,241 +184,241 @@
 </template>
 
 <script>
-  import UserModal from './modules/UserModal'
-  import PasswordModal from './modules/PasswordModal'
-  import {putAction,getFileAccessHttpUrl} from '@/api/manage';
-  import {frozenBatch} from '@/api/api'
-  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
-  import SysUserAgentModal from "./modules/SysUserAgentModal";
-  import JInput from '@/components/jeecg/JInput'
-  import UserRecycleBinModal from './modules/UserRecycleBinModal'
-  import JSuperQuery from '@/components/jeecg/JSuperQuery'
-
-  const statusMap = {
-    1: {
-      color: 'green',
-      text: '正常'
-    },
-    2: {
-      color: 'red',
-      text: '冻结'
-    }
+import UserModal from './modules/UserModal'
+import PasswordModal from './modules/PasswordModal'
+import {putAction,getFileAccessHttpUrl} from '@/api/manage';
+import {frozenBatch} from '@/api/api'
+import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+import SysUserAgentModal from "./modules/SysUserAgentModal";
+import JInput from '@/components/jeecg/JInput'
+import UserRecycleBinModal from './modules/UserRecycleBinModal'
+import JSuperQuery from '@/components/jeecg/JSuperQuery'
+
+const statusMap = {
+  1: {
+    color: 'green',
+    text: '正常'
+  },
+  2: {
+    color: 'red',
+    text: '冻结'
   }
-
-  export default {
-    name: "UserList",
-    mixins: [JeecgListMixin],
-    components: {
-      SysUserAgentModal,
-      UserModal,
-      PasswordModal,
-      JInput,
-      UserRecycleBinModal,
-      JSuperQuery
-    },
-    data() {
-      return {
-        description: '这是用户管理页面',
-        queryParam: {},
-        recycleBinVisible: false,
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title: '用户账号',
-            align: "center",
-            dataIndex: 'username',
-            width: 120,
-            sorter: true
-          },
-          {
-            title: '用户姓名',
-            align: "center",
-            width: 100,
-            dataIndex: 'realname',
-          },
-          // {
-          //   title: '头像',
-          //   align: "center",
-          //   visible:false,
-          //   width: 120,
-          //   dataIndex: 'avatar',
-          //   scopedSlots: {customRender: "avatarslot"}
-          // },
-
-          // {
-          //   title: '性别',
-          //   align: "center",
-          //   width: 80,
-          //   dataIndex: 'sex_dictText',
-          //   sorter: true
-          // },
-          // {
-          //   title: '生日',
-          //   align: "center",
-          //   visible:false,
-          //   width: 100,
-          //   dataIndex: 'birthday'
-          // },
-          {
-            title: '手机号码',
-            align: "center",
-            width: 110,
-            dataIndex: 'phone'
-          }, {
-            title: '岗位',
-            align: "center",
-            width: 100,
-            dataIndex: 'position'
-          },
-          {
-            title: '归属部门',
-            align: "center",
-            width: 180,
-            dataIndex: 'orgCodeTxt'
-          },
-          {
-            title: '角色',
-            align: "center",
-            width: 180,
-            dataIndex: 'roleName'
-          },
-          // {
-          //   title: '负责部门',
-          //   align: "center",
-          //   width: 180,
-          //   dataIndex: 'departIds_dictText'
-          // },
-          {
-            title: '状态',
-            align: "center",
-            width: 80,
-            dataIndex: 'status',
-            scopedSlots: { customRender: 'statusSlot' }
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            scopedSlots: {customRender: 'action'},
-            align: "center",
-            width: 170
+}
+
+export default {
+  name: "UserList",
+  mixins: [JeecgListMixin],
+  components: {
+    SysUserAgentModal,
+    UserModal,
+    PasswordModal,
+    JInput,
+    UserRecycleBinModal,
+    JSuperQuery
+  },
+  data() {
+    return {
+      description: '这是用户管理页面',
+      queryParam: {},
+      recycleBinVisible: false,
+      columns: [
+        {
+          title: '#',
+          dataIndex: '',
+          key:'rowIndex',
+          width:60,
+          align:"center",
+          customRender:function (t,r,index) {
+            return parseInt(index)+1;
           }
-
-        ],
-        url: {
-          syncUser: "/act/process/extActProcess/doSyncUser",
-          list: "/sys/user/list",
-          delete: "/sys/user/delete",
-          deleteBatch: "/sys/user/deleteBatch",
-          exportXlsUrl: "/sys/user/exportXls",
-          importExcelUrl: "sys/user/importExcel",
         },
-      }
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      }
-    },
-    filters: {
-      statusColorFilter (type) {
-        return statusMap[type].color
+        {
+          title: '用户账号',
+          align: "center",
+          dataIndex: 'username',
+          width: 120,
+          sorter: true
+        },
+        {
+          title: '用户姓名',
+          align: "center",
+          width: 100,
+          dataIndex: 'realname',
+        },
+        // {
+        //   title: '头像',
+        //   align: "center",
+        //   visible:false,
+        //   width: 120,
+        //   dataIndex: 'avatar',
+        //   scopedSlots: {customRender: "avatarslot"}
+        // },
+
+        // {
+        //   title: '性别',
+        //   align: "center",
+        //   width: 80,
+        //   dataIndex: 'sex_dictText',
+        //   sorter: true
+        // },
+        // {
+        //   title: '生日',
+        //   align: "center",
+        //   visible:false,
+        //   width: 100,
+        //   dataIndex: 'birthday'
+        // },
+        {
+          title: '手机号码',
+          align: "center",
+          width: 110,
+          dataIndex: 'phone'
+        }, {
+          title: '岗位',
+          align: "center",
+          width: 100,
+          dataIndex: 'position'
+        },
+        {
+          title: '归属部门',
+          align: "center",
+          width: 180,
+          dataIndex: 'orgCodeTxt'
+        },
+        {
+          title: '角色',
+          align: "center",
+          width: 180,
+          dataIndex: 'roleName'
+        },
+        // {
+        //   title: '负责部门',
+        //   align: "center",
+        //   width: 180,
+        //   dataIndex: 'departIds_dictText'
+        // },
+        {
+          title: '状态',
+          align: "center",
+          width: 80,
+          dataIndex: 'status',
+          scopedSlots: { customRender: 'statusSlot' }
+        },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          scopedSlots: {customRender: 'action'},
+          align: "center",
+          width: 170
+        }
+
+      ],
+      url: {
+        syncUser: "/act/process/extActProcess/doSyncUser",
+        list: "/sys/user/list",
+        delete: "/sys/user/delete",
+        deleteBatch: "/sys/user/deleteBatch",
+        exportXlsUrl: "/sys/user/exportXls",
+        importExcelUrl: "sys/user/importExcel",
       },
-      statusFilter (type) {
-        return statusMap[type].text
-      }
+    }
+  },
+  computed: {
+    importExcelUrl: function(){
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    }
+  },
+  filters: {
+    statusColorFilter (type) {
+      return statusMap[type].color
+    },
+    statusFilter (type) {
+      return statusMap[type].text
+    }
+  },
+  methods: {
+    getAvatarView: function (avatar) {
+      return getFileAccessHttpUrl(avatar)
     },
-    methods: {
-      getAvatarView: function (avatar) {
-        return getFileAccessHttpUrl(avatar)
-      },
 
-      batchFrozen: function (status) {
-        if (this.selectedRowKeys.length <= 0) {
-          this.$message.warning('请选择一条记录！');
-          return false;
-        } else {
-          let ids = "";
-          let that = this;
-          let isAdmin = false;
-          that.selectionRows.forEach(function (row) {
-            if (row.username == 'admin') {
-              isAdmin = true;
-            }
-          });
-          if (isAdmin) {
-            that.$message.warning('管理员账号不允许此操作,请重新选择！');
-            return;
-          }
-          that.selectedRowKeys.forEach(function (val) {
-            ids += val + ",";
-          });
-          that.$confirm({
-            title: "确认操作",
-            content: "是否" + (status == 1 ? "解冻" : "冻结") + "选中账号?",
-            onOk: function () {
-              frozenBatch({ids: ids, status: status}).then((res) => {
-                if (res.success) {
-                  that.$message.success(res.message);
-                  that.loadData();
-                  that.onClearSelected();
-                } else {
-                  that.$message.warning(res.message);
-                }
-              });
-            }
-          });
-        }
-      },
-      handleMenuClick(e) {
-        if (e.key == 1) {
-          this.batchDel();
-        } else if (e.key == 2) {
-          this.batchFrozen(2);
-        } else if (e.key == 3) {
-          this.batchFrozen(1);
-        }
-      },
-      handleFrozen: function (id, status, username) {
+    batchFrozen: function (status) {
+      if (this.selectedRowKeys.length <= 0) {
+        this.$message.warning('请选择一条记录！');
+        return false;
+      } else {
+        let ids = "";
         let that = this;
-        //TODO 后台校验管理员角色
-        if ('admin' == username) {
-          that.$message.warning('管理员账号不允许此操作！');
+        let isAdmin = false;
+        that.selectionRows.forEach(function (row) {
+          if (row.username == 'admin') {
+            isAdmin = true;
+          }
+        });
+        if (isAdmin) {
+          that.$message.warning('管理员账号不允许此操作,请重新选择！');
           return;
         }
-        frozenBatch({ids: id, status: status}).then((res) => {
-          if (res.success) {
-            that.$message.success(res.message);
-            that.loadData();
-          } else {
-            that.$message.warning(res.message);
+        that.selectedRowKeys.forEach(function (val) {
+          ids += val + ",";
+        });
+        that.$confirm({
+          title: "确认操作",
+          content: "是否" + (status == 1 ? "解冻" : "冻结") + "选中账号?",
+          onOk: function () {
+            frozenBatch({ids: ids, status: status}).then((res) => {
+              if (res.success) {
+                that.$message.success(res.message);
+                that.loadData();
+                that.onClearSelected();
+              } else {
+                that.$message.warning(res.message);
+              }
+            });
           }
         });
-      },
-      handleChangePassword(username) {
-        this.$refs.passwordmodal.show(username);
-      },
-      passwordModalOk() {
-        //TODO 密码修改完成 不需要刷新页面，可以把datasource中的数据更新一下
-      },
-      onSyncFinally({isToLocal}) {
-        // 同步到本地时刷新下数据
-        if (isToLocal) {
-          this.loadData()
+      }
+    },
+    handleMenuClick(e) {
+      if (e.key == 1) {
+        this.batchDel();
+      } else if (e.key == 2) {
+        this.batchFrozen(2);
+      } else if (e.key == 3) {
+        this.batchFrozen(1);
+      }
+    },
+    handleFrozen: function (id, status, username) {
+      let that = this;
+      //TODO 后台校验管理员角色
+      if ('admin' == username) {
+        that.$message.warning('管理员账号不允许此操作！');
+        return;
+      }
+      frozenBatch({ids: id, status: status}).then((res) => {
+        if (res.success) {
+          that.$message.success(res.message);
+          that.loadData();
+        } else {
+          that.$message.warning(res.message);
         }
-      },
-    }
-
+      });
+    },
+    handleChangePassword(username) {
+      this.$refs.passwordmodal.show(username);
+    },
+    passwordModalOk() {
+      //TODO 密码修改完成 不需要刷新页面，可以把datasource中的数据更新一下
+    },
+    onSyncFinally({isToLocal}) {
+      // 同步到本地时刷新下数据
+      if (isToLocal) {
+        this.loadData()
+      }
+    },
   }
+
+}
 </script>
 <style scoped>
-  @import '~@assets/less/common.less'
+@import '~@assets/less/common.less'
 </style>

src/views/system/modules/UserRoleModal.vue

@@ -22,7 +22,7 @@
           :expandedKeys="expandedKeysss"
           :checkStrictly="checkStrictly">
           <span slot="hasDatarule" slot-scope="{slotTitle,ruleFlag}">
-            {{ slotTitle }}<a-icon v-if="1!==1" type="align-left" style="margin-left:5px;color: red;"></a-icon>
+            {{ slotTitle }}<a-icon v-show="false" type="align-left" style="margin-left:5px;color: red;"></a-icon>
           </span>
         </a-tree>
       </a-form-item>
@@ -49,7 +49,7 @@
       <a-button @click="handleSubmit(true)" type="primary" :loading="loading">保存并关闭</a-button>
     </div>
 
-<!--    <role-datarule-modal ref="datarule"></role-datarule-modal>-->
+    <role-datarule-modal ref="datarule"></role-datarule-modal>
 
   </a-drawer>