diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 67092d3..2aac391 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -200,7 +200,7 @@ > - + diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 67092d3..2aac391 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -200,7 +200,7 @@ > - + diff --git a/src/views/business/lab/components/environmentalDialog.vue b/src/views/business/lab/components/environmentalDialog.vue index 9bdd2f4..ebac84c 100644 --- a/src/views/business/lab/components/environmentalDialog.vue +++ b/src/views/business/lab/components/environmentalDialog.vue @@ -114,7 +114,7 @@ - diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 67092d3..2aac391 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -200,7 +200,7 @@ > - + diff --git a/src/views/business/lab/components/environmentalDialog.vue b/src/views/business/lab/components/environmentalDialog.vue index 9bdd2f4..ebac84c 100644 --- a/src/views/business/lab/components/environmentalDialog.vue +++ b/src/views/business/lab/components/environmentalDialog.vue @@ -114,7 +114,7 @@ - diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue index 0ceeddf..86adabb 100644 --- a/src/views/business/lab/components/selectOrderSamplesDialog.vue +++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue @@ -35,7 +35,7 @@ getOrderDetail({ id: orderId.value }).then((res) => { list.value = res.data.customerSampleInfoList if (needFilterByInterchangeId.value) { - list.value = list.value.filter((item: { interchangeId: string }) => item.interchangeId === '') + list.value = list.value.filter((item: { interchangeId: string }) => item.interchangeId === '' || `${item.interchangeId}` === '0') } loadingTable.value = false }) diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 67092d3..2aac391 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -200,7 +200,7 @@ > - + diff --git a/src/views/business/lab/components/environmentalDialog.vue b/src/views/business/lab/components/environmentalDialog.vue index 9bdd2f4..ebac84c 100644 --- a/src/views/business/lab/components/environmentalDialog.vue +++ b/src/views/business/lab/components/environmentalDialog.vue @@ -114,7 +114,7 @@ - diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue index 0ceeddf..86adabb 100644 --- a/src/views/business/lab/components/selectOrderSamplesDialog.vue +++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue @@ -35,7 +35,7 @@ getOrderDetail({ id: orderId.value }).then((res) => { list.value = res.data.customerSampleInfoList if (needFilterByInterchangeId.value) { - list.value = list.value.filter((item: { interchangeId: string }) => item.interchangeId === '') + list.value = list.value.filter((item: { interchangeId: string }) => item.interchangeId === '' || `${item.interchangeId}` === '0') } loadingTable.value = false }) diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue index ec36ef7..e769989 100644 --- a/src/views/business/lab/components/selectReportTemplate.vue +++ b/src/views/business/lab/components/selectReportTemplate.vue @@ -135,7 +135,7 @@ - diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 67092d3..2aac391 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -200,7 +200,7 @@ > - + diff --git a/src/views/business/lab/components/environmentalDialog.vue b/src/views/business/lab/components/environmentalDialog.vue index 9bdd2f4..ebac84c 100644 --- a/src/views/business/lab/components/environmentalDialog.vue +++ b/src/views/business/lab/components/environmentalDialog.vue @@ -114,7 +114,7 @@ - diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue index 0ceeddf..86adabb 100644 --- a/src/views/business/lab/components/selectOrderSamplesDialog.vue +++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue @@ -35,7 +35,7 @@ getOrderDetail({ id: orderId.value }).then((res) => { list.value = res.data.customerSampleInfoList if (needFilterByInterchangeId.value) { - list.value = list.value.filter((item: { interchangeId: string }) => item.interchangeId === '') + list.value = list.value.filter((item: { interchangeId: string }) => item.interchangeId === '' || `${item.interchangeId}` === '0') } loadingTable.value = false }) diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue index ec36ef7..e769989 100644 --- a/src/views/business/lab/components/selectReportTemplate.vue +++ b/src/views/business/lab/components/selectReportTemplate.vue @@ -135,7 +135,7 @@ - diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue index dee9050..282ed2f 100644 --- a/src/views/business/lab/components/selectSamplesDialog.vue +++ b/src/views/business/lab/components/selectSamplesDialog.vue @@ -133,7 +133,7 @@ - diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 67092d3..2aac391 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -200,7 +200,7 @@ > - + diff --git a/src/views/business/lab/components/environmentalDialog.vue b/src/views/business/lab/components/environmentalDialog.vue index 9bdd2f4..ebac84c 100644 --- a/src/views/business/lab/components/environmentalDialog.vue +++ b/src/views/business/lab/components/environmentalDialog.vue @@ -114,7 +114,7 @@ - diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue index 0ceeddf..86adabb 100644 --- a/src/views/business/lab/components/selectOrderSamplesDialog.vue +++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue @@ -35,7 +35,7 @@ getOrderDetail({ id: orderId.value }).then((res) => { list.value = res.data.customerSampleInfoList if (needFilterByInterchangeId.value) { - list.value = list.value.filter((item: { interchangeId: string }) => item.interchangeId === '') + list.value = list.value.filter((item: { interchangeId: string }) => item.interchangeId === '' || `${item.interchangeId}` === '0') } loadingTable.value = false }) diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue index ec36ef7..e769989 100644 --- a/src/views/business/lab/components/selectReportTemplate.vue +++ b/src/views/business/lab/components/selectReportTemplate.vue @@ -135,7 +135,7 @@ - diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue index dee9050..282ed2f 100644 --- a/src/views/business/lab/components/selectSamplesDialog.vue +++ b/src/views/business/lab/components/selectSamplesDialog.vue @@ -133,7 +133,7 @@ - diff --git a/src/views/business/lab/components/selectSignature.vue b/src/views/business/lab/components/selectSignature.vue index a541f22..d3ebf61 100644 --- a/src/views/business/lab/components/selectSignature.vue +++ b/src/views/business/lab/components/selectSignature.vue @@ -114,7 +114,7 @@ - diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 67092d3..2aac391 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -200,7 +200,7 @@ > - + diff --git a/src/views/business/lab/components/environmentalDialog.vue b/src/views/business/lab/components/environmentalDialog.vue index 9bdd2f4..ebac84c 100644 --- a/src/views/business/lab/components/environmentalDialog.vue +++ b/src/views/business/lab/components/environmentalDialog.vue @@ -114,7 +114,7 @@ - diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue index 0ceeddf..86adabb 100644 --- a/src/views/business/lab/components/selectOrderSamplesDialog.vue +++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue @@ -35,7 +35,7 @@ getOrderDetail({ id: orderId.value }).then((res) => { list.value = res.data.customerSampleInfoList if (needFilterByInterchangeId.value) { - list.value = list.value.filter((item: { interchangeId: string }) => item.interchangeId === '') + list.value = list.value.filter((item: { interchangeId: string }) => item.interchangeId === '' || `${item.interchangeId}` === '0') } loadingTable.value = false }) diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue index ec36ef7..e769989 100644 --- a/src/views/business/lab/components/selectReportTemplate.vue +++ b/src/views/business/lab/components/selectReportTemplate.vue @@ -135,7 +135,7 @@ - diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue index dee9050..282ed2f 100644 --- a/src/views/business/lab/components/selectSamplesDialog.vue +++ b/src/views/business/lab/components/selectSamplesDialog.vue @@ -133,7 +133,7 @@ - diff --git a/src/views/business/lab/components/selectSignature.vue b/src/views/business/lab/components/selectSignature.vue index a541f22..d3ebf61 100644 --- a/src/views/business/lab/components/selectSignature.vue +++ b/src/views/business/lab/components/selectSignature.vue @@ -114,7 +114,7 @@ - diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts index d25a212..ef83803 100644 --- a/src/views/business/lab/measureData/measureData-interface.ts +++ b/src/views/business/lab/measureData/measureData-interface.ts @@ -103,4 +103,6 @@ syjg: string // 溯源机构 zsbh: string // 证书编号 validDate: string // 有效日期 + + id?: string // id } diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 67092d3..2aac391 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -200,7 +200,7 @@ > - + diff --git a/src/views/business/lab/components/environmentalDialog.vue b/src/views/business/lab/components/environmentalDialog.vue index 9bdd2f4..ebac84c 100644 --- a/src/views/business/lab/components/environmentalDialog.vue +++ b/src/views/business/lab/components/environmentalDialog.vue @@ -114,7 +114,7 @@ - diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue index 0ceeddf..86adabb 100644 --- a/src/views/business/lab/components/selectOrderSamplesDialog.vue +++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue @@ -35,7 +35,7 @@ getOrderDetail({ id: orderId.value }).then((res) => { list.value = res.data.customerSampleInfoList if (needFilterByInterchangeId.value) { - list.value = list.value.filter((item: { interchangeId: string }) => item.interchangeId === '') + list.value = list.value.filter((item: { interchangeId: string }) => item.interchangeId === '' || `${item.interchangeId}` === '0') } loadingTable.value = false }) diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue index ec36ef7..e769989 100644 --- a/src/views/business/lab/components/selectReportTemplate.vue +++ b/src/views/business/lab/components/selectReportTemplate.vue @@ -135,7 +135,7 @@ - diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue index dee9050..282ed2f 100644 --- a/src/views/business/lab/components/selectSamplesDialog.vue +++ b/src/views/business/lab/components/selectSamplesDialog.vue @@ -133,7 +133,7 @@ - diff --git a/src/views/business/lab/components/selectSignature.vue b/src/views/business/lab/components/selectSignature.vue index a541f22..d3ebf61 100644 --- a/src/views/business/lab/components/selectSignature.vue +++ b/src/views/business/lab/components/selectSignature.vue @@ -114,7 +114,7 @@ - diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts index d25a212..ef83803 100644 --- a/src/views/business/lab/measureData/measureData-interface.ts +++ b/src/views/business/lab/measureData/measureData-interface.ts @@ -103,4 +103,6 @@ syjg: string // 溯源机构 zsbh: string // 证书编号 validDate: string // 有效日期 + + id?: string // id } diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue index 491377c..b0e72e7 100644 --- a/src/views/business/lab/measureData/measureDataDetail.vue +++ b/src/views/business/lab/measureData/measureDataDetail.vue @@ -15,6 +15,7 @@ import selectTechFilesDialog from './dialog/selectTechFilesDialog.vue' import { SCHEDULE } from '@/utils/scheduleDict' import { UploadFile } from '@/api/measure/file' +import { getStaffList } from '@/api/measure/person' // import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue' import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue' import type { TableColumn } from '@/components/NormalTable/table_interface' @@ -26,7 +27,6 @@ import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue' import { downloadFile } from '@/utils/download' import type { dictType } from '@/global' -import { getUserList } from '@/api/system/user' import { exportFile } from '@/utils/exportUtils' const user = useUserStore() // 用户信息 @@ -98,7 +98,7 @@ certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }], certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }], calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }], - measurePersonId: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }], + measurePerson: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }], calibrationTime: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }], repeatTime: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }], deliverTime: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }], @@ -125,7 +125,7 @@ // ---------------------------------------字典-------------------------------------------- const certificationTypeMap = ref([]) // 证书类别 const calibrationMajorMap = ref([]) // 校检专业 -const userList = ref([]) // 检定员 + // 获取字典值 async function getDict() { // 校检专业 @@ -134,13 +134,9 @@ // 证书类别 const rescertificationType = await getDictByCode('certificationType') certificationTypeMap.value = rescertificationType.data - - // 获取人员列表 - getUserList({ offset: 1, limit: 99999 }).then((res) => { - userList.value = res.data.rows - }) } getDict() + // -------------------------------------原证书-------------------------------------------- const selectMeasueDataDialogRef = ref() // 选择原证书组件ref // 点击选择原证书 @@ -349,7 +345,7 @@ const confirmSelectEquipment = (val: any) => { val.forEach((item: IEquipmentList) => { // 只添加列表里不存在的 - const index = equipmentInfoList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo) + const index = equipmentInfoList.value.findIndex((i: IEquipmentList) => item.id === i.id) if (index === -1) { equipmentInfoList.value.push(item) } @@ -469,12 +465,14 @@ getMeasureDataDetail({ id: infoId.value! || id! }).then((res) => { loading.close() form.value = res.data + fileList.value = res.data.fileList // 依据的技术文件 + form.value.techFilesName = fileList.value.map((item: { fileName: string }) => item.fileName).join(',') sampleList.value = [{ sampleNo: res.data.sampleNo, // 样品编号 - sampleName: res.data.sampleNo, // 样品名称 - sampleModel: res.data.sampleNo, // 型号 - manufacturingNo: res.data.sampleNo, // 出厂编号 - manufacturer: res.data.sampleNo, // 生产厂家 + sampleName: res.data.sampleName, // 样品名称 + sampleModel: res.data.sampleModel, // 型号 + manufacturingNo: res.data.manufacturingNo, // 出厂编号 + manufacturer: res.data.manufacturer, // 生产厂家 remark: res.data.sampleRemark, // 备注 id: res.data.sampleId, }] @@ -489,6 +487,7 @@ if (id && certificateReportCode) { form.value.oldCertificateCode = certificateReportCode form.value.invalid = 1 + form.value.measurePerson = user.name // 检定员名字 } }).catch(() => { loading.close() @@ -655,13 +654,6 @@ } console.log(form.value.certificateReportCategoryName) } -// 选择检定员变化 -const changeMeasurePersonId = (val: string) => { - const index = userList.value.findIndex(item => item.id === val) - if (index !== -1) { - form.value.measurePerson = userList.value[index].name - } -} // ------------------------------------------------------------------------------------- onMounted(async () => { await getDict() @@ -677,14 +669,13 @@ // form.value.createUserName = user.name // 创建人 // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间 form.value.measurePerson = user.name // 检定员名字 - form.value.measurePersonId = user.id // 检定员id form.value.calibrationTime = proxy.dayjs().format('YYYY-MM-DD') // 检校日期 } })