Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui

mg

2022-10-27 0a1d2fe85a280f5543b9b3241aaf8d8a39a32f8c

 src/views/systemSetting/baseSetting/department/createUser/index.vue

@@ -88,7 +88,7 @@
                      :label="user.id"
                      :key="user.id"
                    >
                      {{ user.username }}
                      {{ user.username}}
                    </el-checkbox>
                  </el-checkbox-group>
                </div>
@@ -246,9 +246,9 @@
    // 获取所有用户信息
    getUserList() {
      // 获取所有用户信息、用户查询(暂时支持电话号码)
      this.$axios.get(`sccg/admin/list`).then((res) => {
      this.$axios.get(`/sccg/depart/query_surplus_user`).then((res) => {
        if (res.code === 200) {
          this.userList = res.data.records;
          this.userList = res.data;
        }
      });
    },
@@ -402,7 +402,8 @@
        right: 0;

        .box-card {
          max-height: 200px;
          min-height: 240px;
          max-height: 260px;
          overflow: hidden;
          background-color: #09152f;
          position: relative;
@@ -410,7 +411,7 @@

          .scrollWrap {
            overflow: scroll;
            height: 160px;
            height: 180px;
            position: relative;
            color: #4b9bb7;

@@ -437,7 +438,7 @@
            top: 77px;
            right: 20px;
            width: 20px;
            height: 160px;
            height: 180px;
            background-color: #09152f;
          }