diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts index 399de03..0fc7fcd 100644 --- a/src/api/resource/fileNovelty.ts +++ b/src/api/resource/fileNovelty.ts @@ -99,3 +99,12 @@ }) } +// 查新记录是否展示在工作台 +export function setProsessShowBench(data: any) { + return request({ + url: '/resource/file/methodNoveltySearch/speedUpdate', + method: 'post', + data, + }) +} + diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts index 399de03..0fc7fcd 100644 --- a/src/api/resource/fileNovelty.ts +++ b/src/api/resource/fileNovelty.ts @@ -99,3 +99,12 @@ }) } +// 查新记录是否展示在工作台 +export function setProsessShowBench(data: any) { + return request({ + url: '/resource/file/methodNoveltySearch/speedUpdate', + method: 'post', + data, + }) +} + diff --git a/src/views/resource/file/methodConfirm/confirm-interface.ts b/src/views/resource/file/methodConfirm/confirm-interface.ts index b6f335b..8dcabcf 100644 --- a/src/views/resource/file/methodConfirm/confirm-interface.ts +++ b/src/views/resource/file/methodConfirm/confirm-interface.ts @@ -33,6 +33,7 @@ labCodeName?: string groupCode: string groupCodeName?: string + fileDistributeNo?: string fileId: string fileNo: string fileName: string @@ -48,5 +49,12 @@ createUserId: string createUserName?: string createTime?: string + enableTime?: string + environmentRequire?: string + temperatureHighLimit?: string + temperatureLowLimit?: string + humidityHighLimit?: string + humidityLowLimit?: string + params?: string decisionItem?: number } diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts index 399de03..0fc7fcd 100644 --- a/src/api/resource/fileNovelty.ts +++ b/src/api/resource/fileNovelty.ts @@ -99,3 +99,12 @@ }) } +// 查新记录是否展示在工作台 +export function setProsessShowBench(data: any) { + return request({ + url: '/resource/file/methodNoveltySearch/speedUpdate', + method: 'post', + data, + }) +} + diff --git a/src/views/resource/file/methodConfirm/confirm-interface.ts b/src/views/resource/file/methodConfirm/confirm-interface.ts index b6f335b..8dcabcf 100644 --- a/src/views/resource/file/methodConfirm/confirm-interface.ts +++ b/src/views/resource/file/methodConfirm/confirm-interface.ts @@ -33,6 +33,7 @@ labCodeName?: string groupCode: string groupCodeName?: string + fileDistributeNo?: string fileId: string fileNo: string fileName: string @@ -48,5 +49,12 @@ createUserId: string createUserName?: string createTime?: string + enableTime?: string + environmentRequire?: string + temperatureHighLimit?: string + temperatureLowLimit?: string + humidityHighLimit?: string + humidityLowLimit?: string + params?: string decisionItem?: number } diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue index 1631cf8..d987ce1 100644 --- a/src/views/resource/file/methodConfirm/detail.vue +++ b/src/views/resource/file/methodConfirm/detail.vue @@ -46,11 +46,20 @@ const methodConfirmRules = ref({ labCode: [{ required: true, message: '实验室代码不能为空,请选择', trigger: ['change', 'blur'] }], groupCode: [{ required: true, message: '组别代码不能为空,请选择', trigger: ['change', 'blur'] }], + fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }], fileNo: [{ required: true, message: '检测或校准方法不能为空,请选择', trigger: 'blur' }], measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }], methodIllustration: [{ required: true, message: '方法及说明不能为空', trigger: 'blur' }], reviewTeam: [{ required: true, message: '评审组成员不能为空', trigger: 'blur' }], minioFileName: [{ required: true, message: '附件不能为空', trigger: 'blur' }], + fileName: [{ required: true, message: '文件名称不能为空', trigger: 'blur' }], + enableTime: [{ required: true, message: '启用时间不能为空', trigger: 'blur' }], + params: [{ required: true, message: '开展量传参数不能为空', trigger: 'blur' }], + environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }], + temperatureHighLimit: [{ required: true, message: '温度要求上限不能为空', trigger: 'blur' }], + temperatureLowLimit: [{ required: true, message: '温度要求下限不能为空', trigger: 'blur' }], + humidityLowLimit: [{ required: true, message: '湿度要求下限不能为空', trigger: 'blur' }], + humidityHighLimit: [{ required: true, message: '湿度要求上限不能为空', trigger: 'blur' }], }) // 表单验证规则 // 是否显示相关按钮 @@ -81,6 +90,15 @@ createTime: '', createUserId: '', createUserName: '', + fileDistributeNo: '', + enableTime: '', + params: '', + environmentRequire: '', + temperatureHighLimit: '', + temperatureLowLimit: '', + humidityHighLimit: '', + humidityLowLimit: '', + remark: '', }) const fileColumns = ref>([ { text: '文件类型', value: 'categoryName', align: 'center', width: '300' }, @@ -300,10 +318,12 @@ } // 选定文件返回 -const methodFileSelected = (row: IMethodFileInfo) => { - methodConfirm.value.fileId = row.id - methodConfirm.value.fileNo = row.fileNo - methodConfirm.value.fileName = row.fileName +const methodFileSelected = (row1: any, row2: any) => { + // row1 测试校准检定方法查新记录表 row2 测试校准检定方法 + console.log(row1, row2, '12121121') + methodConfirm.value.fileId = row2[0].id + methodConfirm.value.fileNo = row2[0].fileNo + methodConfirm.value.fileName = row2[0].fileName } // 流程审批-同意 @@ -599,37 +619,108 @@ - + + + - + + + - - - - - - + + + + + - - - - - - + + + - - - - - + + + + + + + + + + + + +
+ + + + + + ~ + + + + + +
+
+
+ + +
+ + + + + + ~ + + + + + +
+
+
+ + + + + + + {{ methodConfirm.minioFileName }} @@ -651,7 +742,34 @@ + + + + +
+ + + + + + + + + + + + + + + + + + @@ -663,7 +781,7 @@ @on-revoke="revokeHandler" /> - + @@ -663,7 +781,7 @@ @on-revoke="revokeHandler" /> - + @@ -663,7 +781,7 @@ @on-revoke="revokeHandler" /> - +