From 00beff9d4579e110491a7def30dd82e708c2fb8b Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 31 Dec 2024 14:49:55 +0800 Subject: [PATCH] =?UTF-8?q?12/31=20=E7=81=AF=E7=BB=84=E7=AE=A1=E7=90=861.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/basic/workPlace/SysWorkplaceQueue.js | 10 ++ .../basic/workplace/bingdLedGroupDialog.vue | 24 +++- src/views/basic/workplace/workplaceQueue.vue | 114 ++++++++++++++---- 3 files changed, 121 insertions(+), 27 deletions(-) diff --git a/src/api/basic/workPlace/SysWorkplaceQueue.js b/src/api/basic/workPlace/SysWorkplaceQueue.js index 4f55d211..4c4b63ce 100644 --- a/src/api/basic/workPlace/SysWorkplaceQueue.js +++ b/src/api/basic/workPlace/SysWorkplaceQueue.js @@ -119,3 +119,13 @@ export function removeLed(query) { data: query }); } + + + +export function getLedDataByCode(query) { + return axios({ + url: "/udiwms/sysWorkplaceQueue/getLedDataByCode", + method: "post", + data: query + }); +} diff --git a/src/views/basic/workplace/bingdLedGroupDialog.vue b/src/views/basic/workplace/bingdLedGroupDialog.vue index f090b731..3151bad0 100644 --- a/src/views/basic/workplace/bingdLedGroupDialog.vue +++ b/src/views/basic/workplace/bingdLedGroupDialog.vue @@ -3,7 +3,7 @@ - + import { getLeds } from '@/api/collect/collectLedGroup' import {binding } from '@/api/basic/workPlace/SysWorkplaceQueue' +import { isBlank } from '@/utils/strUtil' export default { props: { @@ -128,6 +129,7 @@ export default { page: 1, limit: 10, scanCode:"", + isBind: 1, }, showSearch: true, lesStatusMap: { @@ -140,6 +142,18 @@ export default { hideSearch() { this.showSearch = !this.showSearch; }, + onReset() { + this.$router.push({ + path: '' + }) + this.filterQuery = { + page: 1, + limit: 10, + scanCode:"", + isBind: 1, + } + this.getList() + }, getInputFocus(event) { event.currentTarget.select() }, @@ -171,6 +185,14 @@ export default { } }) // this.$emit('bindLed', row); + }, + enterKey(){ + if (isBlank(this.filterQuery.scanCode)) { + return this.$message.error('灯组标签不能为空') + } + this.filterQuery.mac = this.filterQuery.scanCode + this.getList() + this.filterQuery.scanCode = null } }, created() { diff --git a/src/views/basic/workplace/workplaceQueue.vue b/src/views/basic/workplace/workplaceQueue.vue index dfa887b6..0e3f9f2a 100644 --- a/src/views/basic/workplace/workplaceQueue.vue +++ b/src/views/basic/workplace/workplaceQueue.vue @@ -148,13 +148,14 @@ type="text" size="small" @click.native.stop="bingLed(scope.row)" + :disabled="scope.row.mac" >绑定灯组 解绑灯组 - - {{ sysWorkplaceQueue.code }} + + {{ ledData.mac }} - {{ sysWorkplaceQueue.remark }} + {{ ledData.remark }} + {{ lesStatusMap[ledData.red] }} + {{ lesStatusMap[ledData.orange] }} + {{ lesStatusMap[ledData.blue] }} + {{ lesStatusMap[ledData.green] }} @@ -267,15 +273,6 @@ v-model="addBindData.udiCode" :disabled="!addBindData.udiCodeFlag" > - 绑定灯组 - - @@ -367,7 +364,7 @@ import { getInfoByCode, getProductByCode, bind, - removeProduct, removeLed + removeProduct, removeLed, getLedDataByCode, binding } from '@/api/basic/workPlace/SysWorkplaceQueue' import { executeFuc, getHead } from '@/utils/customConfig' import selectDrugDialog from "./selectDrugDialog" @@ -501,7 +498,11 @@ export default { }, addBindLedVisible: false, queueData: null, - ledData:{} + ledData:{}, + lesStatusMap: { + true : "开启", + false: "关闭" + } } }, methods: { @@ -566,7 +567,7 @@ export default { this.addBindData.udiCodeFlag = true this.$nextTick(() => { - this.$refs.inputRef2.focus() // 设置焦点到第一个输入框 + this.$refs.inputRef3.focus() // 设置焦点到第一个输入框 }) }) @@ -575,10 +576,12 @@ export default { } else { this.addBindData.id = this.sysWorkplaceQueue.id this.addBindData.codeFlag = true + this.addBindData.macCodeFlag = true + //绑定产品 this.addBindData.udiCodeFlag = true this.$nextTick(() => { - this.$refs.inputRef2.focus() // 设置焦点到第一个输入框 + this.$refs.inputRef3.focus() // 设置焦点到第一个输入框 }) } @@ -599,14 +602,16 @@ export default { this.product = response.data if (this.product.relId != null) { //已绑定 - // this.$confirm('当前出货槽位编码将绑定绑定产品, 是否提交?', '提示', { - // confirmButtonText: '确定', - // cancelButtonText: '取消', - // type: 'warning' - // }).then(() => { + this.$confirm('当前出货槽位编码将绑定绑定产品, 是否提交?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { this.addBindData.relId = this.product.relId - this.codeQuery.scanCode = null - // this.submitAddBindData() + this.submitAddBindData() + }) + .catch(() => { + }) } else { } @@ -617,6 +622,60 @@ export default { this.$message.error(error.message) }) }, + enterKey3(){ + if (isBlank(this.addBindData.macCode)) { + return this.$message.error('灯组标签不能为空') + } + let query = { + macCode: this.addBindData.macCode, + queueCode : this.sysWorkplaceQueue.code + } + getLedDataByCode(query).then( + (response) => { + if (response.code === 20000) { + this.ledData = response.data + this.addBindData.macCodeFlag = false + if (!isBlank(this.sysWorkplaceQueue.mac) && this.sysWorkplaceQueue.mac === this.ledData.mac){ + this.addBindData.macCodeFlag = true + return this.$message.warning("当前灯组标签已和当前出货槽绑定") + } + if (!isBlank(this.sysWorkplaceQueue.mac)){ + this.$confirm('当前出货槽信息已绑定灯组, 是否更换?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.bindLED() + }).catch(() => {}) + }else { + this.bindLED() + } + } else { + this.addBindData.macCode = null + this.$message.error(response.message) + } + }).catch((error) => { + this.$message.error() + }) + }, + bindLED(){ + let query = { + id : this.sysWorkplaceQueue.id, + code : this.sysWorkplaceQueue.code, + mac : this.ledData.mac + } + binding(query).then(res => { + if (res.code == 20000){ + this.$nextTick(() => { + this.$refs.inputRef3.focus() // 设置焦点到第一个输入框 + }) + this.$message.success("绑定成功") + }else { + this.$message.error(res.meaage) + } + }) + // this.$emit('bindLed', row); + }, submitAddBindData() { if (this.addBindData.id == null || this.addBindData.code == null) { return this.$message.error('请添加槽位') @@ -642,11 +701,13 @@ export default { this.$nextTick(() => { this.$refs.inputRef1.focus() // 设置焦点到第一个输入框 }) + this.getCodeDetailList() } else { this.$message.error(response.message) this.$nextTick(() => { this.$refs.inputRef1.focus() // 设置焦点到第一个输入框 }) + this.getCodeDetailList() } }).catch((error) => { this.$message.error(error.message) @@ -808,6 +869,7 @@ export default { } this.sysWorkplaceQueue = {} this.product = {} + this.ledData = {} this.addBindVisible = true this.$nextTick(() => { this.$refs.inputRef1.focus() // 设置焦点到第一个输入框