Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0

zhanghua

2023-02-16 a8532e35b1a39de9bbcc5f2a648fe02c72d9c2b0

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

@@ -33,7 +33,7 @@
                      item.leader ? 'leader' : '',
                    ]"></i>
                  </div>
                  <label style="font-size: 12px" :class="[item.leader ? 'leader' : '']">{{ item.username }}</label>
                  <label style="font-size: 12px" :class="[item.leader ? 'leader' : 'theMasses']">{{ item.username }}</label>
                </div>
              </li>
              <li class="li-btn" v-if="updateFlag">
@@ -50,7 +50,7 @@
              <el-card class="box-card">
                <div slot="header" class="myclear">
                  <span>工作人员</span>
                  <div @click="addUser">确认</div>
                  <div class="department-sub" @click="addUser">确认</div>
                </div>
                <div class="scrollWrap">
                  <el-checkbox-group v-model="checkedUser">
@@ -225,7 +225,7 @@
          }
        });
      });
      this.checkedList[0].leader = true;
      // this.checkedList[0].leader = true;
      console.log(this.checkedList);
      this.openUser = false;
    },
@@ -370,6 +370,11 @@
      color: #4b9bb7;
      display: flex;
      justify-content: space-between;
      .department-sub{
        cursor: pointer;
        margin-left: 5px;
        color: #2f54eb;
      }
    }

    .hidebar {
@@ -390,7 +395,9 @@
.leader {
  color: red;
}

.theMasses{
  color: #2f54eb;
}
.el-input {
  width: 280px !important;
}