Merge branch 'master' of http://103.85.165.99:8989/r/LFWEB_NEW

TreeWish

2023-02-08 9f97a36dff14b8cacb4cfc909dc79fa23cabae78

 src/views/maintenance/userManagement.vue

@@ -21,7 +21,28 @@
          prop="depid"
          :label="$t('userManage.userInfoObj.depName')"
        >
          <el-cascader
          <el-select
           :popper-append-to-body="false"
            v-model="queryForm.depName"
            placeholder="请选择"
          >
            <el-option
              :value="queryForm.depid"
              :label="queryForm.depName"
               style=" height:auto"
            >
              <el-tree
                ref="tree"
                :data="treeOptions"
         
                node-key="id"
                :props="props"
                @node-click="handleNodeClickto"
              />
            </el-option>
          </el-select>

          <!-- <el-cascader
            v-model="queryForm.depid"
            :options="treeOptions"
            filterable
@@ -36,7 +57,7 @@
              emitPath: false,
            }"
          >
          </el-cascader>
          </el-cascader> -->
        </el-form-item>
        <el-form-item>
          <el-button
@@ -57,7 +78,7 @@
            {{ $t('operatManage.ELM.reset') }}
          </el-button>
        </el-form-item>
        <br />

        <el-form-item>
          <el-button
            v-if="menuStatus.insert"
@@ -96,7 +117,7 @@
      <el-table
        :data="tableData"
        border
        style="width: 100%"
        style="width: 100%;overflow: auto;height: 500px;"
        @selection-change="handleSelectionChange"
      >
        <el-table-column
@@ -210,20 +231,20 @@
            >拒批</el-tag>
          </template>
        </el-table-column>
        <el-table-column
        <!-- <el-table-column
          align="center"
          prop="bak"
          width="200px"
          :label="$t('userManage.userInfoObj.bak')"
        />
        <!-- <el-table-column
        /> -->
        <el-table-column
          :label="$t('common.operate')"
          width="80px"
          fixed="right"
          v-if="menuStatus.update"
        >
          <template slot-scope="scope">
             

            <el-button
              type="warning"
              plain
@@ -231,7 +252,7 @@
              size="small"
            >{{ $t('common.edit') }}</el-button>
          </template>
        </el-table-column> -->
        </el-table-column>
      </el-table>
      <div
        style="margin-top: 25px"
@@ -646,6 +667,13 @@
      }
    };
    return {
      props: {
        label: 'name',
        value: 'id',
        children: 'children',
        checkStrictly: true,
        emitPath: false,
      },
      setbatchFlag: false,
      menuStatus: {
        delete: false,
@@ -884,11 +912,11 @@
        return father.pid == 0; // 返回一级菜单
      });
    },
    //查询选择单位
    handleChange(value) {
      this.queryForm.depid = value;

      this.$refs.cascaderHandle.dropDownVisible = false
    handleNodeClickto(data, node, nodeData) {
      this.queryForm.depid = data.id

      this.queryForm.depName = data.name;
    },
    //搜索按钮
    queryInfo() {
@@ -1217,7 +1245,7 @@
  .inquire {
    position: relative;
    height: auto;
    overflow: auto;

    padding: 8px;
    margin-top: 20px;

@@ -1233,7 +1261,7 @@
    padding: 10px;
    border-radius: 5px;

    overflow: auto;
    // overflow: auto;
  }
  .el-dialog {
    .el-form-item {