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

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

@ -85,8 +85,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="执行人员" prop="performer"> <el-form-item label="负责人员" prop="performer">
<el-input v-model="form.performer" placeholder="请输入执行人员" /> <el-input v-model="form.performer" placeholder="请输入负责人员" />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -167,7 +167,7 @@ const form = reactive<Partial<DmsBillsInspectInstanceActivityForm>>({ ...initFor
const rules = reactive<FormRules>({ const rules = reactive<FormRules>({
inspectRouteId: [{ required: true, message: "巡检线路不能为空", trigger: "blur" }], inspectRouteId: [{ required: true, message: "巡检线路不能为空", trigger: "blur" }],
deviceAmount: [{ 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" }] processHandleResolution: [{ required: false, message: "处理意见不能为空", trigger: "blur" }]
}); });

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

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

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

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

Loading…
Cancel
Save