马宇豪
2025-02-10 02bd5982028af6e791dd0857f535a41aaf74679e
src/views/system/user/index.vue
@@ -283,19 +283,24 @@
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12" v-if="showInstitutuion">
            <el-form-item label="所属机构" prop="institutionIds">
              <el-select v-model="form.institutionIds" multiple placeholder="请选择所属机构" style="width: 100%">
                <el-option
                  v-for="item in sectionOptions"
                  :key="item.institutionId"
                  :label="item.institutionName"
                  :value="item.institutionId"
                  :disabled="item.status == 1"
                ></el-option>
              </el-select>
          <el-col :span="12">
            <el-form-item label="组织架构" prop="deptId">
              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择组织架构" />
            </el-form-item>
          </el-col>
<!--          <el-col :span="12" v-if="showInstitutuion">-->
<!--            <el-form-item label="所属机构" prop="institutionIds">-->
<!--              <el-select v-model="form.institutionIds" multiple placeholder="请选择所属机构" style="width: 100%">-->
<!--                <el-option-->
<!--                  v-for="item in sectionOptions"-->
<!--                  :key="item.institutionId"-->
<!--                  :label="item.institutionName"-->
<!--                  :value="item.institutionId"-->
<!--                  :disabled="item.status == 1"-->
<!--                ></el-option>-->
<!--              </el-select>-->
<!--            </el-form-item>-->
<!--          </el-col>-->
        </el-row>
        <el-row :gutter="20">
<!--          <el-col :span="12">-->
@@ -310,11 +315,6 @@
<!--              </el-select>-->
<!--            </el-form-item>-->
<!--          </el-col>-->
          <el-col :span="12" v-if="showDeptList">
            <el-form-item label="组织架构" prop="deptId">
              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择组织架构" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="状态">
              <el-radio-group v-model="form.status" style="width: 100%;">
@@ -472,9 +472,9 @@
        roleIds: [
          { required: true, message: "角色不能为空", trigger: "blur" }
        ],
        institutionIds: [
          { required: true, message: "所属机构不能为空", trigger: "blur" }
        ],
        // institutionIds: [
        //   { required: true, message: "所属机构不能为空", trigger: "blur" }
        // ],
        deptId: [
          { required: true, message: "组织架构不能为空", trigger: "blur" }
        ],
@@ -681,11 +681,11 @@
        this.open = true;
        this.title = "修改用户";
        this.form.password = "";
        if(response.roleIds.indexOf(100)>-1 || response.roleIds.indexOf(102)>-1){
          this.getSectionList()
          this.showInstitutuion = true
          this.form.institutionIds = response.data.institutions.map(i=>i.institutionId.toString())
        }
        // if(response.roleIds.indexOf(100)>-1 || response.roleIds.indexOf(102)>-1){
        //   this.getSectionList()
        //   this.showInstitutuion = true
        //   this.form.institutionIds = response.data.institutions.map(i=>i.institutionId.toString())
        // }
        if(response.roleIds.indexOf(101)>-1){
          this.showDeptList = true
        }