修改

zengh

2023-01-16 8aa3edd56c279100c9053576f3e90fa55459fe77

 src/views/system/user.vue

@@ -93,14 +93,7 @@
          <template slot-scope="{ row }" slot="online_status">
            <el-tag
            >{{
              row.online_status == "0" ? "掉线" : row.online_status == "1" ? "在线" : "掉线"
              }}
            </el-tag>
          </template>
          <template slot-scope="{ row }" slot="work_status">
            <el-tag
            >{{
              row.work_status == "0" ? "闲置" : row.work_status == "1" ? "工作中" : "闲置"
              row.online_status == "0" ? "离线" : row.online_status == "1" ? "在线" : "离线"
              }}
            </el-tag>
          </template>
@@ -268,7 +261,7 @@
        },
        option: {
          height: 'auto',
          calcHeight: 80,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,
@@ -286,10 +279,11 @@
              display: false
            },
            {
              label: "所属租户",
              label: "所属客户",
              prop: "tenantName",
              slot: true,
              display: false
              display: false,
              width:200
            },
            {
              label: "用户姓名",
@@ -307,7 +301,8 @@
              label: "所属部门",
              prop: "deptName",
              slot: true,
              display: false
              display: false,
              width:260
            },

            {
@@ -320,10 +315,12 @@
              prop: "online_status",
              slot: true,
              display: false
            }, {
            },
            {
              label: "工作状态",
              prop: "work_status",
              slot: true,
              hide: true,
              display: false
            },
            {
@@ -353,7 +350,7 @@
              icon: 'el-icon-user-solid',
              column: [
                {
                  label: "所属租户",
                  label: "所属客户",
                  prop: "tenantId",
                  type: "tree",
                  dicUrl: "/api/blade-system/tenant/select",
@@ -520,8 +517,8 @@
                {
                  label: "所属部门",
                  prop: "deptId",
                  type: "tree",
                  multiple: true,
                  type: "cascader",
                  //multiple: true,
                  dicData: [],
                  props: {
                    label: "title"
@@ -544,11 +541,7 @@
                    label: "postName",
                    value: "id"
                  },
                  rules: [{
                    required: true,
                    message: "请选择所属岗位",
                    trigger: "click"
                  }],

                },
              ]
            },
@@ -889,7 +882,6 @@
        this.excelBox = true;
      },
      uploadAfter(res, done, loading, column) {
        window.console.log(column);
        this.excelBox = false;
        this.refreshChange();
        done();