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

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

@@ -79,12 +79,11 @@
           icon="el-icon-edit"
           @click="openEdit(row)"
           v-if="$hasPermission('main:user:save')"
-
         >
           修改
         </el-link>
         <el-link
-          v-if="row.loginName&&$hasPermission('main:user:save')"
+          v-if="row.loginName && $hasPermission('main:user:save')"
           type="primary"
           :underline="false"
           icon="el-icon-unlock"
@@ -93,7 +92,7 @@
           解绑
         </el-link>
         <el-link
-          v-if="!row.loginName&&$hasPermission('main:user:save')"
+          v-if="!row.loginName && $hasPermission('main:user:save')"
           type="primary"
           :underline="false"
           icon="el-icon-add"
@@ -105,7 +104,7 @@
           class="ele-action"
           title="确定要删除此用户吗？"
           @confirm="remove(row)"
-          v-if="!row.loginName&&$hasPermission('main:user:delete')"
+          v-if="!row.loginName && $hasPermission('main:user:delete')"
         >
           <template v-slot:reference>
             <el-link type="danger" :underline="false" icon="el-icon-delete">
@@ -140,7 +139,7 @@
     <el-dialog
       title="提示"
       :visible.sync="dialogVisible"
-      @close="dialogVisible=false"
+      @close="dialogVisible = false"
       width="400px"
     >
       <span>是否绑定已有用户？</span>
@@ -179,326 +178,333 @@
 </template>
 
 <script>
-import tabMixins from '@/mixins/tableColumnsMixin';
+  import tabMixins from '@/mixins/tableColumnsMixin';
 
