yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

✨ feat(mes): 新增点检方案设备和项目的重复校验逻辑 

新增设备和项目在同一方案下的重复校验，避免用户重复添加相同设备或项目。同时，增强了点检方案停用时的状态校验，确保只有已启用的方案才能被停用。
pull/871/MERGE
YunaiV 2026-04-03 00:49:00 +08:00
parent b25cb1dd0f
commit 476dd53a3c
6 changed files with 86 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/mes/cal/plan/CalPlanTeamList.vue
View File

@ -108,7 +108,7 @@ defineOptions({ name: 'CalPlanTeamList' })
const props = defineProps<{
planId: number // 排班计划编号
readonly?: boolean // 是否只读模式 DONE @AI：参考别的模块，是不是通过 formType，进一步处理？（当前父组件已通过 isDetail 计算属性传入 readonly，满足需求）
readonly?: boolean // 是否只读模式 TODO @AI：【听我的】，参考别的模块，基于 formType 做判断；你参考下；
}>()
const { t } = useI18n() // 国际化

11
src/views/mes/cal/plan/CalShiftList.vue
View File

@ -2,7 +2,14 @@
<template>
<div>
<!-- 操作栏 -->
<el-button v-if="!readonly" type="primary" plain size="small" @click="openForm('create')" class="mb-10px">
<el-button
v-if="!readonly"
type="primary"
plain
size="small"
@click="openForm('create')"
class="mb-10px"
>
<Icon icon="ep:plus" class="mr-5px" /> 添加班次
</el-button>
<!-- 列表 -->
@ -77,7 +84,7 @@ defineOptions({ name: 'CalShiftList' })
const props = defineProps<{
planId: number // 排班计划编号
readonly?: boolean // 是否只读模式 TODO @AI：参考别的模块，是不是通过 formType，进一步处理？
readonly?: boolean // 是否只读模式 TODO @AI：【听我的】，参考别的模块，基于 formType 做判断；你参考下；
}>()
const { t } = useI18n() // 国际化

59
src/views/mes/dv/checkplan/CheckPlanForm.vue
View File

