Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/views/system/organization/components/org-user-edit.vue

@@ -14,6 +14,7 @@
       class="el-form-box"
       :rules="rules"
       label-width="82px"
+      :disabled="disabled"
     >
       <el-row :gutter="15">
         <el-col v-bind="styleResponsive ? { sm: 12 } : { span: 12 }">
@@ -1051,11 +1052,10 @@
 
     <template v-slot:footer>
       <el-button @click="updateVisible(false)">取消</el-button>
-      <el-button type="primary" :loading="loading" @click="save">
+      <el-button type="primary" :loading="loading" @click="save" v-if="!disabled">
         保存
       </el-button>
     </template>
-  
   </ele-modal>
 </template>
 
@@ -1118,7 +1118,7 @@ export default {
       defaultForm,
       // 表单数据
       form: { ...defaultForm },
-
+      disabled: false,
       activeName: 'identityPhotos',
       // 表单验证规则
       rules: {
@@ -1760,6 +1760,9 @@ export default {
         this.accountList = res;
       });
     },
+    setDisabled(disabled) {
+      this.disabled = disabled;
+    },
     async getFactoryList() {
       const { list } = await getFactoryarea({
         pageNum: 1,

src/views/system/organization/components/org-user-list.vue

@@ -44,6 +44,12 @@
           {{ item.roleName }}
         </el-tag>
       </template>
+
+      <template v-slot:name="{ row }">
+        <el-link type="primary" :underline="false" @click="openEdit(row,true)">
+          {{ row.name }}</el-link
+        >
+      </template>
       <!-- 状态列 -->
       <!--      <template v-slot:status="{ row }">
         <el-switch
@@ -60,7 +66,6 @@
           :underline="false"
           icon="el-icon-edit"
           @click="openEdit(row)"
-          v-if="!row.loginName"
         >
           修改
         </el-link>
@@ -104,6 +109,7 @@
       :institutionList="institutionList"
       :organization-id="organizationId"
       @done="reload"
+      ref="userEditRef"
     />
     <addUsers :visible.sync="showEdit1" :data="null" ref="userEdit" />
     <importDialog
@@ -122,9 +128,7 @@
       <el-radio v-model="radio" label="2">否</el-radio>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="setUser"
-          >确 定</el-button
-        >
+        <el-button type="primary" @click="setUser">确 定</el-button>
       </span>
     </el-dialog>
 
@@ -134,9 +138,10 @@
       :close-on-click-modal="false"
       custom-class="ele-dialog-form"
     >
+      <UserSearch @search="reload1"></UserSearch>
       <!-- 数据表格 -->
       <ele-pro-table
-        ref="table"
+        ref="table1"
         :columns="columns1"
         :datasource="datasource1"
         :current.sync="userRow"
@@ -157,7 +162,7 @@ import OrgUserSearch from './org-user-search.vue';
 import OrgUserEdit from './org-user-edit.vue';
 import importDialog from '@/components/upload/import-dialog.vue';
 import addUsers from '@/views/system/user/components/user-edit.vue';
-
+import UserSearch from '@/views/system/user/components/user-search.vue';
 import {
   getUserPage,
   removePersonnel,
@@ -165,7 +170,13 @@ import {
 } from '@/api/system/organization';
 import { pageUsers } from '@/api/system/user';
 export default {
-  components: { importDialog, OrgUserSearch, OrgUserEdit, addUsers },
+  components: {
+    importDialog,
+    OrgUserSearch,
+    OrgUserEdit,
+    addUsers,
+    UserSearch
+  },
   props: {
     // 机构id
     organizationId: [Number, String],
@@ -195,6 +206,7 @@ export default {
         {
           prop: 'name',
           label: '姓名',
+          slot: 'name',
           sortable: 'custom',
           showOverflowTooltip: true,
           minWidth: 110
@@ -339,7 +351,7 @@ export default {
       this.dialogVisible = true;
     },
     setUser() {
-      this.dialogVisible = false
+      this.dialogVisible = false;
       if (this.radio == 1) {
         this.userShow = true;
       } else {
@@ -375,10 +387,14 @@ export default {
     reload(where) {
       this.$refs.table.reload({ pageNum: 1, where: where });
     },
+    reload1(where) {
+      this.$refs.table1.reload({ pageNum: 1, where: where });
+    },
     /* 显示编辑 */
-    openEdit(row) {
+    openEdit(row,disabled) {
       this.current = row;
       this.showEdit = true;
+      this.$refs.userEditRef.setDisabled(disabled)
     },
 
     // 解除绑定

src/views/system/role/components/role-data-auth.vue

@@ -11,9 +11,9 @@
       <el-form-item label="角色名称">
         <el-tag>{{ form.name }}</el-tag>
       </el-form-item>
-      <el-form-item label="组织名称">
+      <!-- <el-form-item label="组织名称">
         <el-tag>{{ form.groupName }}</el-tag>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="权限范围" prop="dataScope">
         <DictSelection
           dictName="角色数据权限字典"

src/views/system/user/components/user-edit.vue

@@ -186,6 +186,7 @@ export default {
             });
           });
         }
+        this.$forceUpdate();
       }
     },
     /* 保存编辑 */
@@ -202,10 +203,8 @@ export default {
         });
         if (!isRole) {
           this.$message.warning('请选择角色！');
-
           return;
         }
-
         this.loading = true;
         if (!this.isUpdate) {
           delete this.form.id;
@@ -235,8 +234,8 @@ export default {
     updateVisible(value) {
       this.$emit('update:visible', value);
     },
-    getByData(userRow,currentRow) {
-      let id=this.data?.id||userRow?.id
+    getByData(userRow, currentRow) {
+      let id = this.data?.id || userRow?.id;
       getById(id).then((res) => {
         this.form = res.data;
         this.form.groupRolePOList = [];
@@ -248,7 +247,7 @@ export default {
           });
         });
         if (currentRow) {
-          this.isUpdate=true
+          this.isUpdate = true;
           this.userBk(currentRow);
         }
       });