Merge remote-tracking branch 'origin/master'

xing

2023-02-26 ba5e65e7bda57e18bd0dcf65d1d9596f967e0ae0

 src/views/maintenance/userManagement.vue

@@ -18,19 +18,6 @@
        <div class="flex_box">
          <div style="margin-right: auto">
            <el-form-item
              prop="uname"
              :label="$t('userManage.userInfoObj.uname')"
            >
              <el-input
                v-model="queryForm.uname"
                size="small"
                :placeholder="$t('userManage.userInfoObj.unamePlaceholder')"
                style="width: 200px"
              >
                <i slot="suffix" class="el-icon-search" @click="queryInfo"></i>
              </el-input>
            </el-form-item>
            <el-form-item
              prop="depid"
              :label="$t('userManage.userInfoObj.depName')"
            >
@@ -56,26 +43,40 @@
                </el-option>
              </el-select>
            </el-form-item>
            <el-form-item
                prop="uname"
                :label="$t('userManage.userInfoObj.uname')"
            >
              <el-input
                  v-model="queryForm.uname"
                  size="small"
                  :placeholder="$t('userManage.userInfoObj.unamePlaceholder')"
                  style="width: 200px"
              >
                <i slot="suffix" class="el-icon-search" @click="queryInfo"></i>
              </el-input>
            </el-form-item>
          </div>
          <div>
<!--            <el-form-item>-->
<!--              <el-button-->
<!--                type="primary"-->
<!--                size="small"-->
<!--                @click="queryInfo('queryForm')"-->
<!--                icon="el-icon-search"-->
<!--              >-->
<!--                {{ $t("operatManage.ELM.search") }}-->
<!--              </el-button>-->
<!--            </el-form-item>-->
            <el-form-item>
              <el-button
                type="primary"
                size="small"
                @click="queryInfo('queryForm')"
                icon="el-icon-search"
                  v-if="menuStatus.insert"
                  type="success"
                  size="small"
                  @click="showAddDialog"
                  icon="el-icon-plus"
              >
                {{ $t("operatManage.ELM.search") }}
              </el-button>
            </el-form-item>
            <el-form-item>
              <el-button
                type="info"
                size="small"
                @click="resetInfo('queryForm')"
                icon="el-icon-refresh"
              >
                {{ $t("operatManage.ELM.reset") }}
                {{ $t("common.append") }}
              </el-button>
            </el-form-item>
            <el-form-item v-show="setbatchFlag">
@@ -101,13 +102,12 @@
            </el-form-item>
            <el-form-item>
              <el-button
                v-if="menuStatus.insert"
                type="success"
                size="small"
                @click="showAddDialog"
                icon="el-icon-plus"
                  type="info"
                  size="small"
                  @click="resetInfo('queryForm')"
                  icon="el-icon-refresh"
              >
                {{ $t("common.append") }}
                {{ $t("operatManage.ELM.reset") }}
              </el-button>
            </el-form-item>
          </div>