-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,
-  unbindLoginName
-} from '@/api/system/organization';
-import { pageUsers, exportUsers } from '@/api/system/user';
-export default {
-  mixins: [tabMixins],
-  components: {
-    importDialog,
-    OrgUserSearch,
-    OrgUserEdit,
-    addUsers,
-    UserSearch
-  },
-  props: {
-    // 机构id
-    organizationId: [Number, String],
-    // 全部机构
-    organizationList: Array,
-    institutionList: Array
-  },
-  data() {
-    return {
-      moudleName: 'mainUser',
-      showEdit1: false,
-      userShow: false,
-      userRow: null,
-      currentRow: null,
-      dialogVisible: false,
-      radio: '2',
-      // 表格列配置
-      columns: [
-        {
-          columnKey: 'index',
-          type: 'index',
-          width: 45,
-          align: 'center',
-          showOverflowTooltip: true,
-          fixed: 'left'
-        },
-        {
-          prop: 'name',
-          label: '姓名',
-          slot: 'name',
-          sortable: 'custom',
-          showOverflowTooltip: true,
-          minWidth: 110
-        },
-        {
-          prop: 'jobNumber',
-          label: '工号',
-          sortable: 'custom',
-          showOverflowTooltip: true,
-          minWidth: 110
-        },
-        {
-          prop: 'loginName',
-          label: '用户账号',
-          sortable: 'custom',
-          showOverflowTooltip: true,
-          minWidth: 110
-        },
-        {
-          prop: 'sex',
-          label: '性别',
-          sortable: 'custom',
-          showOverflowTooltip: true,
-          minWidth: 80,
-          formatter: (_row, _column, cellValue) => {
-            return cellValue == 1 ? '男' : cellValue == 2 ? '女' : '';
-          }
-        },
-        {
-          prop: 'status',
-          label: '状态',
-          align: 'center',
-          sortable: 'custom',
-          width: 80,
-          formatter: (_row, _column, cellValue) => {
-            const dom = this.statusOptions.find((item) => {
-              return item.value == cellValue;
-            });
-            return dom ? dom.label : '';
-          }
-        },
-        {
-          prop: 'isEnabled',
-          align: 'center',
-          label: '是否启用',
-          showOverflowTooltip: true,
-          formatter: (row, column) => {
-            return row.isEnabled === 0
-              ? '停用'
-              : row.isEnabled === 1
-              ? '启用'
-              : '';
-          }
-        },
-        {
-          prop: 'createTime',
-          label: '创建时间',
-          sortable: 'custom',
-          showOverflowTooltip: true,
-          minWidth: 110,
-          formatter: (_row, _column, cellValue) => {
-            return this.$util.toDateString(cellValue);
+  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,
+    unbindLoginName
+  } from '@/api/system/organization';
+  import { pageUsers, exportUsers } from '@/api/system/user';
+  export default {
+    mixins: [tabMixins],
+    components: {
+      importDialog,
+      OrgUserSearch,
+      OrgUserEdit,
+      addUsers,
+      UserSearch
+    },
+    props: {
+      // 机构id
+      organizationId: [Number, String],
+      // 全部机构
+      organizationList: Array,
+      institutionList: Array
+    },
+    data() {
+      return {
+        moudleName: 'mainUser',
+        showEdit1: false,
+        userShow: false,
+        userRow: null,
+        currentRow: null,
+        dialogVisible: false,
+        radio: '2',
+        // 表格列配置
+        columns: [
+          {
+            columnKey: 'index',
+            type: 'index',
+            width: 45,
+            align: 'center',
+            showOverflowTooltip: true,
+            fixed: 'left'
+          },
+          {
+            prop: 'name',
+            label: '姓名',
+            slot: 'name',
+            sortable: 'custom',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'jobNumber',
+            label: '工号',
+            sortable: 'custom',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'loginName',
+            label: '用户账号',
+            sortable: 'custom',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'sex',
+            label: '性别',
+            sortable: 'custom',
+            showOverflowTooltip: true,
+            minWidth: 80,
+            formatter: (_row, _column, cellValue) => {
+              return cellValue == 1 ? '男' : cellValue == 2 ? '女' : '';
+            }
+          },
+          {
+            prop: 'status',
+            label: '状态',
+            align: 'center',
+            sortable: 'custom',
+            width: 80,
+            formatter: (_row, _column, cellValue) => {
+              const dom = this.statusOptions.find((item) => {
+                return item.value == cellValue;
+              });
+              return dom ? dom.label : '';
+            }
+          },
+          {
+            prop: 'isEnabled',
+            align: 'center',
+            label: '是否启用',
+            showOverflowTooltip: true,
+            formatter: (row, column) => {
+              return row.isEnabled === 0
+                ? '停用'
+                : row.isEnabled === 1
+                ? '启用'
+                : '';
+            }
+          },
+          {
+            prop: 'createTime',
+            label: '创建时间',
+            sortable: 'custom',
+            showOverflowTooltip: true,
+            minWidth: 110,
+            formatter: (_row, _column, cellValue) => {
+              return this.$util.toDateString(cellValue);
+            }
+          },
+          {
+            columnKey: 'action',
+            label: '操作',
+            width: 200,
+            align: 'left',
+            resizable: false,
+            slot: 'action',
+            showOverflowTooltip: true
           }
-        },
-        {
-          columnKey: 'action',
-          label: '操作',
-          width: 200,
-          align: 'left',
-          resizable: false,
-          slot: 'action',
-          showOverflowTooltip: true
-        }
-      ],
-      // 表格列配置
-      columns1: [
-        {
-          columnKey: 'index',
-          type: 'index',
-          width: 55,
-          align: 'center',
-          showOverflowTooltip: true,
-          fixed: 'left',
-          label: '序号'
-        },
-        {
-          prop: 'loginName',
-          label: '用户账号',
-          showOverflowTooltip: true,
-          minWidth: 110
-        },
-        {
-          prop: 'jobNumber',
-          label: '工号',
-          showOverflowTooltip: true,
-          minWidth: 110
-        },
-        {
-          prop: 'name',
-          label: '姓名',
+        ],
+        // 表格列配置
+        columns1: [
+          {
+            columnKey: 'index',
+            type: 'index',
+            width: 55,
+            align: 'center',
+            showOverflowTooltip: true,
+            fixed: 'left',
+            label: '序号'
+          },
+          {
+            prop: 'loginName',
+            label: '用户账号',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'jobNumber',
+            label: '工号',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'name',
+            label: '姓名',
 
-          showOverflowTooltip: true,
-          minWidth: 110
-        },
-        {
-          prop: 'phone',
-          label: '手机号',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'phone',
+            label: '手机号',
 
-          showOverflowTooltip: true,
-          minWidth: 110
-        },
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
 
-        {
-          columnKey: 'groupRoleList',
-          label: '角色',
-          showOverflowTooltip: true,
-          minWidth: 110,
-          formatter: (_row, _column, cellValue) => {
-            let names = [];
-            _row.groupRoleList.forEach((item) => {
-              names.push(...item.roleVOList.map((val) => val.name));
-            });
-            return names.toString();
-          }
-        },
-        {
-          prop: 'createTime',
-          label: '创建时间',
-          // sortable: 'custom',
-          showOverflowTooltip: true,
-          minWidth: 110,
-          formatter: (_row, _column, cellValue) => {
-            return this.$util.toDateString(cellValue);
+          {
+            columnKey: 'groupRoleList',
+            label: '角色',
+            showOverflowTooltip: true,
+            minWidth: 110,
+            formatter: (_row, _column, cellValue) => {
+              let names = [];
+              _row.groupRoleList.forEach((item) => {
+                names.push(...item.roleVOList.map((val) => val.name));
+              });
+              return names.toString();
+            }
+          },
+          {
+            prop: 'createTime',
+            label: '创建时间',
+            // sortable: 'custom',
+            showOverflowTooltip: true,
+            minWidth: 110,
+            formatter: (_row, _column, cellValue) => {
+              return this.$util.toDateString(cellValue);
+            }
           }
-        }
-      ],
-      // 当前编辑数据
-      current: null,
-      // 是否显示编辑弹窗
-      showEdit: false,
-      statusOptions: [
-        { value: 1, label: '全职' },
-        { value: 2, label: '兼职' },
-        { value: 3, label: '实习' },
-        { value: 4, label: '正式' },
-        { value: 5, label: '试用' },
-        { value: 6, label: '离职' }
-      ],
-      pageSize: this.$store.state.tablePageSize,
-      cacheKeyUrl: 'ef00833a-system-organization'
-    };
-  },
-  methods: {
-    async addUsers(row) {
-      // this.userRow = null;
-      this.currentRow = row;
-      this.dialogVisible = true;
+        ],
+        // 当前编辑数据
+        current: null,
+        // 是否显示编辑弹窗
+        showEdit: false,
+        statusOptions: [
+          { value: 1, label: '全职' },
+          { value: 2, label: '兼职' },
+          { value: 3, label: '实习' },
+          { value: 4, label: '正式' },
+          { value: 5, label: '试用' },
+          { value: 6, label: '离职' }
+        ],
+        pageSize: this.$store.state.tablePageSize,
+        cacheKeyUrl: 'ef00833a-system-organization'
+      };
     },
-    setUser() {
-      this.dialogVisible = false;
-      if (this.radio == 1) {
-        this.userShow = true;
-      } else {
+    methods: {
+      async addUsers(row) {
+        // this.userRow = null;
+        this.currentRow = row;
+        this.dialogVisible = true;
+      },
+      setUser() {
+        this.dialogVisible = false;
+        if (this.radio == 1) {
+          this.userShow = true;
+        } else {
+          this.showEdit1 = true;
+          this.$refs.userEdit.userBk(this.currentRow);
+        }
+      },
+      getUser() {
+        if (!this.userRow) {
+          this.$message.warning('请选择一条数据！');
+          return;
+        }
+        this.userShow = false;
         this.showEdit1 = true;
-        this.$refs.userEdit.userBk(this.currentRow);
-      }
-    },
-    getUser() {
-      if (!this.userRow) {
-        this.$message.warning('请选择一条数据！');
-        return;
-      }
-      this.userShow = false;
-      this.showEdit1 = true;
-      this.$refs.userEdit.getByData(this.userRow, this.currentRow);
-    },
+        this.$refs.userEdit.getByData(this.userRow, this.currentRow);
+      },
 
-    /* 表格数据源 */
-    datasource({ page, limit, where, order }) {
-      return getUserPage({
-        ...where,
-        pageNum: page,
-        orderName: order.order || '',
-        sortBy: order.sort || '',
-        size: limit,
-        groupId: this.organizationId
-      });
-    },
-    /* 表格数据源 */
-    datasource1({ page, limit, where, order }) {
-      return pageUsers({ ...where, ...order, pageNum: page, size: limit });
-    },
-    /* 刷新表格 */
-    reload(where) {
-      this.$refs.table.reload({ pageNum: 1, where: where });
-    },
-    reload1(where) {
-      this.$refs.table1.reload({ pageNum: 1, where: where });
-    },
-    exportUsers() {
-      let where = this.$refs.searchRef.geValue();
-      this.reload(where);
-
-      exportUsers({
-        ...where,
-        pageNum: 1,
-        size: 10000,
-        groupId: this.organizationId
-      });
-    },
-    /* 显示编辑 */
-    openEdit(row, disabled) {
-      this.current = row;
-      this.showEdit = true;
-      this.$refs.userEditRef.setDisabled(disabled);
-    },
+      /* 表格数据源 */
+      datasource({ page, limit, where, order }) {
+        return getUserPage({
+          ...where,
+          pageNum: page,
+          orderName: order.order || '',
+          sortBy: order.sort || '',
+          size: limit,
+          groupId: this.organizationId,
+          isQueryLZ: 1
 
-    // 解除绑定
-    toUnBind(row) {
-      const loading = this.$loading({ lock: true });
-      unbindLoginName(row.id)
-        .then((res) => {
-          loading.close();
-          this.$message.success('解绑成功');
-          this.reload();
-        })
-        .catch((e) => {
-          loading.close();
-          // this.$message.error(e.message);
         });
-    },
-    /* 删除 */
-    remove(row) {
-      const loading = this.$loading({ lock: true });
-      removePersonnel([row.id])
-        .then((msg) => {
-          loading.close();
-          this.$message.success(msg);
-          this.reload();
-        })
-        .catch((e) => {
-          loading.close();
-          // this.$message.error(e.message);
+      },
+      /* 表格数据源 */
+      datasource1({ page, limit, where, order }) {
+        return pageUsers({
+          ...where,
+          ...order,
+          pageNum: page,
+          size: limit,
         });
-    },
-    /* 更改状态 */
-    editStatus(row) {
-      const loading = this.$loading({ lock: true });
-      updateUserStatus(row.userId, row.status)
-        .then((msg) => {
-          loading.close();
-          this.$message.success(msg);
-        })
-        .catch((e) => {
-          loading.close();
-          row.status = !row.status ? 1 : 0;
-          // this.$message.error(e.message);
+      },
+      /* 刷新表格 */
+      reload(where) {
+        this.$refs.table.reload({ pageNum: 1, where: where });
+      },
+      reload1(where) {
+        this.$refs.table1.reload({ pageNum: 1, where: where });
+      },
+      exportUsers() {
+        let where = this.$refs.searchRef.geValue();
+        this.reload(where);
+
+        exportUsers({
+          ...where,
+          pageNum: 1,
+          size: 10000,
+          groupId: this.organizationId
         });
+      },
+      /* 显示编辑 */
+      openEdit(row, disabled) {
+        this.current = row;
+        this.showEdit = true;
+        this.$refs.userEditRef.setDisabled(disabled);
+      },
+
+      // 解除绑定
+      toUnBind(row) {
+        const loading = this.$loading({ lock: true });
+        unbindLoginName(row.id)
+          .then((res) => {
+            loading.close();
+            this.$message.success('解绑成功');
+            this.reload();
+          })
+          .catch((e) => {
+            loading.close();
+            // this.$message.error(e.message);
+          });
+      },
+      /* 删除 */
+      remove(row) {
+        const loading = this.$loading({ lock: true });
+        removePersonnel([row.id])
+          .then((msg) => {
+            loading.close();
+            this.$message.success(msg);
+            this.reload();
+          })
+          .catch((e) => {
+            loading.close();
+            // this.$message.error(e.message);
+          });
+      },
+      /* 更改状态 */
+      editStatus(row) {
+        const loading = this.$loading({ lock: true });
+        updateUserStatus(row.userId, row.status)
+          .then((msg) => {
+            loading.close();
+            this.$message.success(msg);
+          })
+          .catch((e) => {
+            loading.close();
+            row.status = !row.status ? 1 : 0;
+            // this.$message.error(e.message);
+          });
+      },
+      uploadFile() {
+        this.$refs.importDialogRef.open();
+      }
     },
-    uploadFile() {
-      this.$refs.importDialogRef.open();
-    }
-  },
-  watch: {
-    // 监听机构id变化
-    organizationId() {
-      this.reload();
+    watch: {
+      // 监听机构id变化
+      organizationId() {
+        this.reload();
+      }
     }
-  }
-};
+  };
 </script>