commit

2025-08-14 09:45:32 +08:00
parent f4f92a9ced
commit 83ca7bdd24
7 changed files with 650 additions and 568 deletions
@@ -118,10 +118,13 @@
    <el-card shadow="never" class="mt10">
      <table-tool :label="currentGroupName" :app="this">
        <template #label_end>
-<!--          <span class="text-danger pl5">提醒：删除活动分组操作，请先选择某个活动分组后，再点击右边的删除按钮。</span>-->
+          <!--          <span class="text-danger pl5">提醒：删除活动分组操作，请先选择某个活动分组后，再点击右边的删除按钮。</span>-->
        </template>
        <template #func>
-
+          <el-button v-if="is_sysadmin||is_A06"
+                     type="primary" size="medium" icon="el-icon-printer" @click="dialogVisible = true">
+            导入XLSX查询
+          </el-button>
          <el-button @click="doExportUser" icon="el-icon-printer"
                     size="medium" type="primary" :disabled="!pageForm.groupId">
            导出活动分组人员xlsx
@@ -133,7 +136,7 @@
          </el-button>
        </template>
      </table-tool>
-      <el-table ref="userTable" :data="tableData" stripe border :size="tableSize">
+      <el-table ref="userTable" :data="tableData" stripe border :size="tableSize" @sort-change="pageOrder">
        <el-table-column type="index" label="序号" width="80px"></el-table-column>
        <el-table-column
            align="center"
@@ -164,6 +167,68 @@
      </el-row>
    </el-card>

+
+    <el-dialog title="人员导入" :visible.sync="dialogVisible" width="50%" :close-on-click-modal="false" append-to-body>
+
+
+      <el-timeline>
+        <el-timeline-item timestamp="下载模板" placement="top">
+          <el-card>
+            <el-button size="medium" type=""
+                       @click="window.open('/platform/activity/basic/user/downloadImport')"
+                       icon="el-icon-download">下载模板
+            </el-button>
+
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="上传文件" placement="top">
+          <el-card>
+
+            <el-upload
+                name="file"
+                ref="upload"
+                :on-remove="(file, fileList) => {
+                                                    importData.fileList = fileHandleRemove(file, fileList)
+                                                }"
+                :on-change="(file, fileList) => {
+                                                    importData.fileList = fileHandleChange(file, fileList,{type:['xls','xlsx']})
+                                                }"
+                :auto-upload="false"
+                :limit="1"
+                :file-list="importData.fileList">
+              <el-button size="medium" type="" icon="el-icon-upload"
+                         style="width: 200px">选择文件
+              </el-button>
+              <div class="el-upload__tip" slot="tip" style="color: #F56C6C">
+                只能上传 xls/xlsx 文件
+              </div>
+            </el-upload>
+
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item placement="top" timestamp="导入结果">
+          <el-card shadow="never">
+            <p>总记录数：{{ errorInfoData.totalCount }}</p>
+            <p>成功数：<span class="text-success">{{ errorInfoData.successCount }}</span></p>
+            <p>错误数：<span class="text-danger">{{ errorInfoData.errorCount }}</span></p>
+            <el-link @click="exportErrors" type="primary" v-if="errorInfoData.errorCount>0">下载错误记录
+            </el-link>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+
+
+      <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible = false" type="primary"
+                       :disabled="importLoading">取 消</el-button>
+            <el-button type="primary" @click="clearSearchCnd"
+                       :loading="importLoading">清空查询条件</el-button>
+            <el-button type="primary" @click="doImport" :loading="importLoading">核对人员</el-button>
+            <el-button type="primary" @click="doImportSearch"
+                       :loading="importLoading">查询人员</el-button>
+        </span>
+    </el-dialog>
+
  </div>


