diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue index 1ef14e0..e302073 100644 --- a/src/views/business/manager/sendReceive/components/basic.vue +++ b/src/views/business/manager/sendReceive/components/basic.vue @@ -151,6 +151,10 @@ // background: 'rgba(255, 255, 255, 0.8)', // }) loading.value = true + if (!props.equipmentId) { + loading.value = false + return + } getDetailBaseInfo({ equipmentId: props.equipmentId! }).then((res) => { emits('givePrintForm', { manufactureNo: res.data.manufactureNo, // 出厂编号 diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue index 1ef14e0..e302073 100644 --- a/src/views/business/manager/sendReceive/components/basic.vue +++ b/src/views/business/manager/sendReceive/components/basic.vue @@ -151,6 +151,10 @@ // background: 'rgba(255, 255, 255, 0.8)', // }) loading.value = true + if (!props.equipmentId) { + loading.value = false + return + } getDetailBaseInfo({ equipmentId: props.equipmentId! }).then((res) => { emits('givePrintForm', { manufactureNo: res.data.manufactureNo, // 出厂编号 diff --git a/src/views/business/manager/sendReceive/components/eqptDeviceDialog.vue b/src/views/business/manager/sendReceive/components/eqptDeviceDialog.vue index ea758a3..58fb97d 100644 --- a/src/views/business/manager/sendReceive/components/eqptDeviceDialog.vue +++ b/src/views/business/manager/sendReceive/components/eqptDeviceDialog.vue @@ -12,34 +12,40 @@ const initDialog = () => { scanStatus.value = '1' dialogVisible.value = true + setTimeout(() => { + onScanning('1787382572175704066') + }, 2000) } // ----定义对外暴露的方法 初始化弹窗, 关闭弹窗 const deviceId = ref('') const deviceDetaiRef = ref() -const onScanning = (code: string) => { +function onScanning(code: string) { scanStatus.value = '2' console.log(code, '获取到的设备的id')// 获取到的条形码 ElMessage.success('扫描成功,获取设备信息中') - if (deviceDetaiRef.value) { - deviceDetaiRef.value.loading = true - // } - if ((code || '').trim()) { - getDetailBaseInfo({ equipmentId: (code || '').trim() }).then((res) => { - if (res.data) { - setTimeout(() => { - deviceDetaiRef.value?.fetchInfo() - }) - } - else { - scanStatus.value = '3' - } - }) + setTimeout(() => { + if (deviceDetaiRef.value) { + deviceDetaiRef.value.loading = true + if (code.trim()) { + getDetailBaseInfo({ equipmentId: code.trim() }).then((res) => { + if (res.data) { + deviceId.value = code.trim() + setTimeout(() => { + deviceDetaiRef.value?.fetchInfo() + }) + } + else { + scanStatus.value = '3' + } + }) + } + else { + scanStatus.value = '3' + ElMessage.warning('扫描未成功,请重新尝试') + } } - else { - ElMessage.warning('扫描未成功,请重新尝试') - } - } + }) } // 关闭弹窗 const closeDialog = () => { @@ -87,7 +93,8 @@ var nextTime1 = new Date().getTime() var lastTime1 if (e.which == 13) { - onScanning(codeString) + // onScanning(codeString) + onScanning('1787382572175704066') codeString = '' } }