From 4a33b9cac5b411be3234d4cd8a5b404f66d398b6 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 31 Dec 2024 09:31:26 +0800 Subject: [PATCH] =?UTF-8?q?12/31=20=E7=81=AF=E7=BB=84=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/collect/collectLedGroup.js | 17 ++ .../basic/workplace/bingdLedGroupDialog.vue | 178 ++++++++++++++++++ src/views/basic/workplace/workplaceQueue.vue | 87 +++++++-- .../CollectOrderAllotCardComponents.vue | 1 + 4 files changed, 270 insertions(+), 13 deletions(-) create mode 100644 src/api/collect/collectLedGroup.js create mode 100644 src/views/basic/workplace/bingdLedGroupDialog.vue diff --git a/src/api/collect/collectLedGroup.js b/src/api/collect/collectLedGroup.js new file mode 100644 index 00000000..d48417bf --- /dev/null +++ b/src/api/collect/collectLedGroup.js @@ -0,0 +1,17 @@ +import axios from "@/utils/request" + +export function getLeds(query) { + return axios({ + url: "/udiwms/basic/collect/ledGroup/filter", + method: "post", + data: query + }); +} + +export function binding(query) { + return axios({ + url: "/udiwms/basic/collect/ledGroup/binding", + method: "post", + data: query + }); +} diff --git a/src/views/basic/workplace/bingdLedGroupDialog.vue b/src/views/basic/workplace/bingdLedGroupDialog.vue new file mode 100644 index 00000000..bfe1b1ef --- /dev/null +++ b/src/views/basic/workplace/bingdLedGroupDialog.vue @@ -0,0 +1,178 @@ + + + + + diff --git a/src/views/basic/workplace/workplaceQueue.vue b/src/views/basic/workplace/workplaceQueue.vue index 4c8b30aa..8cdbc896 100644 --- a/src/views/basic/workplace/workplaceQueue.vue +++ b/src/views/basic/workplace/workplaceQueue.vue @@ -133,6 +133,7 @@ + @@ -217,15 +218,39 @@ id="inputer2" @focus="getInputFocus($event)" @keypress.enter.native="enterKey2($event)" - ref="inputRef2" - style="width: 80%" + ref='inputRef2' + style="ime-mode:disabled;width: 80%" type="tel" placeholder="请扫追溯码/产品编码/医保编码绑定" v-model="addBindData.udiCode" :disabled="!addBindData.udiCodeFlag" > + 绑定灯组 + + + + + + + + + + + + + + + + + @@ -241,6 +266,7 @@ +
取消 @@ -270,6 +296,24 @@ + + + + + +
@@ -285,6 +329,7 @@ import { } from '@/api/basic/workPlace/SysWorkplaceQueue' import { executeFuc, getHead } from '@/utils/customConfig' import selectDrugDialog from "./selectDrugDialog" +import bingdLedGroupDialog from "./bingdLedGroupDialog" const formJson = { site_id: '', @@ -295,7 +340,7 @@ const formJson = { export default { name: 'workplaceQueue', - components:{selectDrugDialog}, + components:{selectDrugDialog,bingdLedGroupDialog}, data() { return { @@ -410,6 +455,8 @@ export default { 2: '已使用', 3: '已退回' }, + addBindLedVisible: false, + ledData:{} } }, methods: { @@ -507,16 +554,14 @@ 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.submitAddBindData() - }) - .catch(() => { - }) + this.codeQuery.scanCode = null + // this.submitAddBindData() } else { } @@ -534,6 +579,9 @@ export default { if (this.addBindData.udiCode == null) { return this.$message.error('请添加产品!') } + if (this.ledData.id == null){ + return this.$message.error('请绑定灯组!') + } this.addBindData.relId = this.product.relId bind(this.addBindData).then( (response) => { @@ -541,12 +589,14 @@ export default { this.$message.success('绑定成功') this.addBindData = { code: null, + //todo 绑定灯组完成之后需要更改该addBindData值和下面注释的 codeFlag: false, udiCode: null, udiCodeFlag: false } this.sysWorkplaceQueue = {} this.product = {} + this.addBindVisible = false this.$nextTick(() => { this.$refs.inputRef1.focus() // 设置焦点到第一个输入框 }) @@ -558,7 +608,7 @@ export default { } }).catch((error) => { this.$message.error(error.message) - this.$refs.inputRef1.select() + // this.$refs.inputRef1.select() }) }, @@ -817,6 +867,17 @@ export default { }).catch(() => { }) + }, + bingLed(){ + if (isBlank(this.product.nameCode)){ + return this.$message.error("请先录入产品") + } + this.addBindLedVisible = true + }, + bingLedGroup(row){ + this.ledData = row + this.addBindLedVisible = false + // console.log("hagaggaga",row) } }, diff --git a/src/views/collect/CollectOrderAllotCardComponents.vue b/src/views/collect/CollectOrderAllotCardComponents.vue index 307a87fb..4b21c80f 100644 --- a/src/views/collect/CollectOrderAllotCardComponents.vue +++ b/src/views/collect/CollectOrderAllotCardComponents.vue @@ -851,6 +851,7 @@ export default { key: val, page: 1, limit: 10, + workPlaceClass:1 } filterWorkOptimize(query) .then((response) => {