diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue index 8b96b76..e1e20be 100644 --- a/src/views/tested/device/info/components/edit.vue +++ b/src/views/tested/device/info/components/edit.vue @@ -124,21 +124,21 @@ testTask.value.push('') } // 自动填充 证书有效日期 -// watch(() => ruleForm.value, (newVal) => { -// if (newVal.checkDate && newVal.checkCycle && !newVal.certificateValid) { -// // ruleForm.value.certificateValid = dayjs(newVal.checkDate).add(Number(newVal.checkCycle) * 30, 'day').format('YYYY-MM-DD') -// const date = dayjs(newVal.checkDate).add(Number(newVal.checkCycle), 'month').format('YYYY-MM') -// const day = Number(newVal.checkDate.split('-')[2]) === 1 ? '1' : Number(newVal.checkDate.split('-')[2]) - 1 -// ruleForm.value.certificateValid = dayjs(`${date}-${day}`).format('YYYY-MM-DD') -// // 判断日期是否大于当前 -// if (new Date(ruleForm.value.certificateValid).getTime() - new Date(dayjs().format('YYYY-MM-DD')).getTime() < 0) { -// // 使用状态自动变为禁用 -// ruleForm.value.usageStatus = '1' -// } -// } -// }, { -// deep: true, -// }) +watch(() => ruleForm.value, (newVal) => { + if (newVal.checkDate && newVal.checkCycle && !newVal.certificateValid) { + // ruleForm.value.certificateValid = dayjs(newVal.checkDate).add(Number(newVal.checkCycle) * 30, 'day').format('YYYY-MM-DD') + const date = dayjs(newVal.checkDate).add(Number(newVal.checkCycle), 'month').format('YYYY-MM') + const day = Number(newVal.checkDate.split('-')[2]) === 1 ? '1' : Number(newVal.checkDate.split('-')[2]) - 1 + ruleForm.value.certificateValid = dayjs(`${date}-${day}`).format('YYYY-MM-DD') + // 判断日期是否大于当前 + // if (new Date(ruleForm.value.certificateValid).getTime() - new Date(dayjs().format('YYYY-MM-DD')).getTime() < 0) { + // // 使用状态自动变为禁用 + // ruleForm.value.usageStatus = '1' + // } + } +}, { + deep: true, +}) const radio = ref('基本信息') // 生产日期和购进日期的验证 const validateProductDate = (rule: any, value: any, callback: any) => { diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue index 8b96b76..e1e20be 100644 --- a/src/views/tested/device/info/components/edit.vue +++ b/src/views/tested/device/info/components/edit.vue @@ -124,21 +124,21 @@ testTask.value.push('') } // 自动填充 证书有效日期 -// watch(() => ruleForm.value, (newVal) => { -// if (newVal.checkDate && newVal.checkCycle && !newVal.certificateValid) { -// // ruleForm.value.certificateValid = dayjs(newVal.checkDate).add(Number(newVal.checkCycle) * 30, 'day').format('YYYY-MM-DD') -// const date = dayjs(newVal.checkDate).add(Number(newVal.checkCycle), 'month').format('YYYY-MM') -// const day = Number(newVal.checkDate.split('-')[2]) === 1 ? '1' : Number(newVal.checkDate.split('-')[2]) - 1 -// ruleForm.value.certificateValid = dayjs(`${date}-${day}`).format('YYYY-MM-DD') -// // 判断日期是否大于当前 -// if (new Date(ruleForm.value.certificateValid).getTime() - new Date(dayjs().format('YYYY-MM-DD')).getTime() < 0) { -// // 使用状态自动变为禁用 -// ruleForm.value.usageStatus = '1' -// } -// } -// }, { -// deep: true, -// }) +watch(() => ruleForm.value, (newVal) => { + if (newVal.checkDate && newVal.checkCycle && !newVal.certificateValid) { + // ruleForm.value.certificateValid = dayjs(newVal.checkDate).add(Number(newVal.checkCycle) * 30, 'day').format('YYYY-MM-DD') + const date = dayjs(newVal.checkDate).add(Number(newVal.checkCycle), 'month').format('YYYY-MM') + const day = Number(newVal.checkDate.split('-')[2]) === 1 ? '1' : Number(newVal.checkDate.split('-')[2]) - 1 + ruleForm.value.certificateValid = dayjs(`${date}-${day}`).format('YYYY-MM-DD') + // 判断日期是否大于当前 + // if (new Date(ruleForm.value.certificateValid).getTime() - new Date(dayjs().format('YYYY-MM-DD')).getTime() < 0) { + // // 使用状态自动变为禁用 + // ruleForm.value.usageStatus = '1' + // } + } +}, { + deep: true, +}) const radio = ref('基本信息') // 生产日期和购进日期的验证 const validateProductDate = (rule: any, value: any, callback: any) => { diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue index a7aa6ab..049b52d 100644 --- a/src/views/tested/device/info/components/list.vue +++ b/src/views/tested/device/info/components/list.vue @@ -1,9 +1,11 @@ + + + +