diff --git a/src/api/equipment/standard/checkData.ts b/src/api/equipment/standard/checkData.ts index f97b944..b2112b3 100644 --- a/src/api/equipment/standard/checkData.ts +++ b/src/api/equipment/standard/checkData.ts @@ -5,7 +5,7 @@ import type { IListQuery } from '@/views/equipement/standard/checkData/checkData-interface' const prefix = 'standard/check/info' // 列表查询 -export function getCheckDataList(data: IListQuery) { +export function getCheckDataList(data: any) { return request({ url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`, method: 'post', diff --git a/src/api/equipment/standard/checkData.ts b/src/api/equipment/standard/checkData.ts index f97b944..b2112b3 100644 --- a/src/api/equipment/standard/checkData.ts +++ b/src/api/equipment/standard/checkData.ts @@ -5,7 +5,7 @@ import type { IListQuery } from '@/views/equipement/standard/checkData/checkData-interface' const prefix = 'standard/check/info' // 列表查询 -export function getCheckDataList(data: IListQuery) { +export function getCheckDataList(data: any) { return request({ url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`, method: 'post', diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue index 0a8ada1..5f1c0c4 100644 --- a/src/views/equipement/info/book/components/basic.vue +++ b/src/views/equipement/info/book/components/basic.vue @@ -623,6 +623,7 @@ } }) emits('giveEquipmentNo', res.data.equipmentInfoApproval.equipmentNo) + checkHasChanged() loading.close() }).catch(() => { loading.close() @@ -737,6 +738,26 @@ } } +// 检查信息变化去标红字段 +function checkHasChanged() { + const params = { + attachmentList: attachmentList.value.map((item) => { return { ...item, equipmentNo: form.value.equipmentNo } }), // 主附件信息 + technicalTargetList: technicalTargetList.value.map((item) => { return { ...item, equipmentNo: form.value.equipmentNo } }), // 技术指标 + equipmentInfoApproval: { + ...form.value, + id: form.value.id, + measureCycle: `${form.value.measureCycle}`, + technicalFile: Array.isArray(form.value.technicalFile) ? form.value.technicalFile?.join(',') : form.value.technicalFile, // 核查规范/确认方法 + instructionsFile: Array.isArray(form.value.instructionsFile) ? form.value.instructionsFile?.join(',') : form.value.instructionsFile, // 说明书 + traceDate: dayjs(form.value.traceDate).format('YYYY-MM-DD'), + measureValidDate: dayjs(form.value.measureValidDate).format('YYYY-MM-DD'), + }, + } + hasChanged(params).then((res) => { + changeFormItem.value = res.data + }) +} + // 监听pageType处理审批类型 watch(() => props.pageType, (newValue) => { console.log('监听页面类型', newValue) @@ -809,12 +830,12 @@ - + - + - + - + - + {{ form.unpackRecordName }} - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + --> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + diff --git a/src/api/equipment/standard/checkData.ts b/src/api/equipment/standard/checkData.ts index f97b944..b2112b3 100644 --- a/src/api/equipment/standard/checkData.ts +++ b/src/api/equipment/standard/checkData.ts @@ -5,7 +5,7 @@ import type { IListQuery } from '@/views/equipement/standard/checkData/checkData-interface' const prefix = 'standard/check/info' // 列表查询 -export function getCheckDataList(data: IListQuery) { +export function getCheckDataList(data: any) { return request({ url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`, method: 'post', diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue index 0a8ada1..5f1c0c4 100644 --- a/src/views/equipement/info/book/components/basic.vue +++ b/src/views/equipement/info/book/components/basic.vue @@ -623,6 +623,7 @@ } }) emits('giveEquipmentNo', res.data.equipmentInfoApproval.equipmentNo) + checkHasChanged() loading.close() }).catch(() => { loading.close() @@ -737,6 +738,26 @@ } } +// 检查信息变化去标红字段 +function checkHasChanged() { + const params = { + attachmentList: attachmentList.value.map((item) => { return { ...item, equipmentNo: form.value.equipmentNo } }), // 主附件信息 + technicalTargetList: technicalTargetList.value.map((item) => { return { ...item, equipmentNo: form.value.equipmentNo } }), // 技术指标 + equipmentInfoApproval: { + ...form.value, + id: form.value.id, + measureCycle: `${form.value.measureCycle}`, + technicalFile: Array.isArray(form.value.technicalFile) ? form.value.technicalFile?.join(',') : form.value.technicalFile, // 核查规范/确认方法 + instructionsFile: Array.isArray(form.value.instructionsFile) ? form.value.instructionsFile?.join(',') : form.value.instructionsFile, // 说明书 + traceDate: dayjs(form.value.traceDate).format('YYYY-MM-DD'), + measureValidDate: dayjs(form.value.measureValidDate).format('YYYY-MM-DD'), + }, + } + hasChanged(params).then((res) => { + changeFormItem.value = res.data + }) +} + // 监听pageType处理审批类型 watch(() => props.pageType, (newValue) => { console.log('监听页面类型', newValue) @@ -809,12 +830,12 @@ - + - + - + - + - + {{ form.unpackRecordName }} - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + --> - + - + - + - + - + + diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue index 3aa2faf..2a23572 100644 --- a/src/views/equipement/standard/book/components/basic.vue +++ b/src/views/equipement/standard/book/components/basic.vue @@ -42,6 +42,7 @@ const emits = defineEmits(['submitSuccess', 'addSuccess', 'saveSuccess', 'giveApprovalType']) const user = useUserStore() // 用户信息 const route = useRoute() +const changeFormItem = ref([]) // 有变化的字段标红 const infoId = ref('') // id const form: Ref = ref({ // 基本信息表单 approvalType: '', // 审批类型 @@ -528,7 +529,7 @@ sessionStorage.setItem('showRemindSave', '1') } } - + checkHasChanged() loading.close() }) } @@ -689,6 +690,7 @@ hasChanged(detailOriginData.value).then((res) => { console.log('信息有变化吗？', res.data) if (res.data) { // 信息有变化吗？ + changeFormItem.value = res.data handleSubmit(processId, '2', '0') // 信息有变化正常走审批流程 } else { // 信息没变化 @@ -810,6 +812,33 @@ } } +// 检查信息变化去标红字段 +function checkHasChanged() { + const params = { + technologyRelationList: technologyRelationList.value.map((item) => { + return { + ...item, + standardNo: form.value.standardNo, // 标准代码 + id: '', // 解决编辑的时候报生成编号重复问题 + } + }), // 依据的技术文件 + technologyIndexRelationList: technologyIndexRelationList.value.map((item) => { + return { + ...item, + standardNo: form.value.standardNo, // 标准代码 + } + }), // 技术指标 + standardInfoApproval: { // 表单、环境、指标 + ...form.value, + ...environmentalConditionsList.value[0], // 环境 + id: form.value.id, + }, + } + hasChanged(params).then((res) => { + changeFormItem.value = res.data + }) +} + onMounted(async () => { await getDict() // 获取字典 form.value.createUserId = user.id// 创建人id @@ -856,7 +885,7 @@ - + @@ -876,7 +905,7 @@ - + - + - + - + - + - + - + - + - + - + - + - + 无 @@ -1050,7 +1079,7 @@ - + 无 @@ -1060,7 +1089,7 @@ - + 无 @@ -1072,7 +1101,7 @@ - + 无 @@ -1082,7 +1111,7 @@ - + 无 @@ -1246,6 +1275,12 @@ + + + +