员工亲属实体关联

ruoyi-ui/src/views/ccdiBaseStaff/index.vue

@@ -1,45 +1,57 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="姓名" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入姓名"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="柜员号" prop="staffId">
-        <el-input
-          v-model="queryParams.staffId"
-          placeholder="请输入7位柜员号"
-          clearable
-          maxlength="7"
-          @input="queryParams.staffId = queryParams.staffId.replace(/[^\d]/g, '')"
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所属部门" prop="deptId">
-        <treeselect v-model="queryParams.deptId" :options="deptOptions" :show-count="true" placeholder="请选择所属部门" clearable style="width: 240px" />
-      </el-form-item>
-      <el-form-item label="身份证号" prop="idCard">
-        <el-input
-          v-model="queryParams.idCard"
-          placeholder="请输入身份证号"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="状态" clearable style="width: 240px">
-          <el-option label="全部" value="" />
-          <el-option label="在职" value="0" />
-          <el-option label="离职" value="1" />
-        </el-select>
-      </el-form-item>
+    <el-form :model="queryParams" ref="queryForm" size="small" v-show="showSearch" label-width="100px" class="query-form">
+      <el-row :gutter="16">
+        <el-col :span="6">
+          <el-form-item label="姓名" prop="name">
+            <el-input
+              v-model="queryParams.name"
+              placeholder="请输入姓名"
+              clearable
+              style="width: 100%"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="柜员号" prop="staffId">
+            <el-input
+              v-model="queryParams.staffId"
+              placeholder="请输入7位柜员号"
+              clearable
+              maxlength="7"
+              @input="queryParams.staffId = queryParams.staffId.replace(/[^\d]/g, '')"
+              style="width: 100%"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="所属部门" prop="deptId">
+            <treeselect v-model="queryParams.deptId" :options="deptOptions" :show-count="true" placeholder="请选择所属部门" clearable style="width: 100%" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="身份证号" prop="idCard">
+            <el-input
+              v-model="queryParams.idCard"
+              placeholder="请输入身份证号"
+              clearable
+              style="width: 100%"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="状态" prop="status">
+            <el-select v-model="queryParams.status" placeholder="状态" clearable style="width: 100%">
+              <el-option label="全部" value="" />
+              <el-option label="在职" value="0" />
+              <el-option label="离职" value="1" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -69,16 +81,6 @@
           v-hasPermi="['ccdi:employee:import']"
         >导入</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-upload"
-          size="mini"
-          @click="handleAssetImport"
-          v-hasPermi="['ccdi:employee:import']"
-        >导入资产信息</el-button>
-      </el-col>
       <el-col :span="1.5" v-if="showFailureButton">
         <el-tooltip
           :content="getLastImportTooltip()"
@@ -386,7 +388,7 @@
         :limit="1"
         accept=".xlsx, .xls"
         :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :action="upload.url"
         :disabled="upload.isUploading"
         :on-progress="handleFileUploadProgress"
         :on-success="handleFileSuccess"
@@ -396,11 +398,13 @@
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip" slot="tip">
-          <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的员工数据
           <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
         </div>
         <div class="el-upload__tip" slot="tip">
-          <span>仅允许导入"xls"或"xlsx"格式文件。</span>
+          <span>模板包含“员工信息”和“员工资产信息”两个Sheet，可单独填写其中一个，也可同时填写两个。</span>
+        </div>
+        <div class="el-upload__tip" slot="tip">
+          <span>仅允许导入"xls"或"xlsx"格式文件；员工信息Sheet命中现有员工会直接报错，资产信息Sheet仅支持员工本人资产。</span>
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -417,41 +421,6 @@
       @close="handleImportResultClose"
     />
 
-    <el-dialog :title="assetUpload.title" :visible.sync="assetUpload.open" width="400px" append-to-body @close="handleAssetImportDialogClose" v-loading="assetUpload.isUploading" element-loading-text="正在导入员工资产数据,请稍候..." element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.7)">
-      <el-upload
-        ref="assetUpload"
-        :limit="1"
-        accept=".xlsx, .xls"
-        :headers="assetUpload.headers"
-        :action="assetUpload.url"
-        :disabled="assetUpload.isUploading"
-        :on-progress="handleAssetFileUploadProgress"
-        :on-success="handleAssetFileSuccess"
-        :auto-upload="false"
-        drag
-      >
-        <i class="el-icon-upload"></i>
-        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-        <div class="el-upload__tip" slot="tip">
-          <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline;" @click="importAssetTemplate">下载员工资产模板</el-link>
-        </div>
-        <div class="el-upload__tip" slot="tip">
-          <span>仅支持导入员工本人资产数据，文件需为"xls"或"xlsx"格式，导入身份证号需与员工本人一致。</span>
-        </div>
-      </el-upload>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitAssetFileForm" :loading="assetUpload.isUploading">确 定</el-button>
-        <el-button @click="assetUpload.open = false" :disabled="assetUpload.isUploading">取 消</el-button>
-      </div>
-    </el-dialog>
-
-    <import-result-dialog
-      :visible.sync="assetImportResultVisible"
-      :content="assetImportResultContent"
-      title="员工资产导入结果"
-      @close="handleAssetImportResultClose"
-    />
-
     <!-- 导入失败记录对话框 -->
     <el-dialog
       title="导入失败记录"
