commit

orange-admin-web/src/views/generated/formTeacher/index.vue

@@ -63,7 +63,7 @@
               <span>{{formatDateByStatsType(scope.row.registerDate, 'day')}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" fixed="right" width="150px;">
+          <el-table-column label="操作" fixed="right">
             <template slot-scope="scope">
               <el-button @click="onFormEditTeacherClick(scope.row)" type="text" size="mini"
                 :disabled="!checkPermCodeExist('formTeacher:formTeacher:formEditTeacher')">

orange-admin-web/src/views/layout/components/sidebar/sidebar.vue

@@ -66,7 +66,7 @@ export default {
     },
     selectMenu (index, path) {
       if (this.getCurrentMenuId === index) return;
-      // <EFBFBD><EFBFBD>ҳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>tags<EFBFBD><EFBFBD>cachePage
+      // 单页面清空所有tags和cachePage
       if (!this.multiTag) {
         this.clearAllTags();
       }

orange-admin-web/src/views/login/index.vue

@@ -25,6 +25,7 @@
 import { SystemController } from '@/api';
 import { mapMutations } from 'vuex';
 import projectConfig from '@/core/config';
+import { encrypt } from '@/utils';
 
 export default {
   data () {
@@ -50,7 +51,7 @@ export default {
         if (valid) {
           let params = {
             loginName: this.dataForm.mobilePhone,
-            password: this.dataForm.password
+            password: encrypt(this.dataForm.password)
           };
 
           SystemController.login(this, params, null, {showMask: false}).then(data => {

orange-admin-web/src/views/upms/formEditDict/index.vue

@@ -7,7 +7,7 @@
     </el-row>
     <!-- 弹窗下发按钮栏，必须设置class为dialog-btn-layer -->
     <el-row type="flex" justify="end" class="dialog-btn-layer">
-      <el-button size="mini" @click="onCancel" >取消</el-button>
+      <el-button size="mini" @click="onCancel(false)" >取消</el-button>
       <el-button type="primary" size="mini" @click="onSubmit">确定</el-button>
     </el-row>
   </el-form>

orange-admin-web/src/views/upms/formEditSysDept/index.vue

@@ -87,7 +87,7 @@ export default {
         formFilterCopy: {
         },
         parentId: {
-          impl: new DropdownWidget(this.loadParentIdDropdownList, true, 'deptId'),
+          impl: new DropdownWidget(this.loadParentIdDropdownList, true, 'id'),
           value: []
         },
         isInit: false
@@ -131,7 +131,7 @@ export default {
       this.formEditSysDept.parentId.impl.onVisibleChange(true).then(res => {
         if (!this.formEditSysDept.isInit) {
           this.formEditSysDept.parentId.value = findTreeNodePath(
-            this.formEditSysDept.parentId.impl.dropdownList, this.formData.SysDept.parentId, 'deptId');
+            this.formEditSysDept.parentId.impl.dropdownList, this.formData.SysDept.parentId, 'id');
         }
         this.formEditSysDept.isInit = true;
       });

orange-admin-web/src/views/upms/formEditSysMenu/index.vue

@@ -264,6 +264,9 @@ export default {
   mounted () {
     if (this.rowData != null) {
       this.formData = {...this.formData, ...this.rowData};
+      if (Array.isArray(this.formData.sysMenuPermCodeList)) {
+        this.formData.permCodeIdList = this.formData.sysMenuPermCodeList.map(item => item.permCodeId);
+      }
     }
     if (this.parentId != null) this.formData.parentId = this.parentId;
     this.initData();

orange-admin-web/src/views/upms/formEditSysPermCode/index.vue

@@ -199,6 +199,9 @@ export default {
   mounted () {
     if (this.rowData != null) {
       this.formData = {...this.formData, ...this.rowData};
+      if (Array.isArray(this.formData.sysPermCodePermList)) {
+        this.formData.permIdList = this.formData.sysPermCodePermList.map(item => item.permId);
+      }
       if (this.formData.parentId != null && this.permCodeTree != null && Array.isArray(this.permCodeTree)) {
         this.parentPermCodePath = findTreeNodePath(this.permCodeTree, this.formData.parentId, 'permCodeId');
       } else {

orange-admin-web/src/views/upms/formEditSysRole/index.vue

@@ -136,7 +136,12 @@ export default {
     }
   },
   mounted () {
-    if (this.rowData) this.formData = {...this.formData, ...this.rowData};
+    if (this.rowData) {
+      this.formData = {...this.formData, ...this.rowData};
+      if (Array.isArray(this.formData.sysRoleMenuList)) {
+      	this.formData.menuIdList = this.formData.sysRoleMenuList.map(item => item.menuId);
+      }
+    }
     this.loadAuthData();
   },
   watch: {

orange-admin-web/src/views/upms/formEditSysUser/index.vue

@@ -16,13 +16,15 @@
         </el-form-item>
         <el-form-item label="账号类型" prop="userType">
           <el-select v-model="formData.userType">
-            <el-option v-for="item in SysUserType.getList()" :key="item.id" :label="item.name" :value="item.id" />
+            <el-option v-for="item in SysUserType.getList()" :key="item.id"
+              :label="item.name" :value="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="用户状态" prop="userStatus" v-if="isEdit">
           <el-radio-group v-model="formData.userStatus">
-            <el-radio :label="0">正常</el-radio>
-            <el-radio :label="1">锁定</el-radio>
+            <el-radio v-for="item in SysUserStatus.getList()" :key="item.id" :label="item.id">
+              {{item.name}}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="所属部门" prop="deptId">
@@ -203,6 +205,12 @@ export default {
   mounted () {
     if (this.rowData != null) {
       this.formData = {...this.rowData};
+      if (Array.isArray(this.formData.sysDataPermUserList)) {
+        this.formData.dataPermIdList = this.formData.sysDataPermUserList.map(item => item.dataPermId);
+      }
+      if (Array.isArray(this.formData.sysUserRoleList)) {
+        this.formData.roleIdList = this.formData.sysUserRoleList.map(item => item.roleId);
+      }
     }
     this.deptId.impl.onVisibleChange(true).then(res => {
       this.deptId.value = findTreeNodePath(this.deptId.impl.dropdownList, this.formData.deptId, 'deptId');