diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue index 6b87bfd..42b5d43 100644 --- a/src/views/business/lab/deptMeasure/deptMeasureList.vue +++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue @@ -332,7 +332,7 @@ { return row.isUrgentName == '是' ? 'color: red' : '' } }, { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' }, { text: '样品属性', value: 'sampleBelongName', align: 'center' }, - { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' }, + { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '80px' }, // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } }, ]) // 表格数据 @@ -224,7 +224,8 @@ // 收入样品 myExecutiveReceive([{ orderId: row.orderId, sampleId: row.sampleId }]).then((res) => { if (res.code == 200) { - ElMessage.success('收入成功') + ElMessage.success('已收入') + fetchData() } }) }) @@ -245,7 +246,8 @@ ).then(() => { myExecutiveDone([{ orderId: row.orderId, sampleId: row.sampleId }]).then((res) => { if (res.code == 200) { - ElMessage.success('检测成功') + ElMessage.success('检测完成') + fetchData() } }) }) @@ -361,7 +363,7 @@ { return row.isUrgentName == '是' ? 'color: red' : '' } }, { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' }, { text: '样品属性', value: 'sampleBelongName', align: 'center' }, - { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' }, + { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '80px' }, // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } }, ]) // 表格数据 @@ -224,7 +224,8 @@ // 收入样品 myExecutiveReceive([{ orderId: row.orderId, sampleId: row.sampleId }]).then((res) => { if (res.code == 200) { - ElMessage.success('收入成功') + ElMessage.success('已收入') + fetchData() } }) }) @@ -245,7 +246,8 @@ ).then(() => { myExecutiveDone([{ orderId: row.orderId, sampleId: row.sampleId }]).then((res) => { if (res.code == 200) { - ElMessage.success('检测成功') + ElMessage.success('检测完成') + fetchData() } }) }) @@ -361,7 +363,7 @@ { return { ...item, - Certifications: item.alreadyCertifications === item.requireCertifications ? item.requireCertifications : (`${item.alreadyCertifications}/${item.requireCertifications}`), + Certifications: `${item.alreadyCertifications}/${item.requireCertifications}`, sampleBelong: `${item.sampleBelong}` === '1' ? '自有设备' : '客户样品', isUrgentName: item.isUrgent == 1 ? '是' : '否', } diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue index 6b87bfd..42b5d43 100644 --- a/src/views/business/lab/deptMeasure/deptMeasureList.vue +++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue @@ -332,7 +332,7 @@ { return row.isUrgentName == '是' ? 'color: red' : '' } }, { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' }, { text: '样品属性', value: 'sampleBelongName', align: 'center' }, - { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' }, + { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '80px' }, // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } }, ]) // 表格数据 @@ -224,7 +224,8 @@ // 收入样品 myExecutiveReceive([{ orderId: row.orderId, sampleId: row.sampleId }]).then((res) => { if (res.code == 200) { - ElMessage.success('收入成功') + ElMessage.success('已收入') + fetchData() } }) }) @@ -245,7 +246,8 @@ ).then(() => { myExecutiveDone([{ orderId: row.orderId, sampleId: row.sampleId }]).then((res) => { if (res.code == 200) { - ElMessage.success('检测成功') + ElMessage.success('检测完成') + fetchData() } }) }) @@ -361,7 +363,7 @@ { return { ...item, - Certifications: item.alreadyCertifications === item.requireCertifications ? item.requireCertifications : (`${item.alreadyCertifications}/${item.requireCertifications}`), + Certifications: `${item.alreadyCertifications}/${item.requireCertifications}`, sampleBelong: `${item.sampleBelong}` === '1' ? '自有设备' : '客户样品', isUrgentName: item.isUrgent == 1 ? '是' : '否', } diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue index 3b6af2b..7f892e5 100644 --- a/src/views/business/schedule/task/components/processNode.vue +++ b/src/views/business/schedule/task/components/processNode.vue @@ -101,7 +101,7 @@ const _selectStaffDialog = ref() // 实验室选择完毕 const chooseOver = (lab: ILabList) => { - const index = props.processList?.findIndex((item: any) => item.measureSegmentId === item.deptId) + const index = props.processList?.findIndex((item: any) => item.measureSegmentId === lab.deptId) if (index === -1) { processNodeData.value.measureSegmentId = lab.deptId processNodeData.value.measureSegment = lab.organizeName @@ -149,9 +149,9 @@
检定人员 - +
@@ -161,7 +161,7 @@ v-model="processNodeData.requireCertifications" class="process-input" size="small" - :disabled="user.deptId !== processNodeData.measureSegmentId || !certificationEdit || props.detail" + :disabled="(props.isDept && user.deptId !== processNodeData.measureSegmentId) || !certificationEdit || props.detail" />