Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue

shuishen

2021-03-24 6718b783b67b61240455a52afd9cab640f311845

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue

 src/views/system/user.vue

@@ -90,6 +90,20 @@
                    slot="userTypeName">
            <el-tag>{{row.userTypeName}}</el-tag>
          </template>
          <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" ? "工作中" : "闲置"
              }}
            </el-tag>
          </template>
        </avue-crud>
        <el-dialog title="用户角色配置"
                   append-to-body
@@ -197,7 +211,7 @@
      };
      return {
        form: {},
        search:{},
        search: {},
        roleBox: false,
        excelBox: false,
        platformBox: false,
@@ -295,9 +309,20 @@
              slot: true,
              display: false
            },

            {
              label: "用户平台",
              prop: "userTypeName",
              slot: true,
              display: false
            }, {
              label: "在线状态",
              prop: "online_status",
              slot: true,
              display: false
            }, {
              label: "工作状态",
              prop: "work_status",
              slot: true,
              display: false
            },
@@ -885,13 +910,13 @@
        if (["edit", "view"].includes(type)) {
          getUser(this.form.id).then(res => {
            this.form = res.data.data;
            if(this.form.hasOwnProperty("deptId")){
            if (this.form.hasOwnProperty("deptId")) {
              this.form.deptId = this.form.deptId.split(",");
            }
            if(this.form.hasOwnProperty("roleId")){
            if (this.form.hasOwnProperty("roleId")) {
              this.form.roleId = this.form.roleId.split(",");
            }
            if(this.form.hasOwnProperty("postId")){
            if (this.form.hasOwnProperty("postId")) {
              this.form.postId = this.form.postId.split(",");
            }
          });