diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue index 0314454..ff14d69 100644 --- a/src/views/equipement/info/book/components/basic.vue +++ b/src/views/equipement/info/book/components/basic.vue @@ -686,8 +686,8 @@ console.log('groupNo', user.groupNo) console.log('注意：此用户没有实验室或者组别代码') const index = useDeptList.value.findIndex(item => item.name === name) - form.value.groupCode = useDeptList.value[index].value if (index !== -1 && `${user.bizLabCode}` !== '' && `${user.groupNo}` !== '') { + form.value.groupCode = useDeptList.value[index].value // 通过实验室组别获取部门id、并赋值给deptId fetchDeptIdByLabAndGroup(user.bizLabCode, user.groupNo) } diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue index 0314454..ff14d69 100644 --- a/src/views/equipement/info/book/components/basic.vue +++ b/src/views/equipement/info/book/components/basic.vue @@ -686,8 +686,8 @@ console.log('groupNo', user.groupNo) console.log('注意：此用户没有实验室或者组别代码') const index = useDeptList.value.findIndex(item => item.name === name) - form.value.groupCode = useDeptList.value[index].value if (index !== -1 && `${user.bizLabCode}` !== '' && `${user.groupNo}` !== '') { + form.value.groupCode = useDeptList.value[index].value // 通过实验室组别获取部门id、并赋值给deptId fetchDeptIdByLabAndGroup(user.bizLabCode, user.groupNo) } diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts index 9cb48b5..bab911a 100644 --- a/src/views/equipement/standard/book/book-interface.ts +++ b/src/views/equipement/standard/book/book-interface.ts @@ -82,8 +82,8 @@ manageStatusName: string // 使用状态名称 buildStandardReportFile: string // 建标报告 examTableFile: string // 考核表 - standardCertFile: string // 标准证书 - [key: string]: string + standardCertFile?: string // 标准证书 + [key: string]: string | undefined } // 标准配套设备列表 diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue index 0314454..ff14d69 100644 --- a/src/views/equipement/info/book/components/basic.vue +++ b/src/views/equipement/info/book/components/basic.vue @@ -686,8 +686,8 @@ console.log('groupNo', user.groupNo) console.log('注意：此用户没有实验室或者组别代码') const index = useDeptList.value.findIndex(item => item.name === name) - form.value.groupCode = useDeptList.value[index].value if (index !== -1 && `${user.bizLabCode}` !== '' && `${user.groupNo}` !== '') { + form.value.groupCode = useDeptList.value[index].value // 通过实验室组别获取部门id、并赋值给deptId fetchDeptIdByLabAndGroup(user.bizLabCode, user.groupNo) } diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts index 9cb48b5..bab911a 100644 --- a/src/views/equipement/standard/book/book-interface.ts +++ b/src/views/equipement/standard/book/book-interface.ts @@ -82,8 +82,8 @@ manageStatusName: string // 使用状态名称 buildStandardReportFile: string // 建标报告 examTableFile: string // 考核表 - standardCertFile: string // 标准证书 - [key: string]: string + standardCertFile?: string // 标准证书 + [key: string]: string | undefined } // 标准配套设备列表 diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue index 7d69949..4af316b 100644 --- a/src/views/equipement/standard/book/components/basic.vue +++ b/src/views/equipement/standard/book/components/basic.vue @@ -326,7 +326,7 @@ const confirmSelectTechFile = (val: any) => { if (val && val.length) { if (isMultiFiles.value) { // 多选 - val.forEach((item: { fileNo: string; fileName: string; remark: string; id: string }) => { + val.forEach((item: any) => { // 只添加列表里不存在的 const index = technologyRelationList.value.findIndex((i: ITechFiles) => item.fileNo === i.technologyFileNo) if (index === -1) { @@ -384,15 +384,13 @@ temperature: '', // 温度(℃) humidity: '', // 相对湿度 voltage: '', // 电源电压 - powerFrequency: '', // 电源频率 - surroundEnvironment: '', // 周围环境 - electricField: '', // 电磁场 + otherRequirement: '', // 其他要求 editable: true, // 是否可编辑 }]) // 处理温湿度 function solveTemperatureHumidity() { - const list = technologyRelationList.value + const list = technologyRelationList.value as any let minTemperature = list[0].temperatureLowLimit // 温度找下限的最大值 let maxTemperature = list[0].temperatureHighLimit // 温度找上限的最小值 let minHumidity = list[0].humidityLowLimit // 湿度找下限的最大值 @@ -811,8 +809,8 @@ console.log('groupNo', user.groupNo) console.log('注意：此用户没有实验室或者组别代码') const index = useDeptList.value.findIndex(item => item.name === name) - form.value.groupCode = useDeptList.value[index].value if (index !== -1 && `${user.bizLabCode}` !== '' && `${user.groupNo}` !== '') { + form.value.groupCode = useDeptList.value[index].value // 通过实验室组别获取部门id、并赋值给deptId fetchDeptIdByLabAndGroup(user.bizLabCode, user.groupNo) } @@ -845,7 +843,7 @@ } } // 创建日期变化 -const changeCreateTime = (val: Date) => { +const changeCreateTime = (val: string) => { if (!form.value.lastReviewDate) { form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD') } @@ -856,16 +854,22 @@ form.value.createUserId = user.id// 创建人id form.value.createUserName = user.name // 创建人 form.value.createTime = dayjs().format('YYYY-MM-DD')// 申请时间 - changeCreateTime() + changeCreateTime(form.value.createTime) + + form.value.labCode = user.bizLabCode // 实验室 + form.value.labCodeName = labNameDict.value[form.value.labCode!] // 实验室名称 + form.value.deptName = useDeptDict.value[user.groupNo] // 部门名称 + changeDeptName(form.value.deptName) + console.log('-----1212121321') + if (props.pageType !== 'add') { + console.log('-----222222222') if (window.sessionStorage.getItem('standardGetInfoForm')) { + console.log('-----33333') fetchInfo(false) // 获取详情信息 } - else { // 新建 - form.value.labCode = user.bizLabCode // 实验室 - form.value.labCodeName = labNameDict.value[form.value.labCode!] // 实验室名称 - form.value.deptName = useDeptDict.value[user.groupNo] // 部门名称 - changeDeptName(form.value.deptName) + else { + console.log('-----44444') fetchInfo(true) // 获取详情信息 } }