@@ -468,6 +437,8 @@
       />
 
         <el-table :data="failureList" v-loading="failureLoading">
+        <el-table-column label="Sheet" prop="sheetName" align="center" min-width="120" />
+        <el-table-column label="Excel行号" prop="rowNum" align="center" width="100" />
         <el-table-column label="姓名" prop="name" align="center" />
         <el-table-column label="柜员号" prop="staffId" align="center" />
         <el-table-column label="身份证号" prop="idCard" align="center" />
@@ -510,7 +481,8 @@
       />
 
       <el-table :data="assetFailureList" v-loading="assetFailureLoading">
-        <el-table-column label="归属员工身份证号" prop="familyId" align="center" min-width="180" />
+        <el-table-column label="Sheet" prop="sheetName" align="center" min-width="120" />
+        <el-table-column label="Excel行号" prop="rowNum" align="center" width="100" />
         <el-table-column label="资产实际持有人身份证号" prop="personId" align="center" min-width="180" />
         <el-table-column label="资产大类" prop="assetMainType" align="center" />
         <el-table-column label="资产小类" prop="assetSubType" align="center" />
@@ -649,8 +621,6 @@ export default {
         title: "",
         // 是否禁用上传
         isUploading: false,
-        // 是否更新已经存在的数据
-        updateSupport: 0,
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
@@ -659,8 +629,6 @@ export default {
       // 导入结果弹窗
       importResultVisible: false,
       importResultContent: "",
-      assetImportResultVisible: false,
-      assetImportResultContent: "",
       // 轮询定时器
       pollingTimer: null,
       assetPollingTimer: null,
@@ -679,13 +647,6 @@ export default {
         pageNum: 1,
         pageSize: 10
       },
-      assetUpload: {
-        open: false,
-        title: "",
-        isUploading: false,
-        headers: { Authorization: "Bearer " + getToken() },
-        url: process.env.VUE_APP_BASE_API + "/ccdi/baseStaff/asset/importData"
-      },
       assetFailureDialogVisible: false,
       assetFailureList: [],
       assetFailureLoading: false,
@@ -1214,13 +1175,9 @@ export default {
     },
     /** 导入按钮操作 */
     handleImport() {
-      this.upload.title = "员工数据导入";
+      this.upload.title = "员工信息维护导入";
       this.upload.open = true;
     },
-    handleAssetImport() {
-      this.assetUpload.title = "员工资产数据导入";
-      this.assetUpload.open = true;
-    },
     /** 导入对话框关闭事件 */
     handleImportDialogClose() {
       this.$nextTick(() => {
@@ -1229,130 +1186,79 @@ export default {
         }
       });
     },
-    handleAssetImportDialogClose() {
-      this.$nextTick(() => {
-        if (this.$refs.assetUpload) {
-          this.$refs.assetUpload.clearFiles();
-        }
-      });
-    },
     /** 下载模板操作 */
     importTemplate() {
-      this.download('ccdi/baseStaff/importTemplate', {}, `员工信息模板_${new Date().getTime()}.xlsx`)
-    },
-    importAssetTemplate() {
-      this.download('ccdi/baseStaff/asset/importTemplate', {}, `员工资产信息模板_${new Date().getTime()}.xlsx`)
+      this.download('ccdi/baseStaff/importTemplate', {}, `员工信息维护导入模板_${new Date().getTime()}.xlsx`)
     },
     // 文件上传中处理
-    handleFileUploadProgress(event, file, fileList) {
+    handleFileUploadProgress() {
       this.upload.isUploading = true;
     },
-    handleAssetFileUploadProgress() {
-      this.assetUpload.isUploading = true;
-    },
     // 文件上传成功处理
-    handleFileSuccess(response, file, fileList) {
+    handleFileSuccess(response) {
       this.upload.isUploading = false;
       this.upload.open = false;
 
-      if (response.code === 200) {
-        // 验证响应数据完整性
-        if (!response.data || !response.data.taskId) {
-          this.$modal.msgError('导入任务创建失败:缺少任务ID');
-          this.upload.isUploading = false;
-          this.upload.open = true;
-          return;
-        }
+      if (response.code !== 200) {
+        this.$modal.msgError(response.msg);
+        return;
+      }
 
-        const taskId = response.data.taskId;
+      const importResult = response.data || {};
+      const staffTaskId = importResult.staffTaskId;
+      const assetTaskId = importResult.assetTaskId;
+      if (!staffTaskId && !assetTaskId) {
+        this.$modal.msgError('导入任务创建失败:缺少任务ID');
+        this.upload.open = true;
+        return;
+      }
 
-        // 清除旧的导入记录(防止并发)
+      if (staffTaskId) {
         if (this.pollingTimer) {
           clearInterval(this.pollingTimer);
           this.pollingTimer = null;
         }
-
         this.clearImportTaskFromStorage();
-
-        // 保存新任务的初始状态
         this.saveImportTaskToStorage({
-          taskId: taskId,
+          taskId: staffTaskId,
           status: 'PROCESSING',
           timestamp: Date.now(),
           hasFailures: false
         });
-
-        // 重置状态
         this.showFailureButton = false;
-        this.currentTaskId = taskId;
-
-        // 显示后台处理提示
-        this.$notify({
-          title: '导入任务已提交',
-          message: '正在后台处理中,处理完成后将通知您',
-          type: 'info',
-          duration: 3000
-        });
-
-        // 开始轮询检查状态
-        this.startImportStatusPolling(taskId);
-      } else {
-        this.$modal.msgError(response.msg);
+        this.currentTaskId = staffTaskId;
+        this.startImportStatusPolling(staffTaskId);
       }
-    },
-    handleAssetFileSuccess(response) {
-      this.assetUpload.isUploading = false;
-      this.assetUpload.open = false;
-
-      if (response.code === 200) {
-        if (!response.data || !response.data.taskId) {
-          this.$modal.msgError('员工资产导入任务创建失败:缺少任务ID');
-          this.assetUpload.isUploading = false;
-          this.assetUpload.open = true;
-          return;
-        }
-
-        const taskId = response.data.taskId;
 
+      if (assetTaskId) {
         if (this.assetPollingTimer) {
           clearInterval(this.assetPollingTimer);
           this.assetPollingTimer = null;
         }
-
         this.clearAssetImportTaskFromStorage();
         this.saveAssetImportTaskToStorage({
-          taskId: taskId,
+          taskId: assetTaskId,
           status: 'PROCESSING',
           timestamp: Date.now(),
           hasFailures: false
         });
-
         this.assetShowFailureButton = false;
-        this.assetCurrentTaskId = taskId;
-
-        this.$notify({
-          title: '员工资产导入任务已提交',
-          message: '正在后台处理中,处理完成后将通知您',
-          type: 'info',
-          duration: 3000
-        });
-
-        this.startAssetImportStatusPolling(taskId);
-      } else if (response.code === 601) {
-        this.$modal.msgWarning(response.msg);
-      } else {
-        this.$modal.msgError(response.msg);
+        this.assetCurrentTaskId = assetTaskId;
+        this.startAssetImportStatusPolling(assetTaskId);
       }
+
+      this.$notify({
+        title: '导入任务已提交',
+        message: importResult.message || '正在后台处理中,处理完成后将通知您',
+        type: 'info',
+        duration: 3000
+      });
     },
     // 导入结果弹窗关闭
     handleImportResultClose() {
       this.importResultVisible = false;
       this.importResultContent = "";
     },
-    handleAssetImportResultClose() {
-      this.assetImportResultVisible = false;
-      this.assetImportResultContent = "";
-    },
     /** 开始轮询导入状态 */
     startImportStatusPolling(taskId) {
       let pollCount = 0;
@@ -1560,15 +1466,25 @@ export default {
     // 提交上传文件
     submitFileForm() {
       this.$refs.upload.submit();
-    },
-    submitAssetFileForm() {
-      this.$refs.assetUpload.submit();
     }
   }
 };
 </script>
 
 <style scoped>
+.query-form ::v-deep .el-row {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.query-form ::v-deep .el-col {
+  float: none;
+}
+
+.query-form ::v-deep .el-form-item {
+  margin-right: 0;
+}
+
 .detail-form .el-form-item {
   margin-bottom: 10px;
 }