Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory

zpzgiser

2021-07-13 cb593f541e68807638b611ad0293288194ddf61e

 src/views/system/user.vue

@@ -38,13 +38,13 @@
                       v-if="permission.user_delete"
                       @click="handleDelete">删 除
            </el-button>
            <el-button type="info"
                       size="small"
                       plain
                       v-if="permission.user_role"
                       icon="el-icon-user"
                       @click="handleGrant">角色配置
            </el-button>
<!--            <el-button type="info"-->
<!--                       size="small"-->
<!--                       plain-->
<!--                       v-if="permission.user_role"-->
<!--                       icon="el-icon-user"-->
<!--                       @click="handleGrant">角色配置-->
<!--            </el-button>-->
            <el-button type="info"
                       size="small"
                       plain
@@ -52,27 +52,27 @@
                       icon="el-icon-refresh"
                       @click="handleReset">密码重置
            </el-button>
            <el-button type="info"
                       size="small"
                       plain
                       v-if="userInfo.role_name.includes('admin')"
                       icon="el-icon-setting"
                       @click="handlePlatform">平台配置
            </el-button>
            <el-button type="success"
                       size="small"
                       plain
                       v-if="userInfo.role_name.includes('admin')"
                       icon="el-icon-upload2"
                       @click="handleImport">导入
            </el-button>
            <el-button type="warning"
                       size="small"
                       plain
                       v-if="userInfo.role_name.includes('admin')"
                       icon="el-icon-download"
                       @click="handleExport">导出
            </el-button>
<!--            <el-button type="info"-->
<!--                       size="small"-->
<!--                       plain-->
<!--                       v-if="userInfo.role_name.includes('admin')"-->
<!--                       icon="el-icon-setting"-->
<!--                       @click="handlePlatform">平台配置-->
<!--            </el-button>-->
<!--            <el-button type="success"-->
<!--                       size="small"-->
<!--                       plain-->
<!--                       v-if="userInfo.role_name.includes('admin')"-->
<!--                       icon="el-icon-upload2"-->
<!--                       @click="handleImport">导入-->
<!--            </el-button>-->
<!--            <el-button type="warning"-->
<!--                       size="small"-->
<!--                       plain-->
<!--                       v-if="userInfo.role_name.includes('admin')"-->
<!--                       icon="el-icon-download"-->
<!--                       @click="handleExport">导出-->
<!--            </el-button>-->
          </template>
          <template slot-scope="{row}"
                    slot="tenantName">
@@ -91,68 +91,68 @@
            <el-tag>{{row.userTypeName}}</el-tag>
          </template>
        </avue-crud>
        <el-dialog title="用户角色配置"
                   append-to-body
                   :visible.sync="roleBox"
                   width="345px">
<!--        <el-dialog title="用户角色配置"-->
<!--                   append-to-body-->
<!--                   :visible.sync="roleBox"-->
<!--                   width="345px">-->

          <el-tree :data="roleGrantList"
                   show-checkbox
                   check-strictly
                   default-expand-all
                   node-key="id"
                   ref="treeRole"
                   :default-checked-keys="roleTreeObj"
                   :props="props">
          </el-tree>
<!--          <el-tree :data="roleGrantList"-->
<!--                   show-checkbox-->
<!--                   check-strictly-->
<!--                   default-expand-all-->
<!--                   node-key="id"-->
<!--                   ref="treeRole"-->
<!--                   :default-checked-keys="roleTreeObj"-->
<!--                   :props="props">-->
<!--          </el-tree>-->

          <span slot="footer" class="dialog-footer">
            <el-button @click="roleBox = false">取 消</el-button>
            <el-button type="primary"
                       @click="submitRole">确 定</el-button>
          </span>
        </el-dialog>
        <el-dialog title="用户数据导入"
                   append-to-body
                   :visible.sync="excelBox"
                   width="555px">
          <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
            <template slot="excelTemplate">
              <el-button type="primary" @click="handleTemplate">
                点击下载<i class="el-icon-download el-icon--right"></i>
              </el-button>
            </template>
          </avue-form>
        </el-dialog>
        <el-dialog title="用户平台配置"
                   append-to-body
                   :visible.sync="platformBox">
          <avue-crud :option="platformOption"
                     :table-loading="platformLoading"
                     :data="platformData"
                     ref="platformCrud"
                     v-model="platformForm"
                     :before-open="platformBeforeOpen"
                     :page.sync="platformPage"
                     :permission="platformPermissionList"
                     @row-update="platformRowUpdate"
                     @search-change="platformSearchChange"
                     @search-reset="platformSearchReset"
                     @selection-change="platformSelectionChange"
                     @current-change="platformCurrentChange"
                     @size-change="platformSizeChange"
                     @refresh-change="platformRefreshChange"
                     @on-load="platformOnLoad">
            <template slot-scope="{row}"
                      slot="tenantName">
              <el-tag>{{row.tenantName}}</el-tag>
            </template>
            <template slot-scope="{row}"
                      slot="userTypeName">
              <el-tag>{{row.userTypeName}}</el-tag>
            </template>
          </avue-crud>
        </el-dialog>
