diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue index f84a639..04aee85 100644 --- a/src/components/QRcodeDeviceDialog/index.vue +++ b/src/components/QRcodeDeviceDialog/index.vue @@ -4,6 +4,7 @@ import { ElMessage, ElMessageBox } from 'element-plus' import scanImg from '@/assets/images/scan.png' import { devcieOrderSelect, getInfoDetail } from '@/api/eqpt/device/info' +import { clearSymbol } from '@/utils/String' // 弹窗显示 const emits = defineEmits(['confirm']) const multipleTableRef = ref() @@ -128,7 +129,7 @@ var nextTime1 = new Date().getTime() var lastTime1 if (e.which == 13) { - onScanning(codeString) + onScanning(clearSymbol(codeString)) codeString = '' } } diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue index f84a639..04aee85 100644 --- a/src/components/QRcodeDeviceDialog/index.vue +++ b/src/components/QRcodeDeviceDialog/index.vue @@ -4,6 +4,7 @@ import { ElMessage, ElMessageBox } from 'element-plus' import scanImg from '@/assets/images/scan.png' import { devcieOrderSelect, getInfoDetail } from '@/api/eqpt/device/info' +import { clearSymbol } from '@/utils/String' // 弹窗显示 const emits = defineEmits(['confirm']) const multipleTableRef = ref() @@ -128,7 +129,7 @@ var nextTime1 = new Date().getTime() var lastTime1 if (e.which == 13) { - onScanning(codeString) + onScanning(clearSymbol(codeString)) codeString = '' } } diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue index cf9159a..bcd5abd 100644 --- a/src/views/tested/MeasurementPlan/task/components/tableList.vue +++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue @@ -12,6 +12,7 @@ import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue' import QRcodeDeviceDialog from '@/components/QRcodeDeviceDialog/index.vue' import { getPreTaskContent, getTaskTogether } from '@/api/eqpt/measurementPlan/task' + const $props = defineProps({ data: { type: Array, @@ -467,7 +468,7 @@ const ids = [] as any value.forEach((item: any) => { if (!list.value.filter((c: any) => c.sampleId === item.id).length) { - ids.value.push(item.id) + ids.push(item.id) list.value.push({ appearanceInspect: '', appendixDescn: '无', @@ -549,7 +550,6 @@ deviceNum: list.value.filter((citem: any) => citem.sampleName === element.sampleName).length, }) }) - console.log(togetherList.value, 'togetherList.value') } const getRowKeys = (row: any) => { // 获取当前行id return row.sampleName // 这里看这一行中需要根据哪个属性值是id