@@ -218,7 +283,7 @@ module.exports = {
      tableColumns: [
        {prop: 'loginName', label: '工号'},
        {prop: 'userName', label: '姓名'},
-        {prop: 'sex', label: '性别'},
+        {prop: 'sex', label: '性别', sortable: true},
        {prop: 'birthday', label: '出生年月'},
        {prop: 'mobile', label: '联系电话'},
        {prop: 'personType', label: '人员类型', sortable: true},
@@ -230,13 +295,122 @@ module.exports = {
      ],
      roleData: {},
      currentGroupName: null,
+
+      errorInfoData: {
+        totalCount: 0,
+        successCount: 0,
+        errorCount: 0,
+        errorList: 0,
+      },
+      dialogVisible: false,
+      importLoading: false,
+      importData: {
+        fileList: [],
+      },
+      successUserIdList: []
    }
  },
  mixins: [initTableMixins],
  components: {
-    'dict-select': httpVueLoader('/components/plugins/DictSelect.vue?v=1.0.0')
+    'dict-select': httpVueLoader('/components/plugins/DictSelect.vue?v=1.0.0'),
+    'file-import': httpVueLoader('/components/plugins/FileImport.vue')
  },
  methods: {
+    clearSearchCnd() {
+      this.importData = {
+        fileList: [],
+      }
+      this.errorInfoData = {
+        totalCount: 0,
+        successCount: 0,
+        errorCount: 0,
+        errorList: [],
+      }
+      this.pageForm.userIds = []
+      this.successUserIdList = []
+      this.doSearch()
+      this.dialogVisible = false;
+      $.get('/platform/activity/basic/user/clearSearchCnd', {existsLoginNameRedisKey: this.pageForm.existsLoginNameRedisKey}).then(res => {
+        if (res.code === 0) {
+          this.$message.success(res.msg)
+        } else {
+          this.$message.error(res.msg)
+        }
+      })
+
+
+    },
+    doImportSearch() {
+      this.doSearch()
+      this.dialogVisible = false
+    },
+    exportErrors() {
+      const data = this.errorInfoData.errorList
+
+      // 创建工作簿
+      const workbook = XLSX.utils.book_new();
+
+      // 创建工作表
+      const worksheet = XLSX.utils.json_to_sheet(data);
+
+      // 将工作表添加到工作簿
+      XLSX.utils.book_append_sheet(workbook, worksheet, 'Sheet1');
+
+      // 将工作簿转换为二进制对象
+      const excelBuffer = XLSX.write(workbook, {bookType: 'xlsx', type: 'array'});
+
+      // 将二进制对象转换为Blob对象
+      const blob = new Blob([excelBuffer], {type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});
+
+      // 创建下载链接并设置相关属性
+      const url = window.URL.createObjectURL(blob);
+      const link = document.createElement('a');
+      link.href = url;
+      link.download = '核对记录.xlsx';
+
+      // 模拟点击下载链接
+      document.body.appendChild(link);
+      link.click();
+      // 清理下载链接
+      document.body.removeChild(link);
+      window.URL.revokeObjectURL(url);
+
+    },
+    doImport() {
+      if (this.importData.fileList.length === 0) {
+        this.notifyWarning("请选择文件！")
+        return
+      }
+      const data = new FormData();
+      data.append("groupId", this.pageForm.groupId)
+      this.importData.fileList.forEach((val) => {
+        data.append("file", val.raw, val.raw.name);
+      });
+
+      this.importLoading = true
+      $.ajax({
+        url: "/platform/activity/basic/user/doImport",
+        type: "post",
+        data: data,
+        processData: false,
+        contentType: false,
+        success: (data) => {
+          this.importLoading = false
+          if (data.code === 0) {
+            this.notifySuccess("核对成功")
+            this.errorInfoData = data.data
+          } else {
+            this.notifyWarning("核对失败")
+          }
+          this.errorInfoData = data.data
+          this.pageForm.existsLoginNameRedisKey = data.data.existsLoginNameRedisKey
+        },
+        error: (data) => {
+          this.notifyWarning("导入失败")
+          this.importLoading = false
+        }
+      });
+    },
    viewGroupName() {
      if (this.pageForm.groupId) {
        const group = this.activityGroupList.find(v => v.groupId === this.pageForm.groupId)
@@ -259,7 +433,9 @@ module.exports = {
        type: 'warning'
      })
      if (confirm === 'confirm') {
-        const resp = await $.post('/platform/activity/basic/user/doDelete', {id, groupId})
+        this.pageForm.id=id
+        this.pageForm.groupId=groupId
+        const resp = await $.post('/platform/activity/basic/user/doDelete', this.pageForm)
        if (resp.code === 0) {
          this.$message.success(resp.msg)
          this.$set(this.pageForm, "groupId", null)
@@ -287,6 +463,11 @@ module.exports = {
      }
      await this.pageData()
    },
+    pageOrder(column) {
+      this.pageForm.pageOrderName = column.prop
+      this.pageForm.pageOrderBy = column.order
+      this.pageData()
+    },
    async pageData() {
      sublime.showLoadingbar()
      const resp = await $.post('/platform/activity/basic/user/pageData', this.pageForm)
@@ -296,6 +477,10 @@ module.exports = {
      }
      sublime.closeLoadingbar()
    },
+    async getRolesAndUnion() {
+      const {data} = await $.post("/platform/activity/basic/scope/getRolesAndUnion")
+      this.roleData = data
+    }

  },
  async created() {
@@ -304,6 +489,7 @@ module.exports = {
    await this.flushUnits()
    await this.getActivityGroup()
    this.viewGroupName()
+    await this.getRolesAndUnion()

  }
 }
@@ -280,6 +280,10 @@
      <el-card class="mt10" shadow="never">
        <table-tool :app="this" label="筛选人员">
          <template #func>
+            <el-button v-if="is_sysadmin||is_A06"
+                       type="primary" size="medium" icon="el-icon-printer" @click="dialogVisible = true">
+              导入XLSX设置分组
+            </el-button>
            <el-button @click="doExportUser"
                       size="medium"
                       type="primary" icon="el-icon-download">
@@ -350,6 +354,67 @@
                       v-loading="settingLoading">确 定</el-button>
        </span>
    </el-dialog>
+
+    <el-dialog title="人员导入" :visible.sync="dialogVisible" width="50%" :close-on-click-modal="false" append-to-body>
+
+
+      <el-timeline>
+        <el-timeline-item timestamp="下载模板" placement="top">
+          <el-card>
+            <el-button size="medium" type=""
+                       @click="window.open('/platform/activity/basic/user/downloadImport')"
+                       icon="el-icon-download">下载模板
+            </el-button>
+
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="上传文件" placement="top">
+          <el-card>
+
+            <el-upload
+                name="file"
+                ref="upload"
+                :on-remove="(file, fileList) => {
+                                                    importData.fileList = fileHandleRemove(file, fileList)
+                                                }"
+                :on-change="(file, fileList) => {
+                                                    importData.fileList = fileHandleChange(file, fileList,{type:['xls','xlsx']})
+                                                }"
+                :auto-upload="false"
+                :limit="1"
+                :file-list="importData.fileList">
+              <el-button size="medium" type="" icon="el-icon-upload"
+                         style="width: 200px">选择文件
+              </el-button>
+              <div class="el-upload__tip" slot="tip" style="color: #F56C6C">
+                只能上传 xls/xlsx 文件
+              </div>
+            </el-upload>
+
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item placement="top" timestamp="导入结果">
+          <el-card shadow="never">
+            <p>总记录数：{{ errorInfoData.totalCount }}</p>
+            <p>成功数：<span class="text-success">{{ errorInfoData.successCount }}</span></p>
+            <p>错误数：<span class="text-danger">{{ errorInfoData.errorCount }}</span></p>
+            <el-link @click="exportErrors" type="primary" v-if="errorInfoData.errorCount>0">下载错误记录
+            </el-link>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+
+
+      <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible = false" type="primary"
+                       :disabled="importLoading">取 消</el-button>
+            <el-button type="primary" @click="clearSearchCnd"
+                       :loading="importLoading">清空查询条件</el-button>
+            <el-button type="primary" @click="doImport" :loading="importLoading">核对人员</el-button>
+            <el-button type="primary" @click="doImportSearch"
+                       :loading="importLoading">查询人员</el-button>
+        </span>
+    </el-dialog>
  </div>
 </template>

