lilei 11 months ago
parent
commit
8a1361dd76

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1721121238512
+  "version": 1721122466895
 }

+ 6 - 2
src/views/power/role/menuModal.vue

@@ -63,19 +63,21 @@ export default {
     }
   },
   methods: {
+    // 展开
     onExpand (expandedKeys) {
       this.expandedKeys = expandedKeys
       this.autoExpandParent = false
     },
+    // 勾选
     onCheck (checkedKeys, info) {
       this.checkedData = [...checkedKeys, ...info.halfCheckedKeys]
       this.checkedKeys = checkedKeys
     },
+    // 取消
     cancel (e) {
       this.clear()
       this.$emit('close')
     },
-
     // 保存提交
     handleSubmit () {
       const _this = this
@@ -102,6 +104,7 @@ export default {
         }
       })
     },
+    // 重置
     clear () {
       this.form.resetFields()
       this.roleName = ''
@@ -126,6 +129,7 @@ export default {
         }
       }
     },
+    // 获取权限菜单
     getmenuData (id) {
       this.spinning = true
       getMenuList({
@@ -142,9 +146,9 @@ export default {
         this.spinning = false
       })
     },
+    // 根据权限菜单筛选树
     setmenuData (newValue) {
       this.menuData = newValue
-      console.log(this.menuData)
       if (newValue) { // 编辑
         if (this.$store.state.user.dealerLevel == 'SPECIAL') { // 特约经销商
           this.treeData = this.filterTree(newValue.allMenuList)

+ 21 - 7
src/views/power/role/roleList.vue

@@ -47,7 +47,7 @@
             v-if="$hasPermissions('B_powerMD_role_enable')"
             checkedChildren="启用"
             unCheckedChildren="禁用"
-            id="roleList-isEnable"
+            :id="'roleList-isEnable-'+record.id"
             v-model="record.isEnable"
             @change="changeFlagHandle(text, record)" />
           <span v-else>{{ record.isEnable==1?'已启用':'已禁用' }}</span>
@@ -58,9 +58,22 @@
         </template>
         <!-- 操作 -->
         <span slot="action" slot-scope="text, record">
-          <a-icon v-if="$hasPermissions('M_powerMD_role_menu')" type="setting" title="菜单权限" :style="{ fontSize: '20px', color: '#e29e14', padding: '0 10px' }" @click="openMenuModal(record)" />
-          <a-icon v-if="$hasPermissions('B_powerMD_role_edit')" type="edit" title="编辑" :style="{fontSize: '20px',color:' #1890FF',padding:' 0 10px'}" @click="handleEdit(record)" />
           <a-icon
+            :id="'roleList-menus-'+record.id"
+            v-if="$hasPermissions('M_powerMD_role_menu')"
+            type="setting"
+            title="菜单权限"
+            :style="{ fontSize: '20px', color: '#e29e14', padding: '0 10px' }"
+            @click="openMenuModal(record)" />
+          <a-icon
+            :id="'roleList-edit-'+record.id"
+            v-if="$hasPermissions('B_powerMD_role_edit')"
+            type="edit"
+            title="编辑"
+            :style="{fontSize: '20px',color:' #1890FF',padding:' 0 10px'}"
+            @click="handleEdit(record)" />
+          <a-icon
+            :id="'roleList-del-'+record.id"
             type="delete"
             title="删除"
             :style="{fontSize: '20px',color: '#f00',padding: '0 10px'}"
@@ -132,8 +145,7 @@ export default {
           this.spinning = false
           return data
         })
-      },
-      optionAlertShow: false
+      }
     }
   },
   beforeRouteEnter (to, from, next) {
@@ -160,11 +172,12 @@ export default {
     // 打开分配权限弹窗
     openMenuModal (row) {
       this.showMenuModal = true
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
         this.$refs.menuData.getmenuData(row.id)
       })
     },
-    closeMenu(){
+    // 关闭分配权限弹窗
+    closeMenu () {
       this.showMenuModal = false
     },
     // 删除
@@ -190,6 +203,7 @@ export default {
         }
       })
     },
