From f3d825333cc0827eb3f784cdf8e56ff93053df21 Mon Sep 17 00:00:00 2001 From: hehaibing-1996 Date: Thu, 13 Feb 2025 10:02:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=91=E5=AE=9A=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PDA/PDA/components/Card.vue | 10 +- PDA/PDA/components/StocktakingCard.vue | 2 +- PDA/PDA/pages/main/main.vue | 28 +++++ PDA/PDA/pages/queryBindList/queryBindList.vue | 89 ++++++++------ PDA/PDA/static/shelfLocation.png | Bin 0 -> 5838 bytes .../dist/dev/app-plus/app-service.js | 115 ++++++++++++------ 6 files changed, 162 insertions(+), 82 deletions(-) create mode 100644 PDA/PDA/static/shelfLocation.png diff --git a/PDA/PDA/components/Card.vue b/PDA/PDA/components/Card.vue index 6716565..5c1a550 100644 --- a/PDA/PDA/components/Card.vue +++ b/PDA/PDA/components/Card.vue @@ -16,17 +16,13 @@ 数量: {{item.matQty}} - - 盘点数量: - {{item.stocktakingQty}} - - + 库位: {{item.locationCode}} - - 货架编码: + + 货架: {{item.shelfCode}} diff --git a/PDA/PDA/components/StocktakingCard.vue b/PDA/PDA/components/StocktakingCard.vue index 41e8fb1..51d73e5 100644 --- a/PDA/PDA/components/StocktakingCard.vue +++ b/PDA/PDA/components/StocktakingCard.vue @@ -27,7 +27,7 @@ {{item.locationCode}} - 货架编码: + 货架: {{item.shelfCode}} diff --git a/PDA/PDA/pages/main/main.vue b/PDA/PDA/pages/main/main.vue index ce7aed2..7789221 100644 --- a/PDA/PDA/pages/main/main.vue +++ b/PDA/PDA/pages/main/main.vue @@ -62,6 +62,34 @@ + + + + + + + + + 货架位置 + + + + + + + + + + + diff --git a/PDA/PDA/pages/queryBindList/queryBindList.vue b/PDA/PDA/pages/queryBindList/queryBindList.vue index 0cfc214..8a9d457 100644 --- a/PDA/PDA/pages/queryBindList/queryBindList.vue +++ b/PDA/PDA/pages/queryBindList/queryBindList.vue @@ -69,7 +69,8 @@ - + @@ -108,6 +109,9 @@ nextTick } from 'vue'; import uniPopup from '@/node_modules/@dcloudio/uni-ui/lib/uni-popup/uni-popup'; + import { + getCurrentInstance + } from 'vue'; export default { components: { @@ -115,6 +119,9 @@ Card }, setup() { + const { + proxy + } = getCurrentInstance(); // 不能修改的信息 const fixedInfo = { infoId: 0, @@ -136,9 +143,6 @@ inputValue.value = info.matQty; popup.value.open(); - // nextTick(() => { - // inputRef.value.focus(); - // }); }; const hidePopup = () => { @@ -175,7 +179,8 @@ //调用接口进行数量的修改 uni.request({ - url: 'http://' + serverIPAndPort +'/matDetailCurrenInfo/updateMatDetailCurrentInfoById', // 请求的接口地址 + url: 'http://' + serverIPAndPort + + '/matDetailCurrenInfo/updateMatDetailCurrentInfoById', // 请求的接口地址 method: 'POST', // 设置请求方式为 POST data: { "matQty": inputValue.value, @@ -191,13 +196,14 @@ if (res.statusCode === 200) { //接口返回数据为200 表示获取成功！ if (res.data.code == 200) { - + hidePopup(); uni.showToast({ title: '修改成功!', icon: 'none', - duration: 1200 + duration: 2000 }); - hidePopup(); + + proxy.queryMatList(); } else { uni.showToast({ title: '修改失败:' + res.data.message, @@ -257,6 +263,11 @@ placeholderText: '请先扫描货架码', matCodeCondition: '', //物料编码搜索条件 cardData: null, + + //监控滑动的位置 + touchStartX: 0, + touchStartY: 0, + isMove: false, //滑动标识 是否滑动 } }, onShow: function() { @@ -274,21 +285,21 @@ analysisScanCode: function(encodedString) { // 去除末尾的逗号和"..."（如果有的话） encodedString = encodedString.replace(/,\s*\.\.\.$/, ''); - // 分割字符串并转换为字节数组 - let byteStrings = encodedString.split(','); - let byteArray = []; - for (let byteString of byteStrings) { - byteArray.push(parseInt(byteString, 10)); // 将字符串转换为十进制整数 - } - // 将字节数组转换为UTF-8字符串 - // 注意：这里使用了一个简单的循环来构建字符串，因为String.fromCharCode.apply可能在大数据上性能不佳 - let originalString = ''; - for (let i = 0; i < byteArray.length; i++) { - // 对于每个字节，使用fromCharCode转换为对应的字符 - // 注意：这里假设你的字节数组已经是正确的UTF-8编码，并且不需要额外的处理来组合多字节字符 - originalString += String.fromCharCode(byteArray[i]); - } - this.shelfCode = originalString; + // // 分割字符串并转换为字节数组 + // let byteStrings = encodedString.split(','); + // let byteArray = []; + // for (let byteString of byteStrings) { + // byteArray.push(parseInt(byteString, 10)); // 将字符串转换为十进制整数 + // } + // // 将字节数组转换为UTF-8字符串 + // // 注意：这里使用了一个简单的循环来构建字符串，因为String.fromCharCode.apply可能在大数据上性能不佳 + // let originalString = ''; + // for (let i = 0; i < byteArray.length; i++) { + // // 对于每个字节，使用fromCharCode转换为对应的字符 + // // 注意：这里假设你的字节数组已经是正确的UTF-8编码，并且不需要额外的处理来组合多字节字符 + // originalString += String.fromCharCode(byteArray[i]); + // } + this.shelfCode = encodedString; //调用接口获取当前工位信息 当前工位是否有货架 var serverIPAndPort = getServerIPAndPort(); uni.request({ @@ -301,7 +312,7 @@ "userName": this.userName, "deviceType": "PDA", "pageNumber": 1, - "pageSize": 100 + "pageSize": 300, }, header: { 'Content-Type': 'application/json', // 如果需要以JSON格式发送数据 @@ -375,8 +386,6 @@ }); return; } - - var serverIPAndPort = getServerIPAndPort(); uni.request({ url: 'http://' + serverIPAndPort + @@ -388,7 +397,7 @@ "userName": this.userName, "deviceType": "PDA", "pageNumber": 1, - "pageSize": 100 + "pageSize": 300 }, header: { 'Content-Type': 'application/json', // 如果需要以JSON格式发送数据 @@ -459,18 +468,24 @@ this.cardData = null; this.recordCount = 0; }, - + //解决长按和滑动冲突的问题 + cardTouchStart(e) { + this.isMove = false; + this.touchStartX = e.touches[0].clientX; + this.touchStartY = e.touches[0].clientY; + }, + cardTouchMove(e) { + var deltaX = e.changedTouches[0].clientX - this.touchStartX; + var deltaY = e.changedTouches[0].clientY - this.touchStartY; + if (Math.abs(deltaX) > 5 || Math.abs(deltaY) > 5) { + this.isMove = true; + } + }, //长按 longpress(item) { - // uni.showToast({ - // title: '您长按了' + item.matCode, - // icon: 'none', - // duration: 1500 - // }); - - this.showPopup(item); - //this.$refs.popup.open(); - + if (this.isMove == false) { + this.showPopup(item); + } }, } } diff --git a/PDA/PDA/static/shelfLocation.png b/PDA/PDA/static/shelfLocation.png new file mode 100644 index 0000000000000000000000000000000000000000..b9e0e7787b8a5c09bb8e46c0fd22eae21de328b2 GIT binary patch literal 5838 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 YKXtGk$aGZ&=Kufz07*qoM6N<$g8V1&IsgCw literal 0 HcmV?d00001 diff --git a/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js b/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js index 416ad8d..ae2020d 100644 --- a/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js +++ b/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js @@ -381,6 +381,7 @@ if (uni.restoreGlobal) { const _imports_4 = "/static/callOut.png"; const _imports_5 = "/static/stockTaking.png"; const _imports_6 = "/static/task.png"; + const _imports_7 = "/static/shelfLocation.png"; const _sfc_main$a = { data() { return {}; @@ -520,6 +521,42 @@ if (uni.restoreGlobal) { vue.createElementVNode("view", { class: "function-text" }, "任务管理") ]), vue.createElementVNode("view", { style: { "flex": "1" } }) + ]), + vue.createElementVNode("view", { style: { "display": "flex", "flex-direction": "row", "margin-bottom": "10rpx", "margin-top": "30rpx" } }, [ + vue.createElementVNode("view", { style: { "flex": "1" } }), + vue.createElementVNode("view", { + class: "uni-flex uni-column", + style: { "flex": "5" } + }, [ + vue.createElementVNode("navigator", { + url: "../bind/bind", + "hover-class": "navigator-hover" + }, [ + vue.createElementVNode("view", { + class: "uni-flex uni-row", + style: { "-webkit-justify-content": "center", "justify-content": "center" } + }, [ + vue.createElementVNode("image", { + class: "function-image", + src: _imports_7 + }) + ]), + vue.createElementVNode("view", { class: "function-text" }, "货架位置") + ]) + ]), + vue.createElementVNode("view", { + class: "uni-flex uni-column", + style: { "flex": "5" } + }, [ + vue.createCommentVNode(' \r\n \r\n \r\n \r\n 库存盘点\r\n ') + ]), + vue.createElementVNode("view", { + class: "uni-flex uni-column", + style: { "flex": "5" } + }, [ + vue.createCommentVNode(' \r\n \r\n \r\n 任务管理 ') + ]), + vue.createElementVNode("view", { style: { "flex": "1" } }) ]) ]); } @@ -1877,23 +1914,10 @@ if (uni.restoreGlobal) { /* TEXT */ ) ]), - vue.createElementVNode("view", { - class: "content-item", - style: { "font-weight": "600" } - }, [ - vue.createElementVNode("text", null, "盘点数量:"), - vue.createElementVNode( - "text", - null, - vue.toDisplayString($props.item.stocktakingQty), - 1 - /* TEXT */ - ) - ]), vue.createElementVNode("view", { class: "content-combined" }, [ vue.createElementVNode("view", { class: "content-item", - style: { "font-weight": "600", "color": "firebrick" } + style: { "font-weight": "400", "color": "firebrick" } }, [ vue.createElementVNode("text", null, "库位:"), vue.createElementVNode( @@ -1906,9 +1930,9 @@ if (uni.restoreGlobal) { ]), vue.createElementVNode("view", { class: "content-item", - style: { "font-weight": "600", "color": "firebrick" } + style: { "font-weight": "400", "color": "firebrick" } }, [ - vue.createElementVNode("text", null, "货架编码:"), + vue.createElementVNode("text", null, "货架:"), vue.createElementVNode( "text", null, @@ -2367,6 +2391,9 @@ if (uni.restoreGlobal) { Card }, setup() { + const { + proxy + } = vue.getCurrentInstance(); const fixedInfo = { infoId: 0, matCode: "示例名称", @@ -2433,12 +2460,13 @@ if (uni.restoreGlobal) { success: (res) => { if (res.statusCode === 200) { if (res.data.code == 200) { + hidePopup(); uni.showToast({ title: "修改成功!", icon: "none", - duration: 1200 + duration: 2e3 }); - hidePopup(); + proxy.queryMatList(); } else { uni.showToast({ title: "修改失败:" + res.data.message, @@ -2487,32 +2515,28 @@ if (uni.restoreGlobal) { placeholderText: "请先扫描货架码", matCodeCondition: "", //物料编码搜索条件 - cardData: null + cardData: null, + //监控滑动的位置 + touchStartX: 0, + touchStartY: 0, + isMove: false + //滑动标识 是否滑动 }; }, onShow: function() { this.userName = getConfig("userName", "admin"); const self = this; recive(function(res) { - formatAppLog("log", "at pages/queryBindList/queryBindList.vue:267", "Success:" + res.data); + formatAppLog("log", "at pages/queryBindList/queryBindList.vue:278", "Success:" + res.data); self.analysisScanCode(res.data); }, function(err) { - formatAppLog("log", "at pages/queryBindList/queryBindList.vue:270", "Error:", JSON.stringify(err)); + formatAppLog("log", "at pages/queryBindList/queryBindList.vue:281", "Error:", JSON.stringify(err)); }); }, methods: { analysisScanCode: function(encodedString) { encodedString = encodedString.replace(/,\s*\.\.\.$/, ""); - let byteStrings = encodedString.split(","); - let byteArray = []; - for (let byteString of byteStrings) { - byteArray.push(parseInt(byteString, 10)); - } - let originalString = ""; - for (let i = 0; i < byteArray.length; i++) { - originalString += String.fromCharCode(byteArray[i]); - } - this.shelfCode = originalString; + this.shelfCode = encodedString; var serverIPAndPort = getServerIPAndPort(); uni.request({ url: "http://" + serverIPAndPort + "/matDetailCurrenInfo/getMatDetailCurrentInfos", @@ -2525,7 +2549,7 @@ if (uni.restoreGlobal) { "userName": this.userName, "deviceType": "PDA", "pageNumber": 1, - "pageSize": 100 + "pageSize": 300 }, header: { "Content-Type": "application/json" @@ -2575,7 +2599,7 @@ if (uni.restoreGlobal) { this.clear(); }, complete: (event) => { - formatAppLog("log", "at pages/queryBindList/queryBindList.vue:362", "请求完成", event); + formatAppLog("log", "at pages/queryBindList/queryBindList.vue:373", "请求完成", event); } }); }, @@ -2600,7 +2624,7 @@ if (uni.restoreGlobal) { "userName": this.userName, "deviceType": "PDA", "pageNumber": 1, - "pageSize": 100 + "pageSize": 300 }, header: { "Content-Type": "application/json" @@ -2650,7 +2674,7 @@ if (uni.restoreGlobal) { this.clear(); }, complete: (event) => { - formatAppLog("log", "at pages/queryBindList/queryBindList.vue:449", "请求完成", event); + formatAppLog("log", "at pages/queryBindList/queryBindList.vue:458", "请求完成", event); } }); }, @@ -2660,9 +2684,24 @@ if (uni.restoreGlobal) { this.cardData = null; this.recordCount = 0; }, + //解决长按和滑动冲突的问题 + cardTouchStart(e) { + this.isMove = false; + this.touchStartX = e.touches[0].clientX; + this.touchStartY = e.touches[0].clientY; + }, + cardTouchMove(e) { + var deltaX = e.changedTouches[0].clientX - this.touchStartX; + var deltaY = e.changedTouches[0].clientY - this.touchStartY; + if (Math.abs(deltaX) > 5 || Math.abs(deltaY) > 5) { + this.isMove = true; + } + }, //长按 longpress(item) { - this.showPopup(item); + if (this.isMove == false) { + this.showPopup(item); + } } } }; @@ -2829,6 +2868,8 @@ if (uni.restoreGlobal) { vue.renderList($data.cardData, (item, index) => { return vue.openBlock(), vue.createElementBlock("view", { key: index, + onTouchstart: _cache[6] || (_cache[6] = (...args) => $options.cardTouchStart && $options.cardTouchStart(...args)), + onTouchmove: _cache[7] || (_cache[7] = (...args) => $options.cardTouchMove && $options.cardTouchMove(...args)), onLongpress: ($event) => $options.longpress(item) }, [ vue.createVNode(_component_Card, { @@ -2946,7 +2987,7 @@ if (uni.restoreGlobal) { class: "content-item", style: { "font-weight": "600", "color": "firebrick" } }, [ - vue.createElementVNode("text", null, "货架编码:"), + vue.createElementVNode("text", null, "货架:"), vue.createElementVNode( "text", null,