diff --git a/src/views/quality/internal/scene/components/detail.vue b/src/views/quality/internal/scene/components/detail.vue index 28733e5..2143bd4 100644 --- a/src/views/quality/internal/scene/components/detail.vue +++ b/src/views/quality/internal/scene/components/detail.vue @@ -48,7 +48,7 @@ // 下载 const downloadFile = () => { if (file.value) { - const data = JSON.parse($route.query.data as string) + // const data = JSON.parse($route.query.data as string) exportFile(file.value, '内部审核报告.pdf') } else { diff --git a/src/views/quality/internal/scene/components/detail.vue b/src/views/quality/internal/scene/components/detail.vue index 28733e5..2143bd4 100644 --- a/src/views/quality/internal/scene/components/detail.vue +++ b/src/views/quality/internal/scene/components/detail.vue @@ -48,7 +48,7 @@ // 下载 const downloadFile = () => { if (file.value) { - const data = JSON.parse($route.query.data as string) + // const data = JSON.parse($route.query.data as string) exportFile(file.value, '内部审核报告.pdf') } else { diff --git a/src/views/quality/internal/scene/components/edit.vue b/src/views/quality/internal/scene/components/edit.vue index 8f59a2d..b07e428 100644 --- a/src/views/quality/internal/scene/components/edit.vue +++ b/src/views/quality/internal/scene/components/edit.vue @@ -47,6 +47,7 @@ yearTime: [{ required: true, message: '年份必选', trigger: ['blur', 'change'] }], yearNum: [{ required: true, message: '月份必选', trigger: ['blur', 'change'] }], bizLabCode: [{ required: true, message: '实验室必选', trigger: ['blur', 'change'] }], + groupLeader: [{ required: true, message: '内审组长必选', trigger: ['blur', 'change'] }], }) onMounted(() => { if ($route.path.includes('create')) { @@ -165,7 +166,7 @@ if (!ress) { return } const data = { ...ruleForm.value, - sceneSchedules: scheduleRef.value.list, + sceneSchedules: scheduleRef.value.list.map((item:any) => ({...item, scheduleHour: item.scheduleHour.join('-')})), fileName: `${ruleForm.value.yearTime}年第${ruleForm.value.yearNum}次现场审核计划`, } if (ruleForm.value.sceneUsers.length) { diff --git a/src/views/quality/internal/scene/components/detail.vue b/src/views/quality/internal/scene/components/detail.vue index 28733e5..2143bd4 100644 --- a/src/views/quality/internal/scene/components/detail.vue +++ b/src/views/quality/internal/scene/components/detail.vue @@ -48,7 +48,7 @@ // 下载 const downloadFile = () => { if (file.value) { - const data = JSON.parse($route.query.data as string) + // const data = JSON.parse($route.query.data as string) exportFile(file.value, '内部审核报告.pdf') } else { diff --git a/src/views/quality/internal/scene/components/edit.vue b/src/views/quality/internal/scene/components/edit.vue index 8f59a2d..b07e428 100644 --- a/src/views/quality/internal/scene/components/edit.vue +++ b/src/views/quality/internal/scene/components/edit.vue @@ -47,6 +47,7 @@ yearTime: [{ required: true, message: '年份必选', trigger: ['blur', 'change'] }], yearNum: [{ required: true, message: '月份必选', trigger: ['blur', 'change'] }], bizLabCode: [{ required: true, message: '实验室必选', trigger: ['blur', 'change'] }], + groupLeader: [{ required: true, message: '内审组长必选', trigger: ['blur', 'change'] }], }) onMounted(() => { if ($route.path.includes('create')) { @@ -165,7 +166,7 @@ if (!ress) { return } const data = { ...ruleForm.value, - sceneSchedules: scheduleRef.value.list, + sceneSchedules: scheduleRef.value.list.map((item:any) => ({...item, scheduleHour: item.scheduleHour.join('-')})), fileName: `${ruleForm.value.yearTime}年第${ruleForm.value.yearNum}次现场审核计划`, } if (ruleForm.value.sceneUsers.length) { diff --git a/src/views/quality/internal/scene/components/scheduleList.vue b/src/views/quality/internal/scene/components/scheduleList.vue index 9a24614..73f7f63 100644 --- a/src/views/quality/internal/scene/components/scheduleList.vue +++ b/src/views/quality/internal/scene/components/scheduleList.vue @@ -14,7 +14,10 @@ const list = ref([]) watch(() => $props.data, (newVal) => { if (newVal.length) { - list.value = $props.data + list.value = $props.data.map((item:any) => ({ + ...item, + scheduleHour: item.scheduleHour.includes('-') ? item.scheduleHour.split('-'): '' + })) } else { // if ($route.path.includes('detail')) { return } diff --git a/src/views/quality/internal/scene/components/detail.vue b/src/views/quality/internal/scene/components/detail.vue index 28733e5..2143bd4 100644 --- a/src/views/quality/internal/scene/components/detail.vue +++ b/src/views/quality/internal/scene/components/detail.vue @@ -48,7 +48,7 @@ // 下载 const downloadFile = () => { if (file.value) { - const data = JSON.parse($route.query.data as string) + // const data = JSON.parse($route.query.data as string) exportFile(file.value, '内部审核报告.pdf') } else { diff --git a/src/views/quality/internal/scene/components/edit.vue b/src/views/quality/internal/scene/components/edit.vue index 8f59a2d..b07e428 100644 --- a/src/views/quality/internal/scene/components/edit.vue +++ b/src/views/quality/internal/scene/components/edit.vue @@ -47,6 +47,7 @@ yearTime: [{ required: true, message: '年份必选', trigger: ['blur', 'change'] }], yearNum: [{ required: true, message: '月份必选', trigger: ['blur', 'change'] }], bizLabCode: [{ required: true, message: '实验室必选', trigger: ['blur', 'change'] }], + groupLeader: [{ required: true, message: '内审组长必选', trigger: ['blur', 'change'] }], }) onMounted(() => { if ($route.path.includes('create')) { @@ -165,7 +166,7 @@ if (!ress) { return } const data = { ...ruleForm.value, - sceneSchedules: scheduleRef.value.list, + sceneSchedules: scheduleRef.value.list.map((item:any) => ({...item, scheduleHour: item.scheduleHour.join('-')})), fileName: `${ruleForm.value.yearTime}年第${ruleForm.value.yearNum}次现场审核计划`, } if (ruleForm.value.sceneUsers.length) { diff --git a/src/views/quality/internal/scene/components/scheduleList.vue b/src/views/quality/internal/scene/components/scheduleList.vue index 9a24614..73f7f63 100644 --- a/src/views/quality/internal/scene/components/scheduleList.vue +++ b/src/views/quality/internal/scene/components/scheduleList.vue @@ -14,7 +14,10 @@ const list = ref([]) watch(() => $props.data, (newVal) => { if (newVal.length) { - list.value = $props.data + list.value = $props.data.map((item:any) => ({ + ...item, + scheduleHour: item.scheduleHour.includes('-') ? item.scheduleHour.split('-'): '' + })) } else { // if ($route.path.includes('detail')) { return } diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue index 19bdf70..c48515d 100644 --- a/src/views/resource/file/noveltySearch/detail.vue +++ b/src/views/resource/file/noveltySearch/detail.vue @@ -85,7 +85,7 @@ { text: '文件编号', value: 'fileNo', align: 'center' }, { text: '文件名称', value: 'fileName', align: 'center' }, ]) // 表头 - +const isMonunted = ref(true) // 字典值 const labCodeDict = ref([]) const labCodePartDict = ref([]) @@ -564,7 +564,7 @@ }) } } -const isMonunted = ref(true) + watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => { if (!isAdmin.value || isMonunted.value) { return @@ -706,11 +706,11 @@ // 节点顺序 const processOrderIndex = ['noveltySearchComplete', 'allSearchComplete', 'methodConfirmComplete', 'measureMethodComplete', 'standardComplete', 'environmentComplete', 'itemCategoryComplete', 'grantNoticeComplete', 'trainComplete', 'examineComplete', 'systemFileComplete'] // 节点数据 - const currentIndex = [] as number[] + const currentIndex1 = [] as number[] processOrderIndex.forEach((item: string) => { - currentIndex.push(Number(currentRecord.value[item])) + currentIndex1.push(Number(currentRecord.value[item])) }) - return currentIndex.filter(item => item).length || 1 + return currentIndex1.findLastIndex(item => item) + 1 || 1 }) // 查新进度按钮(展示查新进度) const searchProcess = (row: any) => {