refactor(dms): 修改人员相关字段名称

- 将"执行人员"改为"负责人员",涉及多个组件和页面
- 调整相关表单和表格列的标签
- 修改验证规则中的错误消息
master
zch 4 days ago
parent 4b974de571
commit 7a91ec6de8

@ -4,30 +4,30 @@
<el-card shadow="never">
<div style="display: flex; justify-content: space-between">
<div>
<el-button
v-if="submitButtonShow"
:loading="buttonLoading"
type="info"
<el-button
v-if="submitButtonShow"
:loading="buttonLoading"
type="info"
@click="submitForm('draft')">
暂存
</el-button>
<el-button
v-if="submitButtonShow"
:loading="buttonLoading"
type="primary"
<el-button
v-if="submitButtonShow"
:loading="buttonLoading"
type="primary"
@click="submitForm('submit')">
提交
</el-button>
<el-button
v-if="approvalButtonShow"
:loading="buttonLoading"
type="primary"
<el-button
v-if="approvalButtonShow"
:loading="buttonLoading"
type="primary"
@click="approvalVerifyOpen">
{{ currentStepName }}
</el-button>
<el-button
v-if="workOrder?.wfDefinitionId"
type="primary"
<el-button
v-if="workOrder?.wfDefinitionId"
type="primary"
@click="handleApprovalRecord">
流程进度
</el-button>
@ -65,14 +65,14 @@
<!-- 当前步骤处理区域 -->
<el-card shadow="never">
<h4 class="form-header">{{ currentStepTitle }}</h4>
<el-form
ref="processFormRef"
v-loading="loading"
:disabled="routeParams.type === 'view'"
:model="form"
:rules="rules"
<el-form
ref="processFormRef"
v-loading="loading"
:disabled="routeParams.type === 'view'"
:model="form"
:rules="rules"
label-width="120px">
<el-row>
<el-col :span="8">
<el-form-item label="巡检线路" prop="inspectRouteId">
@ -85,18 +85,18 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="执行人员" prop="performer">
<el-input v-model="form.performer" placeholder="请输入执行人员" />
<el-form-item label="负责人员" prop="performer">
<el-input v-model="form.performer" placeholder="请输入负责人员" />
</el-form-item>
</el-col>
<!-- 处理意见除第一步外都需要 -->
<el-col :span="24" v-if="needProcessResolution">
<el-form-item label="处理意见" prop="processHandleResolution">
<el-input
v-model="form.processHandleResolution"
type="textarea"
:rows="3"
<el-input
v-model="form.processHandleResolution"
type="textarea"
:rows="3"
placeholder="请输入处理意见" />
</el-form-item>
</el-col>
@ -105,11 +105,11 @@
</el-card>
<!-- 审批组件 -->
<submitVerify
ref="submitVerifyRef"
:task-variables="taskVariables"
<submitVerify
ref="submitVerifyRef"
:task-variables="taskVariables"
@submit-callback="submitCallback" />
<!-- 审批记录组件 -->
<approvalRecord ref="approvalRecordRef" />
</div>
@ -167,7 +167,7 @@ const form = reactive<Partial<DmsBillsInspectInstanceActivityForm>>({ ...initFor
const rules = reactive<FormRules>({
inspectRouteId: [{ required: true, message: "巡检线路不能为空", trigger: "blur" }],
deviceAmount: [{ required: true, message: "设备总数不能为空", trigger: "blur" }],
performer: [{ required: true, message: "执行人员不能为空", trigger: "blur" }],
performer: [{ required: true, message: "负责人员不能为空", trigger: "blur" }],
processHandleResolution: [{ required: false, message: "处理意见不能为空", trigger: "blur" }]
});
@ -204,19 +204,19 @@ const submitButtonShow = computed(() => {
onMounted(async () => {
routeParams.value = route.query;
loading.value = true;
try {
//
await loadWorkOrderInfo();
//
if (routeParams.value.type === 'approval') {
await loadCurrentTask();
}
//
initializeFormData();
} catch (error) {
console.error('初始化失败:', error);
proxy?.$modal.msgError('加载数据失败');
@ -232,10 +232,10 @@ const loadWorkOrderInfo = async () => {
proxy?.$modal.msgError('缺少工单ID参数');
return;
}
const res = await getDmsBillsInspectInstance(businessId);
workOrder.value = res.data;
//
if (inspect_status.value && workOrder.value.inspectStatus !== undefined) {
const statusItem = inspect_status.value.find((item: any) => String(item.value) === String(workOrder.value.inspectStatus));
@ -250,21 +250,21 @@ const loadCurrentTask = async () => {
try {
const businessId = routeParams.value.id;
const taskId = routeParams.value.taskId;
// taskIdbusinessId
const taskRes = await pageByTaskWait({
pageNum: 1,
pageSize: 10,
flowCode: 'Inspect01' //
});
const tasks = taskRes.rows.filter(task =>
const tasks = taskRes.rows.filter(task =>
task.businessId === businessId || task.id === taskId
);
if (tasks.length > 0) {
currentTask.value = tasks[0];
//
if (needProcessResolution.value) {
rules.processHandleResolution = [
@ -289,7 +289,7 @@ const initializeFormData = () => {
//
const submitForm = async (status: string) => {
if (!processFormRef.value) return;
try {
const valid = await processFormRef.value.validate();
if (valid) {
@ -305,7 +305,7 @@ const submitForm = async (status: string) => {
processHandleResolution: form.processHandleResolution || '',
handleTime: getCurrentDateTime()
});
proxy?.$modal.msgSuccess('暂存成功');
goBack();
} else {
@ -320,7 +320,7 @@ const submitForm = async (status: string) => {
processHandleResolution: form.processHandleResolution || ''
}
};
//
if (routeParams.value.taskId) {
submitVerifyRef.value?.openDialog(routeParams.value.taskId);
@ -342,7 +342,7 @@ const submitForm = async (status: string) => {
//
const approvalVerifyOpen = async () => {
if (!processFormRef.value) return;
try {
const valid = await processFormRef.value.validate();
if (valid) {
@ -356,7 +356,7 @@ const approvalVerifyOpen = async () => {
processHandleResolution: form.processHandleResolution || ''
}
};
// 使taskId
submitVerifyRef.value?.openDialog(routeParams.value.taskId);
}
@ -382,9 +382,9 @@ const submitCallback = async () => {
processHandleResolution: form.processHandleResolution || '',
handleTime: getCurrentDateTime()
});
proxy?.$modal.msgSuccess(`${currentStepName.value}完成`);
//
goBack();
} catch (error) {

@ -41,8 +41,8 @@
<el-form-item label="循环周期" prop="cyclePeriod">
<el-input v-model="queryParams.cyclePeriod" placeholder="请输入循环周期" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="执行人员" prop="performer">
<el-input v-model="queryParams.performer" placeholder="请输入执行人员" clearable @keyup.enter="handleQuery" />
<el-form-item label="负责人员" prop="performer">
<el-input v-model="queryParams.performer" placeholder="请输入负责人员" clearable @keyup.enter="handleQuery" />
</el-form-item>-->
<el-form-item label="激活标识" prop="activeFlag">
<el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable >
@ -97,7 +97,7 @@
<el-table-column label="时限(秒)" align="center" prop="timeLimit" v-if="columns[8].visible"/>
<el-table-column label="关联sj_job主键id" align="center" prop="jobId" v-if="columns[9].visible"/>
<el-table-column label="循环周期" align="center" prop="cyclePeriod" v-if="columns[10].visible"/>
<el-table-column label="执行人员" align="center" prop="performer" v-if="columns[11].visible"/>
<el-table-column label="负责人员" align="center" prop="performer" v-if="columns[11].visible"/>
<el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[12].visible">
<template #default="scope">
<dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
@ -172,8 +172,8 @@
<!-- <el-form-item label="循环周期" prop="cyclePeriod">
<el-input v-model="form.cyclePeriod" placeholder="请输入循环周期" />
</el-form-item>-->
<el-form-item label="执行人员" prop="performer">
<el-input v-model="form.performer" placeholder="请输入执行人员" />
<el-form-item label="负责人员" prop="performer">
<el-input v-model="form.performer" placeholder="请输入负责人员" />
</el-form-item>
<el-form-item label="激活标识" prop="activeFlag">
<el-radio-group v-model="form.activeFlag">
@ -236,7 +236,7 @@ const columns = ref<FieldOption[]>([
{ key: 8, label: `时限(秒)`, visible: true },
{ key: 9, label: `关联sj_job主键id`, visible: false },
{ key: 10, label: `循环周期`, visible: true },
{ key: 11, label: `执行人员`, visible: true },
{ key: 11, label: `负责人员`, visible: true },
{ key: 12, label: `激活标识`, visible: true },
{ key: 13, label: `备注`, visible: true },
{ key: 14, label: `创建部门`, visible: false },

@ -41,8 +41,8 @@
<el-form-item label="循环周期" prop="cyclePeriod">
<el-input v-model="queryParams.cyclePeriod" placeholder="请输入循环周期" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="执行人员" prop="performer">
<el-input v-model="queryParams.performer" placeholder="请输入执行人员" clearable @keyup.enter="handleQuery" />
<el-form-item label="负责人员" prop="performer">
<el-input v-model="queryParams.performer" placeholder="请输入负责人员" clearable @keyup.enter="handleQuery" />
</el-form-item>-->
<el-form-item label="激活标识" prop="activeFlag">
<el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable >

@ -169,19 +169,19 @@
<!-- <el-form-item label="关联sj_job主键id" prop="jobId">
<el-input v-model="form.jobId" placeholder="请输入关联sj_job主键id" />
</el-form-item>-->
<el-form-item label="循环周期" prop="cyclePeriod">
<el-input v-model="form.cyclePeriod" placeholder="请输入循环周期" />
</el-form-item>
<el-form-item label="创建方式" prop="createMethod">
<el-select v-model="form.createMethod" placeholder="请选择创建方式">
<el-option
v-for="dict in create_method"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="循环周期" prop="cyclePeriod">-->
<!-- <el-input v-model="form.cyclePeriod" placeholder="请输入循环周期" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="创建方式" prop="createMethod">-->
<!-- <el-select v-model="form.createMethod" placeholder="请选择创建方式">-->
<!-- <el-option-->
<!-- v-for="dict in create_method"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="激活标识" prop="activeFlag">
<el-radio-group v-model="form.activeFlag">
<el-radio
@ -269,8 +269,8 @@ const columns = ref<FieldOption[]>([
{ key: 6, label: `本次润滑时间`, visible: true },
{ key: 7, label: `时限`, visible: true },
{ key: 8, label: `关联sj_job主键id`, visible: false },
{ key: 9, label: `循环周期`, visible: true },
{ key: 10, label: `创建方式`, visible: true },
{ key: 9, label: `循环周期`, visible: false },
{ key: 10, label: `创建方式`, visible: false },
{ key: 11, label: `激活标识`, visible: true },
{ key: 12, label: `备注`, visible: true },
{ key: 13, label: `创建部门`, visible: false },

@ -59,8 +59,8 @@
<!-- placeholder="请选择实际结束时间"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="执行人员" prop="performer">-->
<!-- <el-input v-model="queryParams.performer" placeholder="请输入执行人员" clearable @keyup.enter="handleQuery" />-->
<!-- <el-form-item label="负责人员" prop="performer">-->
<!-- <el-input v-model="queryParams.performer" placeholder="请输入负责人员" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<el-form-item label="巡检状态" prop="inspectStatus">
<el-select v-model="queryParams.inspectStatus" placeholder="请选择巡检状态" clearable >
@ -134,7 +134,7 @@
<span>{{ parseTime(scope.row.realEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="执行人员" align="center" prop="performer" v-if="columns[12].visible"/>
<el-table-column label="负责人员" align="center" prop="performer" v-if="columns[12].visible"/>
<el-table-column label="巡检状态" align="center" prop="inspectStatus" v-if="columns[13].visible">
<template #default="scope">
<dict-tag :options="dms_inspect_status" :value="scope.row.inspectStatus"/>
@ -220,8 +220,8 @@
placeholder="请选择实际结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="执行人员" prop="performer">
<el-input v-model="form.performer" placeholder="请输入执行人员" />
<el-form-item label="负责人员" prop="performer">
<el-input v-model="form.performer" placeholder="请输入负责人员" />
</el-form-item>
<el-form-item label="巡检状态" prop="inspectStatus">
<el-select v-model="form.inspectStatus" placeholder="请选择巡检状态">
@ -291,7 +291,7 @@ const columns = ref<FieldOption[]>([
{ key: 9, label: `计划完成时间`, visible: true },
{ key: 10, label: `实际开始时间`, visible: true },
{ key: 11, label: `实际结束时间`, visible: true },
{ key: 12, label: `执行人员`, visible: true },
{ key: 12, label: `负责人员`, visible: true },
{ key: 13, label: `巡检状态`, visible: true },
{ key: 14, label: `巡检用时`, visible: true },
{ key: 15, label: `激活标识`, visible: true },

Loading…
Cancel
Save