<!--          <span slot="footer" class="dialog-footer">-->
<!--            <el-button @click="roleBox = false">取 消</el-button>-->
<!--            <el-button type="primary"-->
<!--                       @click="submitRole">确 定</el-button>-->
<!--          </span>-->
<!--        </el-dialog>-->
<!--        <el-dialog title="用户数据导入"-->
<!--                   append-to-body-->
<!--                   :visible.sync="excelBox"-->
<!--                   width="555px">-->
<!--          <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">-->
<!--            <template slot="excelTemplate">-->
<!--              <el-button type="primary" @click="handleTemplate">-->
<!--                点击下载<i class="el-icon-download el-icon&#45;&#45;right"></i>-->
<!--              </el-button>-->
<!--            </template>-->
<!--          </avue-form>-->
<!--        </el-dialog>-->
<!--        <el-dialog title="用户平台配置"-->
<!--                   append-to-body-->
<!--                   :visible.sync="platformBox">-->
<!--          <avue-crud :option="platformOption"-->
<!--                     :table-loading="platformLoading"-->
<!--                     :data="platformData"-->
<!--                     ref="platformCrud"-->
<!--                     v-model="platformForm"-->
<!--                     :before-open="platformBeforeOpen"-->
<!--                     :page.sync="platformPage"-->
<!--                     :permission="platformPermissionList"-->
<!--                     @row-update="platformRowUpdate"-->
<!--                     @search-change="platformSearchChange"-->
<!--                     @search-reset="platformSearchReset"-->
<!--                     @selection-change="platformSelectionChange"-->
<!--                     @current-change="platformCurrentChange"-->
<!--                     @size-change="platformSizeChange"-->
<!--                     @refresh-change="platformRefreshChange"-->
<!--                     @on-load="platformOnLoad">-->
<!--            <template slot-scope="{row}"-->
<!--                      slot="tenantName">-->
<!--              <el-tag>{{row.tenantName}}</el-tag>-->
<!--            </template>-->
<!--            <template slot-scope="{row}"-->
<!--                      slot="userTypeName">-->
<!--              <el-tag>{{row.userTypeName}}</el-tag>-->
<!--            </template>-->
<!--          </avue-crud>-->
<!--        </el-dialog>-->
      </basic-container>
    </el-col>
  </el-row>
@@ -272,7 +272,7 @@
              display: false
            },
            {
              label: "所属租户",
              label: "所属机构",
              prop: "tenantName",
              slot: true,
              display: false
@@ -290,7 +290,7 @@
              display: false
            },
            {
              label: "所属部门",
              label: "所属单位",
              prop: "deptName",
              slot: true,
              display: false
@@ -328,13 +328,13 @@
              icon: 'el-icon-user-solid',
              column: [
                {
                  label: "所属租户",
                  prop: "tenantId",
                  label: "所属组织机构",
                  prop: "deptId",
                  type: "tree",
                  dicUrl: "/api/blade-system/tenant/select",
                  dicUrl: "/api/blade-system/dept/lazy-tree",
                  props: {
                    label: "tenantName",
                    value: "tenantId"
                    label: "title",
                    value: "id"
                  },
                  hide: !website.tenantMode,
                  addDisplay: website.tenantMode,
@@ -493,7 +493,7 @@
                  }]
                },
                {
                  label: "所属部门",
                  label: "所属单位",
                  prop: "deptId",
                  type: "tree",
                  multiple: true,
@@ -553,7 +553,7 @@
              display: false
            },
            {
              label: "所属租户",
              label: "所属机构",
              prop: "tenantName",
              slot: true,
              display: false
@@ -661,6 +661,9 @@
          this.initData(this.form.tenantId);
        }
      },
      "form.deptId"() {
        this.initData(this.form.tenantId);
      },
      'excelForm.isCovered'() {
        if (this.excelForm.isCovered !== '') {
          const column = this.findObject(this.excelOption.column, "excelFile");
@@ -732,7 +735,7 @@
        });
      },
      rowSave(row, done, loading) {
        row.deptId = row.deptId.join(",");
        row.deptId = row.deptId;
        row.roleId = row.roleId.join(",");
        row.postId = row.postId.join(",");
        add(row).then(() => {