@@ -435,7 +500,19 @@ module.exports = {
        setGroupName: [{required: true, message: '请输入分组名称', trigger: ['blur', 'change']}]
      },
      relatedSessionMenus: ['aca4d14498c145ceb5b24ed70776aae2', '733d7266652740a3aeac9da97ab5eeca', 'fe2d0768e26d4a80beeb159306bb8d01'],
-      roleData: {}
+      roleData: {},
+
+      dialogVisible: false,
+      importLoading: false,
+      importData: {
+        fileList: [],
+      },
+      errorInfoData: {
+        totalCount: 0,
+        successCount: 0,
+        errorCount: 0,
+        errorList: 0,
+      },
    }
  },
  computed: {
@@ -462,6 +539,98 @@ module.exports = {
    'user-cnd': httpVueLoader('/components/plugins/UserCnd.vue'),
  },
  methods: {
+    exportErrors() {
+      const data = this.errorInfoData.errorList
+
+      // 创建工作簿
+      const workbook = XLSX.utils.book_new();
+
+      // 创建工作表
+      const worksheet = XLSX.utils.json_to_sheet(data);
+
+      // 将工作表添加到工作簿
+      XLSX.utils.book_append_sheet(workbook, worksheet, 'Sheet1');
+
+      // 将工作簿转换为二进制对象
+      const excelBuffer = XLSX.write(workbook, {bookType: 'xlsx', type: 'array'});
+
+      // 将二进制对象转换为Blob对象
+      const blob = new Blob([excelBuffer], {type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});
+
+      // 创建下载链接并设置相关属性
+      const url = window.URL.createObjectURL(blob);
+      const link = document.createElement('a');
+      link.href = url;
+      link.download = '核对记录.xlsx';
+
+      // 模拟点击下载链接
+      document.body.appendChild(link);
+      link.click();
+      // 清理下载链接
+      document.body.removeChild(link);
+      window.URL.revokeObjectURL(url);
+
+    },
+    doImportSearch() {
+      this.doSearch()
+      this.dialogVisible = false
+    },
+    doImport() {
+      if (this.importData.fileList.length === 0) {
+        this.notifyWarning("请选择文件！")
+        return
+      }
+      const data = new FormData();
+      this.importData.fileList.forEach((val) => {
+        data.append("file", val.raw, val.raw.name);
+      });
+
+      this.importLoading = true
+      $.ajax({
+        url: "/platform/activity/basic/scope/doImport",
+        type: "post",
+        data: data,
+        processData: false,
+        contentType: false,
+        success: (data) => {
+          this.importLoading = false
+          if (data.code === 0) {
+            this.notifySuccess("核对成功")
+            this.errorInfoData = data.data
+          } else {
+            this.notifyWarning("核对失败")
+          }
+          this.errorInfoData = data.data
+          this.pageForm.existsLoginNameRedisKey = data.data.existsLoginNameRedisKey
+        },
+        error: (data) => {
+          this.notifyWarning("导入失败")
+          this.importLoading = false
+        }
+      });
+    },
+    clearSearchCnd() {
+      this.importData = {
+        fileList: [],
+      }
+      this.errorInfoData = {
+        totalCount: 0,
+        successCount: 0,
+        errorCount: 0,
+        errorList: [],
+      }
+      this.pageForm.userIds = []
+      this.successUserIdList = []
+      this.doSearch()
+      this.dialogVisible = false;
+      $.get('/platform/activity/basic/scope/clearSearchCnd', {existsLoginNameRedisKey: this.pageForm.existsLoginNameRedisKey}).then(res => {
+        if (res.code === 0) {
+          this.$message.success(res.msg)
+        } else {
+          this.$message.error(res.msg)
+        }
+      })
+    },
    doExportUser() {
      const {
        userId,
@@ -477,7 +646,8 @@ module.exports = {
        activityGroupId,
        age,
        reverseSelection,
-        activityUserCnd
+        activityUserCnd,
+        existsLoginNameRedisKey
      } = this.pageForm

      let props = {}
@@ -498,7 +668,8 @@ module.exports = {
          "&activityGroupId=" + activityGroupId +
          "&teacherMeetingId=" + teacherMeetingId +
          "&unionId=" + unionId +
-          "&unitId=" + unitId
+          "&unitId=" + unitId+
+          "&existsLoginNameRedisKey=" + existsLoginNameRedisKey
      )
    },
    doReset() {