+    // 编辑
     handleEdit (row) {
       this.showModal = true
       this.itemData = row

+ 11 - 7
src/views/power/role/roleModal.vue

@@ -13,6 +13,7 @@
           <!-- 用户名称 -->
           <a-form-item label="角色名称" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
             <a-input
+              id="roleModal-name"
               placeholder="请输入角色名称(最多30个字符)"
               :maxLength="30"
               v-decorator="['formData.name', {
@@ -25,6 +26,7 @@
           <!-- 状态 -->
           <a-form-item label="状态" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
             <a-radio-group
+              id="roleModal-state"
               name="radioGroup"
               v-decorator="[
                 'formData.isEnable',
@@ -33,13 +35,14 @@
                   rules: [{ required: true, message: '请选择状态!' }] },
               ]"
             >
-              <a-radio :value="1">启用</a-radio>
-              <a-radio :value="0">禁用</a-radio>
+              <a-radio :value="1" id="roleModal-state1">启用</a-radio>
+              <a-radio :value="0" id="roleModal-state0">禁用</a-radio>
             </a-radio-group>
           </a-form-item>
 
           <a-form-item label="角色描述" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
             <a-textarea
+              id="roleModal-remarks"
               v-decorator="[
                 'formData.remarks',
                 { initialValue: formData.remarks,
@@ -52,10 +55,10 @@
           </a-form-item>
 
           <a-form-item :wrapper-col="{ span: 12, offset: 5 }">
-            <a-button type="primary" @click="handleSubmit()">
+            <a-button type="primary" @click="handleSubmit()" id="roleModal-save">
               保存
             </a-button>
-            <a-button :style="{ marginLeft: '8px' }" @click="cancel">
+            <a-button :style="{ marginLeft: '8px' }" @click="cancel" id="roleModal-cancel">
               取消
             </a-button>
           </a-form-item>
@@ -93,13 +96,14 @@ export default {
       formLayout: 'horizontal',
       form: this.$form.createForm(this, { name: 'roleModal' }),
       formData: {
-        name: '',
+        name: '', // 角色名称
         isEnable: '', // 活动状态
-        remarks: ''
+        remarks: ''// 备注
       }
     }
   },
   methods: {
+    // 取消
     cancel () {
       this.clear()
       this.$emit('close')
@@ -120,12 +124,12 @@ export default {
               }, 300)
             } else {
               _this.spinning = false
-              // this.$message.error(res.message)
             }
           })
         }
       })
     },
+    // 重置
     clear () {
       this.form.resetFields()
       delete this.formData.id

+ 9 - 6
src/views/power/user/userList.vue

@@ -27,7 +27,7 @@
         </a-form>
       </div>
       <div class="table-operator">
-        <a-button v-if="$hasPermissions('B_powerMD_user_add')" type="primary" class="button-error" @click="openModal">新增</a-button>
+        <a-button id="userList-add" v-if="$hasPermissions('B_powerMD_user_add')" type="primary" class="button-error" @click="openModal">新增</a-button>
       </div>
       <s-table
         class="sTable fixPagination"
@@ -47,6 +47,7 @@
         <span slot="action" slot-scope="text, record">
           <a-icon
             type="edit"
+            :id="'userList-edit-'+record.id"
             title="编辑"
             :style="{fontSize: '20px',color:' #1890FF',padding:' 0 10px'}"
             v-if="$hasPermissions('B_powerMD_user_edit') && record.superAdmin!=1"
@@ -54,12 +55,14 @@
           />
           <a-icon
             type="unlock"
+            :id="'userList-resetpws-'+record.id"
             title="重置密码"
             v-if="record.loginFlag==1 && record.ownerOrgFlag==1 && $hasPermissions('B_powerMD_user_restPwd')"
             :style="{fontSize: '20px',color:' #ffaa00',padding: '0 10px'}"
             @click="resetPassword(record)" />
           <a-icon
             type="delete"
+            :id="'userList-del-'+record.id"
             title="删除"
             :style="{fontSize: '20px',color: '#f00',padding: '0 10px'}"
             v-if="record.loginFlag==0 && record.ownerOrgFlag==1 && $hasPermissions('B_powerMD_user_del')"
@@ -90,11 +93,11 @@ export default {
       tableHeight: 0,
       // 查询参数
       queryParam: {
-        name: '',
-        phone: '',
-        loginFlag: undefined
+        name: '', // 账户
+        phone: '', // 电话
+        loginFlag: undefined // 启用禁用
       },
-      showModal: false,
+      showModal: false, // 编辑弹框
       itemData: null, // 编辑行数据
       // 表头
       columns: [
@@ -133,7 +136,6 @@ export default {
           return data
         })
       },
-      optionAlertShow: false,
       showSyncModal: false //  同步账号编辑弹框
     }
   },
