wkc/ccdi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

员工亲属实体关联

Browse Source
This commit is contained in:
wkc
2026-04-24 13:29:13 +08:00
parent b7db711906
commit aa08ab4711
51 changed files with 2070 additions and 845 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-ui/src/api/ccdiBaseStaff.js
View File

@@ -51,10 +51,10 @@ export function importTemplate() {
})
}
// 导入员工
export function importData(data, updateSupport) {
// 导入员工双Sheet数据
export function importData(data) {
return request({
url: '/ccdi/baseStaff/importData?updateSupport=' + updateSupport,
url: '/ccdi/baseStaff/importData',
method: 'post',
data: data
})

144
ruoyi-ui/src/views/ccdiAccountInfo/index.vue
View File

@@ -6,62 +6,81 @@
ref="queryForm"
:model="queryParams"
size="small"
:inline="true"
class="query-form"
label-width="96px"
>
<el-form-item label="所属人类型">
<el-select v-model="queryParams.ownerType" placeholder="请选择所属人类型" clearable style="width: 180px">
<el-option label="员工" value="EMPLOYEE" />
<el-option label="员工关系人" value="RELATION" />
<el-option label="中介" value="INTERMEDIARY" />
<el-option label="外部人员" value="EXTERNAL" />
</el-select>
</el-form-item>
<el-form-item label="员工姓名">
<el-input v-model="queryParams.staffName" placeholder="请输入员工姓名" clearable style="width: 220px" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="账户范围">
<el-select v-model="queryParams.bankScope" placeholder="请选择账户范围" clearable style="width: 160px">
<el-option label="行内" value="INTERNAL" />
<el-option label="行外" value="EXTERNAL" />
</el-select>
</el-form-item>
<el-form-item label="关系类型">
<el-select v-model="queryParams.relationType" placeholder="请选择关系类型" clearable style="width: 180px">
<el-option v-for="item in relationTypeOptions" :key="item" :label="item" :value="item" />
</el-select>
</el-form-item>
<el-form-item label="账户姓名">
<el-input v-model="queryParams.accountName" placeholder="请输入账户姓名" clearable style="width: 220px" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="账户类型">
<el-select v-model="queryParams.accountType" placeholder="请选择账户类型" clearable style="width: 180px">
<el-option label="银行账户" value="BANK" />
<el-option label="证券账户" value="SECURITIES" />
<el-option label="支付账户" value="PAYMENT" />
<el-option label="其他" value="OTHER" />
</el-select>
</el-form-item>
<el-form-item label="是否实控">
<el-select v-model="queryParams.isActualControl" placeholder="请选择是否实控" clearable style="width: 180px">
<el-option label="是" :value="1" />
<el-option label="否" :value="0" />
</el-select>
</el-form-item>
<el-form-item label="风险等级">
<el-select v-model="queryParams.riskLevel" placeholder="请选择风险等级" clearable style="width: 180px">
<el-option label="LOW" value="LOW" />
<el-option label="MEDIUM" value="MEDIUM" />
<el-option label="HIGH" value="HIGH" />
</el-select>
</el-form-item>
<el-form-item label="状态">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable style="width: 160px">
<el-option label="正常" :value="1" />
<el-option label="已销户" :value="2" />
</el-select>
</el-form-item>
<el-row :gutter="16">
<el-col :span="6">
<el-form-item label="所属人类型">
<el-select v-model="queryParams.ownerType" placeholder="请选择所属人类型" clearable style="width: 100%">
<el-option label="员工" value="EMPLOYEE" />
<el-option label="员工关系人" value="RELATION" />
<el-option label="中介" value="INTERMEDIARY" />
<el-option label="外部人员" value="EXTERNAL" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="员工姓名">
<el-input v-model="queryParams.staffName" placeholder="请输入员工姓名" clearable style="width: 100%" @keyup.enter.native="handleQuery" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="账户范围">
<el-select v-model="queryParams.bankScope" placeholder="请选择账户范围" clearable style="width: 100%">
<el-option label="行内" value="INTERNAL" />
<el-option label="行外" value="EXTERNAL" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="关系类型">
<el-select v-model="queryParams.relationType" placeholder="请选择关系类型" clearable style="width: 100%">
<el-option v-for="item in relationTypeOptions" :key="item" :label="item" :value="item" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="账户姓名">
<el-input v-model="queryParams.accountName" placeholder="请输入账户姓名" clearable style="width: 100%" @keyup.enter.native="handleQuery" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="账户类型">
<el-select v-model="queryParams.accountType" placeholder="请选择账户类型" clearable style="width: 100%">
<el-option label="银行账户" value="BANK" />
<el-option label="证券账户" value="SECURITIES" />
<el-option label="支付账户" value="PAYMENT" />
<el-option label="其他" value="OTHER" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="是否实控">
<el-select v-model="queryParams.isActualControl" placeholder="请选择是否实控" clearable style="width: 100%">
<el-option label="是" :value="1" />
<el-option label="否" :value="0" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="风险等级">
<el-select v-model="queryParams.riskLevel" placeholder="请选择风险等级" clearable style="width: 100%">
<el-option label="LOW" value="LOW" />
<el-option label="MEDIUM" value="MEDIUM" />
<el-option label="HIGH" value="HIGH" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="状态">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable style="width: 100%">
<el-option label="正常" :value="1" />
<el-option label="已销户" :value="2" />
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-row :gutter="10" class="mb8">
@@ -838,6 +857,19 @@ export default {
</script>
<style lang="scss" 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;
}
.account-page {
min-height: calc(100vh - 84px);
background: #f5f7fa;
@@ -881,10 +913,4 @@ export default {
font-weight: 700;
}
@media (max-width: 768px) {
.query-form ::v-deep .el-form-item {
display: block;
margin-right: 0;
}
}
</style>

294
ruoyi-ui/src/views/ccdiBaseStaff/index.vue
View File

@@ -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;
}

91
ruoyi-ui/src/views/ccdiCustEnterpriseRelation/index.vue
View File

@@ -1,39 +1,49 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
<el-form-item label="身份证号" prop="personId">
<el-input
v-model="queryParams.personId"
placeholder="请输入身份证号"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="统一社会信用代码" prop="socialCreditCode">
<el-input
v-model="queryParams.socialCreditCode"
placeholder="请输入统一社会信用代码"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="企业名称" prop="enterpriseName">
<el-input
v-model="queryParams.enterpriseName"
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="1" />
<el-option label="无效" :value="0" />
</el-select>
</el-form-item>
<el-form :model="queryParams" ref="queryForm" size="small" v-show="showSearch" label-width="120px" class="query-form">
<el-row :gutter="16">
<el-col :span="6">
<el-form-item label="身份证号" prop="personId">
<el-input
v-model="queryParams.personId"
placeholder="请输入身份证号"
clearable
style="width: 100%"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="统一社会信用代码" prop="socialCreditCode">
<el-input
v-model="queryParams.socialCreditCode"
placeholder="请输入统一社会信用代码"
clearable
style="width: 100%"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="企业名称" prop="enterpriseName">
<el-input
v-model="queryParams.enterpriseName"
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="1" />
<el-option label="无效" :value="0" />
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-row :gutter="10" class="mb8">
@@ -831,6 +841,19 @@ export default {
</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-container {
padding: 0 20px;
}

93
ruoyi-ui/src/views/ccdiCustFmyRelation/index.vue
View File

@@ -1,40 +1,50 @@
<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="personId">
<el-input
v-model="queryParams.personId"
placeholder="请输入身份证号（支持模糊搜索）"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="关系类型" prop="relationType">
<el-select v-model="queryParams.relationType" placeholder="请选择关系类型" clearable style="width: 240px">
<el-option
v-for="item in relationTypeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="关系人姓名" prop="relationName">
<el-input
v-model="queryParams.relationName"
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="1" />
<el-option label="无效" :value="0" />
</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="personId">
<el-input
v-model="queryParams.personId"
placeholder="请输入身份证号（支持模糊搜索）"
clearable
style="width: 100%"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="关系类型" prop="relationType">
<el-select v-model="queryParams.relationType" placeholder="请选择关系类型" clearable style="width: 100%">
<el-option
v-for="item in relationTypeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="关系人姓名" prop="relationName">
<el-input
v-model="queryParams.relationName"
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="1" />
<el-option label="无效" :value="0" />
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-row :gutter="10" class="mb8">
@@ -1087,6 +1097,19 @@ export default {
</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-container {
padding: 0 20px;
}

95
ruoyi-ui/src/views/ccdiIntermediary/components/SearchForm.vue
View File

@@ -1,39 +1,49 @@
<template>
<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: 220px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="证件号" prop="certificateNo">
<el-input
v-model="queryParams.certificateNo"
placeholder="请输入证件号"
clearable
style="width: 220px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="记录类型" prop="recordType">
<el-select v-model="queryParams.recordType" placeholder="请选择记录类型" clearable style="width: 180px">
<el-option label="中介本人" value="INTERMEDIARY" />
<el-option label="中介亲属" value="RELATIVE" />
<el-option label="关联机构" value="ENTERPRISE_RELATION" />
</el-select>
</el-form-item>
<el-form-item label="关联中介信息" prop="relatedIntermediaryKeyword">
<el-input
v-model="queryParams.relatedIntermediaryKeyword"
placeholder="请输入关联中介姓名或证件号"
clearable
style="width: 260px"
@keyup.enter.native="handleQuery"
/>
</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="certificateNo">
<el-input
v-model="queryParams.certificateNo"
placeholder="请输入证件号"
clearable
style="width: 100%"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="记录类型" prop="recordType">
<el-select v-model="queryParams.recordType" placeholder="请选择记录类型" clearable style="width: 100%">
<el-option label="中介本人" value="INTERMEDIARY" />
<el-option label="中介亲属" value="RELATIVE" />
<el-option label="关联机构" value="ENTERPRISE_RELATION" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="关联中介信息" prop="relatedIntermediaryKeyword">
<el-input
v-model="queryParams.relatedIntermediaryKeyword"
placeholder="请输入关联中介姓名或证件号"
clearable
style="width: 100%"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
</template>
@@ -57,3 +67,18 @@ export default {
}
};
</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;
}
</style>

101
ruoyi-ui/src/views/ccdiPurchaseTransaction/index.vue
View File

@@ -1,44 +1,54 @@
<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="projectName">
<el-input
v-model="queryParams.projectName"
placeholder="请输入项目名称"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="标的物名称" prop="subjectName">
<el-input
v-model="queryParams.subjectName"
placeholder="请输入标的物名称"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="申请人" prop="applicantName">
<el-input
v-model="queryParams.applicantName"
placeholder="请输入申请人"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="申请日期">
<el-date-picker
v-model="dateRange"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
/>
</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="projectName">
<el-input
v-model="queryParams.projectName"
placeholder="请输入项目名称"
clearable
style="width: 100%"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="标的物名称" prop="subjectName">
<el-input
v-model="queryParams.subjectName"
placeholder="请输入标的物名称"
clearable
style="width: 100%"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="申请人" prop="applicantName">
<el-input
v-model="queryParams.applicantName"
placeholder="请输入申请人"
clearable
style="width: 100%"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="申请日期">
<el-date-picker
v-model="dateRange"
style="width: 100%"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-row :gutter="10" class="mb8">
@@ -1360,6 +1370,19 @@ export default {
</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-container {
padding: 0 20px;
}

266
ruoyi-ui/src/views/ccdiStaffFmyRelation/index.vue
View File

@@ -1,40 +1,50 @@
<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="personName">
<el-input
v-model="queryParams.personName"
placeholder="请输入员工姓名"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="关系类型" prop="relationType">
<el-select v-model="queryParams.relationType" placeholder="请选择关系类型" clearable style="width: 240px">
<el-option
v-for="item in relationTypeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="关系人姓名" prop="relationName">
<el-input
v-model="queryParams.relationName"
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="1" />
<el-option label="无效" :value="0" />
</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="personName">
<el-input
v-model="queryParams.personName"
placeholder="请输入员工姓名"
clearable
style="width: 100%"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="关系类型" prop="relationType">
<el-select v-model="queryParams.relationType" placeholder="请选择关系类型" clearable style="width: 100%">
<el-option
v-for="item in relationTypeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="关系人姓名" prop="relationName">
<el-input
v-model="queryParams.relationName"
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="1" />
<el-option label="无效" :value="0" />
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-row :gutter="10" class="mb8">
@@ -64,16 +74,6 @@
v-hasPermi="['ccdi:staffFmyRelation: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:staffFmyRelation:import']"
>导入亲属资产信息</el-button>
</el-col>
<el-col :span="1.5" v-if="showFailureButton">
<el-tooltip
:content="getLastImportTooltip()"
@@ -534,6 +534,10 @@
width="400px"
append-to-body
@close="handleImportDialogClose"
v-loading="upload.isUploading"
element-loading-text="正在导入数据,请稍候..."
element-loading-spinner="el-icon-loading"
element-loading-background="rgba(0, 0, 0, 0.7)"
>
<el-upload
ref="upload"
@@ -553,7 +557,10 @@
<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将根据关系人证件号自动识别归属员工。</span>
</div>
</el-upload>
<div slot="footer" class="dialog-footer">
@@ -562,44 +569,6 @@
</div>
</el-dialog>
<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>
<!-- 导入失败记录对话框 -->
<el-dialog
title="导入失败记录"
@@ -616,6 +585,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="personId" align="center" width="180"/>
<el-table-column label="关系类型" prop="relationType" align="center" width="100"/>
<el-table-column label="关系人姓名" prop="relationName" align="center" width="120"/>
@@ -652,6 +623,8 @@
/>
<el-table :data="assetFailureList" v-loading="assetFailureLoading">
<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" min-width="120" />
<el-table-column label="资产小类" prop="assetSubType" align="center" min-width="120" />
@@ -803,13 +776,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/assetInfo/importData"
},
assetImportPollingTimer: null,
assetShowFailureButton: false,
assetCurrentTaskId: null,
@@ -1209,113 +1175,79 @@ export default {
},
/** 导入按钮操作 */
handleImport() {
this.upload.title = "员工亲属关系数据导入";
this.upload.title = "员工亲属关系维护导入";
this.upload.open = true;
},
handleAssetImport() {
this.assetUpload.title = "亲属资产数据导入";
this.assetUpload.open = true;
},
/** 下载模板操作 */
importTemplate() {
this.download('ccdi/staffFmyRelation/importTemplate', {}, `员工亲属关系导入模板_${new Date().getTime()}.xlsx`);
},
importAssetTemplate() {
this.download('ccdi/assetInfo/importTemplate', {}, `亲属资产信息模板_${new Date().getTime()}.xlsx`);
this.download('ccdi/staffFmyRelation/importTemplate', {}, `员工亲属关系维护导入模板_${new Date().getTime()}.xlsx`);
},
// 文件上传中处理
handleFileUploadProgress(event, file, fileList) {
this.upload.isUploading = true;
},
handleAssetFileUploadProgress() {
this.assetUpload.isUploading = true;
},
// 文件上传成功处理
handleFileSuccess(response, file, fileList) {
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 relationTaskId = importResult.relationTaskId
const assetTaskId = importResult.assetTaskId
if (!relationTaskId && !assetTaskId) {
this.$modal.msgError('导入任务创建失败:缺少任务ID');
this.upload.open = true;
return;
}
if (relationTaskId) {
if (this.importPollingTimer) {
clearInterval(this.importPollingTimer);
this.importPollingTimer = null;
}
this.clearImportTaskFromStorage();
this.saveImportTaskToStorage({
taskId: taskId,
taskId: relationTaskId,
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 = relationTaskId;
this.startImportStatusPolling(relationTaskId);
}
},
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.assetImportPollingTimer) {
clearInterval(this.assetImportPollingTimer);
this.assetImportPollingTimer = 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 {
this.$modal.msgError(response.msg);
this.assetCurrentTaskId = assetTaskId;
this.startAssetImportStatusPolling(assetTaskId);
}
this.$notify({
title: '导入任务已提交',
message: importResult.message || '正在后台处理中,处理完成后将通知您',
type: 'info',
duration: 3000
});
},
/** 开始轮询导入状态 */
startImportStatusPolling(taskId) {
@@ -1497,9 +1429,6 @@ export default {
submitFileForm() {
this.$refs.upload.submit();
},
submitAssetFileForm() {
this.$refs.assetUpload.submit();
},
// 关闭导入对话框
handleImportDialogClose() {
this.upload.isUploading = false;
@@ -1509,14 +1438,6 @@ export default {
}
});
},
handleAssetImportDialogClose() {
this.assetUpload.isUploading = false;
this.$nextTick(() => {
if (this.$refs.assetUpload) {
this.$refs.assetUpload.clearFiles();
}
});
},
/**
* 保存导入任务到localStorage
*/
@@ -1644,6 +1565,19 @@ export default {
</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-container {
padding: 0 20px;
}

135
ruoyi-ui/src/views/ccdiStaffRecruitment/index.vue
View File

@@ -1,59 +1,73 @@
<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="recruitName">
<el-input
v-model="queryParams.recruitName"
placeholder="请输入招聘项目名称"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="职位名称" prop="posName">
<el-input
v-model="queryParams.posName"
placeholder="请输入职位名称"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="候选人姓名" prop="candName">
<el-input
v-model="queryParams.candName"
placeholder="请输入候选人姓名"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="证件号码" prop="candId">
<el-input
v-model="queryParams.candId"
placeholder="请输入证件号码"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="录用情况" prop="admitStatus">
<el-select v-model="queryParams.admitStatus" placeholder="请选择录用情况" clearable style="width: 240px">
<el-option label="录用" value="录用" />
<el-option label="未录用" value="未录用" />
<el-option label="放弃" value="放弃" />
</el-select>
</el-form-item>
<el-form-item label="招聘类型" prop="recruitType">
<el-select v-model="queryParams.recruitType" placeholder="请选择招聘类型" clearable style="width: 240px">
<el-option
v-for="item in recruitTypeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</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="recruitName">
<el-input
v-model="queryParams.recruitName"
placeholder="请输入招聘项目名称"
clearable
style="width: 100%"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="职位名称" prop="posName">
<el-input
v-model="queryParams.posName"
placeholder="请输入职位名称"
clearable
style="width: 100%"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="候选人姓名" prop="candName">
<el-input
v-model="queryParams.candName"
placeholder="请输入候选人姓名"
clearable
style="width: 100%"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="证件号码" prop="candId">
<el-input
v-model="queryParams.candId"
placeholder="请输入证件号码"
clearable
style="width: 100%"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="录用情况" prop="admitStatus">
<el-select v-model="queryParams.admitStatus" placeholder="请选择录用情况" clearable style="width: 100%">
<el-option label="录用" value="录用" />
<el-option label="未录用" value="未录用" />
<el-option label="放弃" value="放弃" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="招聘类型" prop="recruitType">
<el-select v-model="queryParams.recruitType" placeholder="请选择招聘类型" clearable style="width: 100%">
<el-option
v-for="item in recruitTypeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-row :gutter="10" class="mb8">
@@ -1501,6 +1515,19 @@ export default {
</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-container {
padding: 0 20px;
}

144
ruoyi-ui/src/views/ccdiStaffTransfer/index.vue
View File

@@ -1,64 +1,78 @@
<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="staffId">
<el-select v-model="queryParams.staffId" placeholder="请选择员工工号" clearable filterable style="width: 240px">
<el-option
v-for="item in staffOptions"
:key="item.staffId"
:label="item.staffId"
:value="item.staffId"
/>
</el-select>
</el-form-item>
<el-form-item label="员工姓名" prop="staffName">
<el-input
v-model="queryParams.staffName"
placeholder="请输入员工姓名"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="调动类型" prop="transferType">
<el-select v-model="queryParams.transferType" placeholder="请选择调动类型" clearable style="width: 240px">
<el-option
v-for="dict in dict.type.ccdi_transfer_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="调动日期" prop="transferDateRange">
<el-date-picker
v-model="queryParams.transferDateRange"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
style="width: 240px"
/>
</el-form-item>
<el-form-item label="调动前部门" prop="deptNameBefore">
<el-input
v-model="queryParams.deptNameBefore"
placeholder="请输入调动前部门"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="调动后部门" prop="deptNameAfter">
<el-input
v-model="queryParams.deptNameAfter"
placeholder="请输入调动后部门"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</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="staffId">
<el-select v-model="queryParams.staffId" placeholder="请选择员工工号" clearable filterable style="width: 100%">
<el-option
v-for="item in staffOptions"
:key="item.staffId"
:label="item.staffId"
:value="item.staffId"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="员工姓名" prop="staffName">
<el-input
v-model="queryParams.staffName"
placeholder="请输入员工姓名"
clearable
style="width: 100%"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="调动类型" prop="transferType">
<el-select v-model="queryParams.transferType" placeholder="请选择调动类型" clearable style="width: 100%">
<el-option
v-for="dict in dict.type.ccdi_transfer_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="调动日期" prop="transferDateRange">
<el-date-picker
v-model="queryParams.transferDateRange"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="调动前部门" prop="deptNameBefore">
<el-input
v-model="queryParams.deptNameBefore"
placeholder="请输入调动前部门"
clearable
style="width: 100%"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="调动后部门" prop="deptNameAfter">
<el-input
v-model="queryParams.deptNameAfter"
placeholder="请输入调动后部门"
clearable
style="width: 100%"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-row :gutter="10" class="mb8">
@@ -955,4 +969,16 @@ export default {
</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;
}
</style>

23
ruoyi-ui/tests/unit/staff-family-asset-detail-import-ui.test.js
View File

@@ -9,25 +9,23 @@ const componentPath = path.resolve(
const source = fs.readFileSync(componentPath, "utf8");
[
"导入亲属资产信息",
"查看亲属资产导入失败记录",
"assetUpload",
"assetImportPollingTimer",
"assetCurrentTaskId",
"assetFailureDialogVisible",
"staff_fmy_asset_import_last_task",
"亲属资产数据导入",
"亲属资产导入失败记录",
"viewAssetImportFailures()",
"handleAssetImport()",
"handleAssetFileSuccess(response)",
"startAssetImportStatusPolling(taskId)",
"getAssetFailureList()",
"clearAssetImportHistory()",
'from "@/api/ccdiAssetInfo"',
"/ccdi/assetInfo/importData",
"ccdi/assetInfo/importTemplate",
"亲属资产信息模板_",
"relationTaskId",
"assetTaskId",
"模板包含“员工亲属关系信息”和“亲属资产信息”两个Sheet，可单独填写其中一个，也可同时填写两个。",
"/ccdi/staffFmyRelation/importData",
"ccdi/staffFmyRelation/importTemplate",
"员工亲属关系维护导入模板_",
].forEach((token) => {
assert(source.includes(token), `亲属资产导入 UI 缺少关键结构或状态: ${token}`);
});
@@ -42,6 +40,15 @@ const source = fs.readFileSync(componentPath, "utf8");
});
[
"导入亲属资产信息",
"assetUpload",
"handleAssetImport()",
"handleAssetFileSuccess(response)",
"submitAssetFileForm()",
"handleAssetImportDialogClose()",
"/ccdi/assetInfo/importData",
"ccdi/assetInfo/importTemplate",
"亲属资产信息模板_",
"@/api/ccdiBaseStaffAsset",
"/ccdi/baseStaff/asset/importData",
"ccdi/baseStaff/asset/importTemplate",