@ -1,5 +1,6 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" width="960px">
<!-- TODO @AI：disabled 是不是全局 form？别的模块是这么干的。 -->
<el-form
ref="formRef"
:model="formData"
@ -10,8 +11,9 @@
<el-row>
<el-col :span="8">
<el-form-item label="方案编码" prop="code">
<el-input v-model="formData.code" placeholder="请输入方案编码">
<template #append>
<el-input v-model="formData.code" placeholder="请输入方案编码" :disabled="isDetail">
<!-- TODO @AI：对齐别的模块，看看 isDetail 要不要保留生成按钮； -->
<template v-if="!isDetail" #append>
<el-button @click="generateCode"> 生成 </el-button>
</template>
</el-input>
@ -19,12 +21,17 @@
</el-col>
<el-col :span="8">
<el-form-item label="方案名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入方案名称" />
<el-input v-model="formData.name" placeholder="请输入方案名称" :disabled="isDetail" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="方案类型" prop="type">
<el-select v-model="formData.type" placeholder="请选择方案类型" class="!w-1/1">
<el-select
v-model="formData.type"
placeholder="请选择方案类型"
class="!w-1/1"
:disabled="isDetail"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_DV_SUBJECT_TYPE)"
:key="dict.value"
@ -43,12 +50,18 @@
:min="1"
controls-position="right"
class="!w-1/1"
:disabled="isDetail"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="周期类型" prop="cycleType">
<el-select v-model="formData.cycleType" placeholder="请选择周期类型" class="!w-1/1">
<el-select
v-model="formData.cycleType"
placeholder="请选择周期类型"
class="!w-1/1"
:disabled="isDetail"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_DV_CYCLE_TYPE)"
:key="dict.value"
@ -73,6 +86,7 @@
value-format="x"
placeholder="请选择开始日期"
class="!w-1/1"
:disabled="isDetail"
/>
</el-form-item>
</el-col>
@ -84,6 +98,7 @@
value-format="x"
placeholder="请选择结束日期"
class="!w-1/1"
:disabled="isDetail"
/>
</el-form-item>
</el-col>
@ -91,23 +106,35 @@
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
<el-input
v-model="formData.remark"
type="textarea"
placeholder="请输入备注"
:disabled="isDetail"
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- 编辑时显示子资源 Tab -->
<el-tabs v-if="formType === 'update'" v-model="activeTab" class="mt-10px">
<!-- 编辑/查看时显示子资源 Tab -->
<!-- todo @AI：formtype 的处理；isXXX 这种 compute 计算； -->
<el-tabs
v-if="formType === 'update' || formType === 'detail'"
v-model="activeTab"
class="mt-10px"
>
<el-tab-pane label="设备清单" name="machinery">
<CheckPlanMachineryList :plan-id="formData.id!" />
<CheckPlanMachineryList :plan-id="formData.id!" :readonly="isDetail" />
</el-tab-pane>
<el-tab-pane label="点检保养项目" name="subject">
<CheckPlanSubjectList :plan-id="formData.id!" />
<el-tab-pane label="保养项目" name="subject">
<CheckPlanSubjectList :plan-id="formData.id!" :readonly="isDetail" />
</el-tab-pane>
</el-tabs>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button v-if="!isDetail" @click="submitForm" type="primary" :disabled="formLoading"
>确 定</el-button
>
<el-button @click="dialogVisible = false">{{ isDetail ? '关 闭' : '取 消' }}</el-button>
</template>
</Dialog>
</template>
@ -128,7 +155,8 @@ const message = useMessage() // 消息弹窗
const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中
const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formType = ref('') // 表单的类型：create - 新增；update - 修改；detail - 查看
const isDetail = computed(() => formType.value === 'detail') // 是否为查看模式
const activeTab = ref('machinery') // 当前激活的资源 Tab
const formData = ref({
id: undefined,
@ -153,13 +181,14 @@ const formRef = ref()
/** 生成方案编码 */
const generateCode = () => {
// TODO @AI：接入编码规则。mysql 直接插入下，已经启动。
formData.value.code = 'CHP' + generateRandomStr(8)
}
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
dialogTitle.value = type === 'detail' ? '查看' : t('action.' + type)
formType.value = type
resetForm()
// 修改时，设置数据

13
src/views/mes/dv/checkplan/CheckPlanMachineryList.vue
View File

@ -2,7 +2,14 @@
<template>
<div>
<!-- 操作栏 -->
<el-button type="primary" plain size="small" @click="openForm('create')" class="mb-10px">
<el-button
v-if="!readonly"
type="primary"
plain
size="small"
@click="openForm('create')"
class="mb-10px"
>
<Icon icon="ep:plus" class="mr-5px" /> 添加设备
</el-button>
<!-- 列表 -->
@ -11,7 +18,8 @@
<el-table-column label="设备名称" align="center" prop="machineryName" min-width="150" />
<el-table-column label="品牌" align="center" prop="machineryBrand" min-width="100" />
<el-table-column label="规格型号" align="center" prop="machinerySpec" min-width="120" />
<el-table-column label="操作" align="center" width="80">
<!-- TODO @AI：【备注】展示下； -->
<el-table-column v-if="!readonly" label="操作" align="center" width="80">
<template #default="scope">
<el-button link type="danger" @click="handleDelete(scope.row.id)">删除</el-button>
</template>
@ -50,6 +58,7 @@ defineOptions({ name: 'CheckPlanMachineryList' })
const props = defineProps<{
planId: number // 方案编号
readonly?: boolean // 是否只读模式 TODO @AI：【听我的】，参考别的模块，基于 formType 做判断；你参考下；
}>()
const { t } = useI18n() // 国际化

12
src/views/mes/dv/checkplan/CheckPlanSubjectList.vue
View File

@ -2,7 +2,14 @@
<template>
<div>
<!-- 操作栏 -->
<el-button type="primary" plain size="small" @click="openForm('create')" class="mb-10px">
<el-button
v-if="!readonly"
type="primary"
plain
size="small"
@click="openForm('create')"
class="mb-10px"
>
<Icon icon="ep:plus" class="mr-5px" /> 添加项目
</el-button>
<!-- 列表 -->
@ -16,7 +23,7 @@
</el-table-column>
<el-table-column label="项目内容" align="center" prop="subjectContent" min-width="150" />
<el-table-column label="标准" align="center" prop="subjectStandard" min-width="120" />
<el-table-column label="操作" align="center" width="80">
<el-table-column v-if="!readonly" label="操作" align="center" width="80">
<template #default="scope">
<el-button link type="danger" @click="handleDelete(scope.row.id)">删除</el-button>
</template>
@ -56,6 +63,7 @@ defineOptions({ name: 'CheckPlanSubjectList' })
const props = defineProps<{
planId: number // 方案编号
readonly?: boolean // 是否只读模式 TODO @AI：【听我的】，参考别的模块，基于 formType 做判断；你参考下；
}>()
const { t } = useI18n() // 国际化

12
src/views/mes/dv/checkplan/index.vue
View File

@ -118,8 +118,18 @@
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center" width="150">
<el-table-column label="操作" align="center" width="200">
<template #default="scope">
<!-- TODO @AI：查看，挪到【方案编码】点击打开；并且不用判断状态； -->
<el-button
v-if="scope.row.status !== MesDvCheckPlanStatusEnum.PREPARE"
link
type="primary"
@click="openForm('detail', scope.row.id)"
v-hasPermi="['mes:dv-check-plan:query']"
>
查看
</el-button>
<el-button
v-if="scope.row.status === MesDvCheckPlanStatusEnum.PREPARE"
link