@@ -202,6 +204,7 @@ export default {
         }
       })
     },
+    // 编辑
     handleEdit (row) {
       this.itemData = row
       if (row.ownerOrgFlag == 1) { //  自建

+ 13 - 13
src/views/power/user/userModal.vue

@@ -59,9 +59,9 @@
             <!-- 状态 -->
             <a-col :span="12">
               <a-form-model-item label="状态" prop="loginFlag">
-                <a-radio-group name="radioGroup" v-model="form.loginFlag" placeholder="请选择状态">
-                  <a-radio :value="1">是</a-radio>
-                  <a-radio :value="0">否</a-radio>
+                <a-radio-group id="userEdit-flag" name="radioGroup" v-model="form.loginFlag" placeholder="请选择状态">
+                  <a-radio :value="1" id="userEdit-flag1">是</a-radio>
+                  <a-radio :value="0" id="userEdit-flag0">否</a-radio>
                 </a-radio-group>
               </a-form-model-item>
             </a-col>
@@ -75,7 +75,7 @@
                   allowClear
                   v-model="form.roleNames"
                   mode="multiple">
-                  <a-select-option v-for="item in roleList" :key="item.id" :value="item.id" :disabled="item.isEnable == '0' ? true : false">{{ item.name }}</a-select-option>
+                  <a-select-option v-for="item in roleList" :id="item.id" :key="item.id" :value="item.id" :disabled="item.isEnable == '0' ? true : false">{{ item.name }}</a-select-option>
                 </a-select>
               </a-form-model-item>
             </a-col>
@@ -88,8 +88,8 @@
             </a-col>
           </a-row>
           <a-form-model-item :label-col="{span: 0}" :wrapper-col="{span: 24}" style="text-align: center;">
-            <a-button type="primary" @click="handleSubmit()" :style="{ marginRight: '8px' }">保存</a-button>
-            <a-button :style="{ marginLeft: '8px' }" @click="isshow=false">取消</a-button>
+            <a-button id="userEdit-save" type="primary" @click="handleSubmit()" :style="{ marginRight: '8px' }">保存</a-button>
+            <a-button id="userEdit-cancel" :style="{ marginLeft: '8px' }" @click="isshow=false">取消</a-button>
           </a-form-model-item>
         </a-form-model>
       </a-modal>
@@ -110,7 +110,7 @@ export default {
       type: Boolean,
       default: false
     },
-    nowData: {
+    nowData: { // 当前编辑数据
       type: Object,
       default: function () {
         return {}
@@ -128,13 +128,13 @@ export default {
         wrapperCol: { span: 16 }
       },
       form: {
-        name: '',
-        phone: '',
-        loginName: '',
-        sex: undefined,
+        name: '', // 用户名称
+        phone: '', // 手机号码
+        loginName: '', // 用户账号
+        sex: undefined, // 性别
         loginFlag: '', // 状态
         roleNames: undefined, // 角色
-        remarks: ''
+        remarks: ''// 备注
       },
       rules: {
         name: [ { required: true, message: '请输入用户名称', trigger: 'blur' }, { pattern: '^[^<|>]{1,30}$', message: '请输入不含<或>的字符,最多30个字符' } ],
@@ -178,7 +178,6 @@ export default {
             }
           })
         } else {
-          console.log('error submit!!')
           return false
         }
       })
@@ -201,6 +200,7 @@ export default {
     isshow (newValue, oldValue) {
       if (!newValue) {
         this.$emit('close')
+        // 重置
         this.$refs.ruleForm.resetFields()
         this.form.name = ''
         this.form.phone = ''

+ 1 - 1
src/views/power/user/userSyncModal.vue

@@ -23,7 +23,7 @@
           <a-form-model-item label="用户账号">{{ detailData && detailData.loginName ? detailData.loginName : '--' }}</a-form-model-item>
           <a-form-model-item label="用户角色" prop="roleNames">
             <a-select placeholder="请选择角色" id="userSyncEdit-roleNames" allowClear v-model="form.roleNames" mode="multiple">
-              <a-select-option v-for="item in roleList" :key="item.id" :value="item.id" :disabled="item.isEnable == '0' ? true : false">{{ item.name }}</a-select-option>
+              <a-select-option v-for="item in roleList" :id="item.id" :key="item.id" :value="item.id" :disabled="item.isEnable == '0' ? true : false">{{ item.name }}</a-select-option>
             </a-select>
           </a-form-model-item>
         </a-form-model>

+ 4 - 1
src/views/user/Login.vue

@@ -19,6 +19,7 @@
               size="large"
               type="text"
               placeholder="账户 "
+              id="user-login"
               v-decorator="[
                 'username',
                 {initialValue: username ,rules: [{ required: true, message: '请输入帐户名' }, { validator: handleUsernameOrEmail }], validateTrigger: 'change'}
@@ -33,6 +34,7 @@
               size="large"
               type="password"
               autocomplete="false"
+              id="password-login"
               placeholder="密码"
               v-decorator="[
                 'password',
@@ -72,7 +74,7 @@
       </a-tabs>
 
       <a-form-item>
-        <a-checkbox style="color: #ccc;" @change="rememberMe=!rememberMe" :checked="rememberMe" v-decorator="['rememberMe',{initialValue: rememberMe}]">记住密码</a-checkbox>
+        <a-checkbox id="remember-login" style="color: #ccc;" @change="rememberMe=!rememberMe" :checked="rememberMe" v-decorator="['rememberMe',{initialValue: rememberMe}]">记住密码</a-checkbox>
         <!-- <router-link
           :to="{ name: 'recover', params: { user: 'aaa'} }"
           class="forge-password"
@@ -82,6 +84,7 @@
 
       <a-form-item style="margin-top:24px">
         <a-button
+          id="submit-login"
           size="large"
           type="primary"
           htmlType="submit"

+ 8 - 6
src/views/user/ResetPwd.vue

@@ -36,8 +36,8 @@
       </a-form-model-item>
       <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }">
         <div style="text-align: center;">
-          <a-button type="primary" @click="handleSubmit">保存</a-button>
-          <a-button @click="handleReset" style="margin-left: 8px">重置</a-button>
+          <a-button id="change-pwd-save" type="primary" @click="handleSubmit">保存</a-button>
+          <a-button id="change-pwd-reset" @click="handleReset" style="margin-left: 8px">重置</a-button>
         </div>
       </a-form-model-item>
     </a-form-model>
@@ -56,9 +56,9 @@ export default {
         wrapperCol: { span: 20 }
       },
       form: {
-        oldPwd: '',
-        passwd: '',
-        passwdCheck: ''
+        oldPwd: '', // 老密码
+        passwd: '', // 新密码
+        passwdCheck: ''// 确认密码
       },
       rules: {
         oldPwd: [{ required: true, message: '请输入原始密码', trigger: 'blur' }],
@@ -99,6 +99,7 @@ export default {
       str = str.replace(/[\r\n]/g, '')
       this.form.passwd = str
     },
+    // 提交
     handleSubmit () {
       const _this = this
       this.$refs.ruleForm.validate(valid => {
@@ -114,11 +115,11 @@ export default {
             }
           })
         } else {
-          console.log('error submit!!')
           return false
         }
       })
     },
+    // 登出
     logout () {
       this.Logout({}).then(() => {
         setTimeout(() => {
@@ -126,6 +127,7 @@ export default {
         }, 16)
       })
     },
+    // 重置
     handleReset () {
       this.$refs.ruleForm.resetFields()
     }