From e2ac7a73c6524ea856f82ed52ea9b471abae8c32 Mon Sep 17 00:00:00 2001 From: liangzhou <594755172@qq.com> Date: Tue, 10 Dec 2024 17:02:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0=EF=BC=9A?= =?UTF-8?q?=201.=20=E5=A4=87=E6=96=99=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=BE=85=E9=85=8D=E6=96=99=E5=88=97=E8=A1=A8=202.=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=89=93=E5=8D=B0=E7=A1=AE=E8=AE=A4=E5=AE=8C=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E7=9A=84=E5=8A=9F=E8=83=BD=203.=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE=E7=82=B9=E5=87=BB=E4=B8=A4?= =?UTF-8?q?=E6=AC=A1=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/task.js | 21 +++++++++- src/layout/doKitting.vue | 46 ++++++++++++++++++++- src/layout/finishKitting.vue | 80 +++++++++++++++++++++++++++++++++--- 3 files changed, 139 insertions(+), 8 deletions(-) diff --git a/src/api/task.js b/src/api/task.js index 9a33f01..be21dbf 100644 --- a/src/api/task.js +++ b/src/api/task.js @@ -73,6 +73,15 @@ const getWorkByStandAndGoods = (params) => { }) } +const getWorkGoodsList = (params) => { + return request({ + url: '/task/getWorkGoodsList', + method: 'post', + data: params, + timeout: 10000 + }) +} + const confirmFinishedWork = (params) => { return request({ url: '/task/confirmFinishedWork', @@ -145,6 +154,14 @@ const requestPrintData = (params) => { }) } +const requestOldPrintData = (params) => { + return request({ + url: '/task/requestOldPrintData', + method: 'post', + data: params + }) +} + const requestSortBox = (params) => { return request({ url: '/task/requestSortBox', @@ -236,5 +253,7 @@ export { updatePickTasks, clcNoPlan, clcNoPlanConfirmBack, - finishSortBox + finishSortBox, + getWorkGoodsList, + requestOldPrintData } \ No newline at end of file diff --git a/src/layout/doKitting.vue b/src/layout/doKitting.vue index 982c5bc..527f079 100644 --- a/src/layout/doKitting.vue +++ b/src/layout/doKitting.vue @@ -132,6 +132,17 @@ +
+ + 待拣选物料列表 + + + + + + +
import store from '@/store' -import { getWorkByStandAndGoods, confirmFinishWork, queryFinishByStandAndGoods } from '@/api/task' +import { getWorkByStandAndGoods, confirmFinishWork, queryFinishByStandAndGoods, getWorkGoodsList } from '@/api/task' import { handleExceptionStock } from '@/api/stock' import { errorBox, warningBox } from '@/utils/myMessageBox.js' import { ElMessage } from 'element-plus' @@ -202,13 +213,15 @@ export default { }), exceptionHandleFormEntity: reactive({}), exceptionHandleFormRef: ref(), - dialogVisible: false + dialogVisible: false, + pickingGoodsList: [] } }, mounted() { this.$refs.goodsId.focus() this.timer = setInterval(() => { this.queryFinish() + // this.getWorkList() }, 1500) }, beforeUnmount() { @@ -279,6 +292,23 @@ export default { console.log(err) }) }, + getWorkList() { + const request = { + standId: this.standId, + userName: store.getters.getUserName + } + getWorkGoodsList(request).then(res => { + const response = res.data + if (response.code == 0) { + this.pickingGoodsList = response.returnData + } else { + this.pickingGoodsList = [] + } + }).catch(err => { + console.log(err) + this.pickingGoodsList = [] + }) + }, // 重置参数 resetForms() { this.workFormEntity.goodsId = '' @@ -521,4 +551,16 @@ export default { font-weight: bold; font-size: 25px; } + +.goods-list-area { + margin: auto; + min-height: fit-content; + max-height: 90%; + margin-bottom: 10px; + min-width: inherit; + border: solid 1px; + border-radius: 10px; + box-shadow: 0px 15px 10px -15px #000; + overflow: auto; +} \ No newline at end of file diff --git a/src/layout/finishKitting.vue b/src/layout/finishKitting.vue index 167489f..2b80b2a 100644 --- a/src/layout/finishKitting.vue +++ b/src/layout/finishKitting.vue @@ -13,7 +13,15 @@ 工作站：
- {{ standId }} + + +
@@ -95,7 +103,7 @@
-
+
打印标签 @@ -111,6 +119,7 @@
+
@@ -139,10 +148,11 @@ @@ -150,6 +160,7 @@ import zhCn from 'element-plus/dist/locale/zh-cn.mjs' export default { name: 'finishKitting', data() { + let self = this return { standId: store.getters.getStandId, // timer: '', @@ -168,7 +179,34 @@ export default { { required: true, message: '请输入料号' } ] }), - printTabs: [] + printTabs: [], + printObj: { + id: "printArea", // 这里是要打印元素的ID + popTitle: " ", // 打印的标题 + extraCss: "", // 打印可引入外部的一个 css 文件 + extraHead: "", // 打印头部文字 + preview: false, // 是否启动预览模式，默认是false + previewTitle: '打印客户账单', // 打印预览的标题 + previewPrintBtnLabel: '预览结束，开始打印', // 打印预览的标题下方的按钮文本，点击可进入打印 + zIndex: 10002, // 预览窗口的z-index，默认是20002，最好比默认值更高 + previewBeforeOpenCallback() { + // console.log('正在加载预览窗口！'); + }, // 预览窗口打开之前的callback + previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback + beforeOpenCallback() { + // console.log('开始打印之前！') + }, // 开始打印之前的callback + openCallback() { + // console.log('执行打印了！') + }, // 调用打印时的callback + closeCallback() { + // console.log('关闭了打印工具！') + }, // 关闭打印的callback(无法区分确认or取消) + clickMounted() { + // console.log('点击v-print绑定的按钮了！') + }, + }, + } }, mounted() { @@ -238,21 +276,50 @@ export default { }) }, requestPrint() { + loading.open('请求数据中，请稍等...') // 获取打印标签的数据 const printParams = { standId: this.standId, userName: store.getters.getUserName } requestPrintData(printParams).then(res => { + loading.close() if (res.data.code == 0) { this.printTabs = res.data.returnData + this.$nextTick(() => { + this.$refs.printBtn.click() + }); } else { errorBox(res.data.message) } }).catch(err => { + loading.close() console.log(err) errorBox('获取标签数据时异常') }) + }, + requestPrintOld() { + loading.open('请求数据中，请稍等...') + // 获取打印标签的数据 + const printParams = { + standId: this.standId, + userName: store.getters.getUserName + } + requestOldPrintData(printParams).then(res => { + loading.close() + if (res.data.code == 0) { + this.printTabs = res.data.returnData + this.$nextTick(() => { + this.$refs.printBtn.click() + }); + } else { + errorBox(res.data.message) + } + }).catch(err => { + loading.close() + console.log(err) + errorBox('获取标签数据（确认过）时异常') + }) } } } @@ -362,6 +429,9 @@ export default { align-self: center; font-weight: bold; font-size: 25px; + cursor: pointer; + background-color: white; + border: white; } .display-title-div {