Merge branch 'master' of http://120.26.64.82:3000/BFFE/Foshan4A4.0

src/router/routes/routes-file-three.js

@@ -31,13 +31,13 @@ const organizationRoutes = {
       path: 'add',
       name: 'AuditAdd',
       component: () => import('@/views/jobsManagement/add.vue'),
-      meta: { title: '新增岗位' }
+      meta: { title: '新增职务' }
     },
     {
       path: 'edit',
       name: 'AuditEdit',
       component: () => import('@/views/jobsManagement/edit.vue'),
-      meta: { title: '编辑岗位' }
+      meta: { title: '编辑职务' }
     }
   ]
 }

src/views/accountGroupManagement/components/accountGroupHome.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: your name
  * @Date: 2022-01-08 09:27:43
- * @LastEditTime: 2022-03-01 10:27:23
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-03-09 14:45:15
+ * @LastEditors: your name
  * @Description: 用户组管理
  * @FilePath: \Foshan4A2.0\src\views\accountGroupManagement\components\home.vue
 -->
@@ -60,12 +60,16 @@
                         <span>{{ data.OfficerCount }}</span>
                       </el-col> -->
                       <el-col :span="24" v-if="data.GroupId != -1">
-                        <span class="msg">账号数：</span>
-                        <span style="margin-right: 90px">{{
-                          data.UserCount
-                        }}</span>
-                        <span class="msg">权限数：</span>
-                        <span>{{ data.AuthCount }}</span>
+                        <el-row>
+                          <el-col :span="12">
+                            <span class="msg">账号数：</span>
+                            <span>{{ data.UserCount }}</span>
+                          </el-col>
+                          <el-col :span="12">
+                            <span class="msg">权限数：</span>
+                            <span>{{ data.AuthCount }}</span>
+                          </el-col>
+                        </el-row>
                       </el-col>
                       <el-col :span="12" v-if="data.GroupId != -1">
                         <span class="msg">状态：</span>
@@ -137,12 +141,16 @@
                         </div>
                       </el-col>
                       <el-col :span="24" v-if="data.GroupId != -1">
-                        <span class="msg">账号数：</span>
-                        <span style="margin-right: 90px">{{
-                          data.UserCount
-                        }}</span>
-                        <span class="msg">权限数：</span>
-                        <span>{{ data.AuthCount }}</span>
+                        <el-row>
+                          <el-col :span="12">
+                            <span class="msg">账号数：</span>
+                            <span>{{ data.UserCount }}</span>
+                          </el-col>
+                          <el-col :span="12">
+                            <span class="msg">权限数：</span>
+                            <span>{{ data.AuthCount }}</span>
+                          </el-col>
+                        </el-row>
                       </el-col>
                       <el-col :span="12" v-if="data.GroupId != -1">
                         <span class="msg">状态：</span>
@@ -557,6 +565,9 @@ export default {
       }
       .el-col {
         padding: 10px 0;
+        > .el-row > .el-col {
+          padding: 0;
+        }
       }
       .itemTitle {
         font-size: 16px;

src/views/authorityManagement/components/authorityPowerAdd.vue

@@ -12,7 +12,7 @@
     <div class="addApp-form">
       <div class="addApp-form-title flex">
         <div class="title">
-          编辑权限项
+          新增权限项
           <!-- <span class="isqy">
             <span>是否启用</span>
             <el-radio v-model="radio" :label="1">是</el-radio>

src/views/authorityManagement/components/authorityRoleHome.vue

@@ -108,8 +108,8 @@ export default {
     }
   },
   created () {
-    if (this.$route.query.keyWords) {
-      keyWords = this.$route.query.keyWords
+    const { keyWords } = this.$route.query
+    if (keyWords) {
       this.keyWords = keyWords
     }
     this.gueryRole({
@@ -163,6 +163,9 @@ export default {
       this.arrs = []
       this.dataList = []
       this.pageNum = 1
+      if (this.keyWords) {
+        this.$router.push({ path: '/role', query: { keyWords: '' } })
+      }
       this.keyWords = ''
       this.gueryRole({
         QueryName: this.keyWords,

src/views/jobsManagement/add.vue

@@ -2,7 +2,7 @@
   <div class="pageBody">
     <div class="topPart">
       <div class="title">
-        <div class="tltleLeft">新增岗位</div>
+        <div class="tltleLeft">新增职务</div>
         <!-- <div class="isUsed">
           是否启用
           <el-radio
@@ -27,7 +27,7 @@
         <el-form ref="form" :model="FormData" :rules="rules" label-width="80px">
           <el-row :gutter="40">
             <el-col :span="5">
-              <el-form-item label="岗位名称" prop="JobName">
+              <el-form-item label="职务名称" prop="JobName">
                 <el-input v-model="FormData.JobName" maxlength="32" placeholder="请输入岗位名称" size="small"></el-input>
               </el-form-item>
             </el-col>

src/views/jobsManagement/edit.vue

@@ -2,7 +2,7 @@
   <div class="pageBody">
     <div class="topPart">
       <div class="title">
-        <div class="tltleLeft">编辑岗位</div>
+        <div class="tltleLeft">编辑职务</div>
         <!-- <div class="isUsed">
           是否启用
           <el-radio
@@ -27,7 +27,7 @@
         <el-form ref="form" :model="FormData" :rules="rules" label-width="80px">
           <el-row :gutter="40">
             <el-col :span="5">
-              <el-form-item label="岗位名称" prop="JobName">
+              <el-form-item label="职务名称" prop="JobName">
                 <el-input v-model="FormData.JobName" maxlength="32" placeholder="请输入岗位名称" size="small"></el-input>
               </el-form-item>
             </el-col>

src/views/organizationManagement/components/organizationEdit.vue

@@ -54,7 +54,7 @@
     </div>
     <div class="power-content flex-wrap">
       <div class="flex1 part">
-        <Organization :defaultProps="defaultProps" :data="data" nodekey="OrganId" :checkedKeys="checkedKeys" title="上级组织" />
+        <Organization :defaultProps="defaultProps" :data="data" nodekey="OrganId" @getTreeData="getTreeData" :checkedKeys="checkedKeys" title="上级组织" />
       </div>
     </div>
   </div>
@@ -170,7 +170,9 @@ export default {
   methods: {
     //获取选中的树数据
     getTreeData (arr) {
-      this.checkTrees = arr;
+      const { OrganUpid, OrganId } = arr[0];
+      this.OrganUpid = OrganUpid;
+      this.AppId = OrganId;
     },
     //获取指定数据
     decompose (data, id) {