diff --git a/src/views/qualityManagement/backend/touchScreen/workorder/components/WorkOrderCard.vue b/src/views/qualityManagement/backend/touchScreen/workorder/components/WorkOrderCard.vue index 9fa8788..d7ff9ea 100644 --- a/src/views/qualityManagement/backend/touchScreen/workorder/components/WorkOrderCard.vue +++ b/src/views/qualityManagement/backend/touchScreen/workorder/components/WorkOrderCard.vue @@ -24,13 +24,15 @@
站点: - +
班组: - +
@@ -86,17 +88,16 @@ - - - - - + + + + + + +
@@ -124,7 +125,7 @@ export default { teamOptions: [], siteOptions: [], - // 站点工单执行状态 1-初始状态(扫外箱标签) 2-工单执行中(扫内标签) + // 站点工单执行状态 1-初始状态(扫外箱标签) 2-工单执行中(扫内标签)3-扫外箱标签 formStatus: 1, team: '', site: '', @@ -230,14 +231,34 @@ export default { if (res.code === 200) { this.formData = res.data this.formDataChange(res.data) + this.checkPackageIsFull() } }) }, changeFormStatus(type) { this.formStatus = type }, + // 后台检查,满箱弹出弹出 + async checkPackageIsFull() { + const workorder = this.formData.workOrder + const checkRes1 = await QcBackEndApi.CheckPackageIsFullAndNeedScanPackageLabel({ workorder }) + // 需要扫箱标签 + if (checkRes1.code === 200 && checkRes1.data === true) { + const obj = { + workOrder: workorder, + team: this.team, + siteNo: this.site, + } + this.changeFormStatus(3) + this.$refs.ScanPackageLabelDialogRef.open(obj) + return true; + } else if (typeof checkRes1.data === 'string' && checkRes1.data.includes('功能异常')) { + this.showErrorMessage(3, res.data) + return false; + } + }, async setMqttMessage(LabelCode, ComNo, SiteNo) { - console.log(this.formStatus) + //console.log(this.formStatus) if (SiteNo !== this.site) { return } @@ -249,25 +270,7 @@ export default { } // 扫内标签模式 if (this.formStatus === 2) { - const workorder = this.formData.workOrder - const checkRes1 = await QcBackEndApi.CheckPackageIsFullAndNeedScanPackageLabel({ workorder }) - // 需要扫箱标签 - if (checkRes1.code === 200 && checkRes1.data === true) { - const obj = { - workOrder: workorder, - team: this.team, - siteNo: this.site, - } - this.changeFormStatus(3) - this.$refs.ScanPackageLabelDialogRef.open(obj) - - //this.$refs.ScanPackageLabelDialogRef.handleScanPackageLabel(LabelCode, ComNo) - return - } else if (typeof checkRes1.data === 'string' && checkRes1.data.includes('功能异常')) { - this.showErrorMessage(3, res.data) - return - } - // 扫内标签模式 + // 扫内标签模式(调换位置) this.handleScanInnerLabel(LabelCode, ComNo) return } @@ -277,6 +280,7 @@ export default { return } }, + // 扫内标签的情况 async handleScanInnerLabel(label = '', comNo = '未知串口') { const params = { @@ -419,10 +423,13 @@ export default { font-size: 16px; font-weight: 600; } + .workorder-label { font-size: 12px; - word-wrap: break-word; /* 允许长单词或 URL 地址换行到下一行 */ - word-break: break-all; /* 允许在单词内换行 */ + word-wrap: break-word; + /* 允许长单词或 URL 地址换行到下一行 */ + word-break: break-all; + /* 允许在单词内换行 */ padding: 0; } diff --git a/src/views/qualityManagement/backend/touchScreen/workorder/index.vue b/src/views/qualityManagement/backend/touchScreen/workorder/index.vue index 282287e..ec59ae1 100644 --- a/src/views/qualityManagement/backend/touchScreen/workorder/index.vue +++ b/src/views/qualityManagement/backend/touchScreen/workorder/index.vue @@ -32,7 +32,7 @@ export default { return { loading: false, mqttClient: null, - mqttClientId: emqxUtil.title + 'BackEnd' + Math.random().toString(16).substring(1, 10), + mqttClientId: emqxUtil.title + 'BackEnd-' + Math.random().toString(16).substring(1, 10), formData: { workOrder: '', partnumber: '', @@ -178,8 +178,6 @@ export default { that.mqttClient.on('message', function (topic, message) { if (topic === _topic.SiteComLabelCode) { const objData = emqxUtil.parseJSON(message) - console.log(objData) - that.doMqttAction(objData) } })