From 133d41c4e5a49fa8ea639d81088032ed7aea29d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Fri, 12 Dec 2025 15:15:06 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E9=92=A2=E5=8D=B7=E6=89=93=E5=8C=85):=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=92=A2=E5=8D=B7=E6=89=93=E5=8C=85=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=8F=8A=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在easycode页面添加打包按钮及跳转逻辑 - 新增packing页面用于钢卷打包操作 - 更新应用版本号至1.3.16 - 添加打包状态相关表单字段及样式 --- apps/hand-factory/config.js | 2 +- apps/hand-factory/manifest.json | 2 +- apps/hand-factory/pages.json | 7 + apps/hand-factory/pages/easycode/easycode.vue | 81 ++- apps/hand-factory/pages/easycode/packing.vue | 592 ++++++++++++++++++ apps/hand-factory/version.json | 2 +- 6 files changed, 666 insertions(+), 20 deletions(-) create mode 100644 apps/hand-factory/pages/easycode/packing.vue diff --git a/apps/hand-factory/config.js b/apps/hand-factory/config.js index cc41aeb..70fa851 100644 --- a/apps/hand-factory/config.js +++ b/apps/hand-factory/config.js @@ -8,7 +8,7 @@ module.exports = { // 应用名称 name: "ruoyi-app", // 应用版本 - version: "1.3.5", + version: "1.3.16", // 应用logo logo: "/static/logo.jpg", // 官方网站 diff --git a/apps/hand-factory/manifest.json b/apps/hand-factory/manifest.json index 13a5c13..2386600 100644 --- a/apps/hand-factory/manifest.json +++ b/apps/hand-factory/manifest.json @@ -2,7 +2,7 @@ "name" : "科伦普", "appid" : "__UNI__E781B49", "description" : "", - "versionName" : "1.3.13", + "versionName" : "1.3.16", "versionCode" : 1, "transformPx" : false, "app-plus" : { diff --git a/apps/hand-factory/pages.json b/apps/hand-factory/pages.json index 19e0832..1d3c9a8 100644 --- a/apps/hand-factory/pages.json +++ b/apps/hand-factory/pages.json @@ -70,6 +70,13 @@ "navigationBarTitleText" : "查看钢卷" } }, + { + "path" : "pages/easycode/packing", + "style" : + { + "navigationBarTitleText" : "钢卷打包" + } + }, { "path": "pages/receive/receive", "style": { diff --git a/apps/hand-factory/pages/easycode/easycode.vue b/apps/hand-factory/pages/easycode/easycode.vue index b6688d9..496164c 100644 --- a/apps/hand-factory/pages/easycode/easycode.vue +++ b/apps/hand-factory/pages/easycode/easycode.vue @@ -38,6 +38,7 @@ + @@ -74,7 +75,7 @@ 目标库区 - + @@ -163,12 +164,31 @@ }) }) }, - + + async handlePack() { + const content = await this.getQRCodeContent() + let coilId = content.current_coil_id && content.current_coil_id !== 'null' ? content + .current_coil_id : null; + if (!coilId) { + uni.showToast({ + title: '二维码异常', + icon: 'none' + }) + return; + } + uni.navigateTo({ + url: '/pages/easycode/packing?coilId=' + coilId + }) + }, + handleSee() { uni.scanCode({ success(scanRes) { // 查询真实库区在此处的钢卷 - listMaterialCoil({ actualWarehouseId: scanRes.result, dataType: 1 }).then(res => { + listMaterialCoil({ + actualWarehouseId: scanRes.result, + dataType: 1 + }).then(res => { if (res.total == 0) { uni.showToast({ title: '该库区未发现钢卷', @@ -292,6 +312,7 @@ }); return; } + uni.hideLoading(); const content = JSON.parse(qrcodeRecord.content); console.log('解析后的内容：', content); @@ -444,7 +465,9 @@ // 重置移库状态 this.targetWarehouse = null; this.coilDetail = coilRes.data; - this.form = { ...coilRes.data }; + this.form = { + ...coilRes.data + }; // 打开移库弹窗 this.$refs.tranferPopup.open(); @@ -462,7 +485,9 @@ // 移库操作：第二步 - 扫描目标库区码（核心补充） async handleScanWarehouseCode() { try { - uni.showLoading({ title: '扫码中...' }); + uni.showLoading({ + title: '扫码中...' + }); // 扫描库区二维码 const scanRes = await new Promise((resolve, reject) => { uni.scanCode({ @@ -484,7 +509,9 @@ console.log('扫描到的目标库区ID：', targetWarehouseId); // 调用接口获取库区详情（关键：通过库区ID查询名称等信息） - uni.showLoading({ title: '验证库区...' }); + uni.showLoading({ + title: '验证库区...' + }); const warehouseRes = await getActualWarehouse(targetWarehouseId); uni.hideLoading(); @@ -540,16 +567,24 @@ try { // 再次校验：防止异常场景 if (!this.targetWarehouse || !this.form.warehouseId) { - uni.showToast({ title: '请先选择目标库区', icon: 'none' }); + uni.showToast({ + title: '请先选择目标库区', + icon: 'none' + }); return; } if (this.targetWarehouse.actualWarehouseId === this.coilDetail.warehouseId) { - uni.showToast({ title: '目标库区不能与当前库区相同', icon: 'none' }); + uni.showToast({ + title: '目标库区不能与当前库区相同', + icon: 'none' + }); return; } this.loading = true; - uni.showLoading({ title: '移库中...' }); + uni.showLoading({ + title: '移库中...' + }); // 1. 核心：更新钢卷的库区信息 const updateRes = await updateMaterialCoilSimple(this.form); @@ -580,7 +615,11 @@ // 操作成功 uni.hideLoading(); - uni.showToast({ title: '移库成功', icon: 'success', duration: 1500 }); + uni.showToast({ + title: '移库成功', + icon: 'success', + duration: 1500 + }); // 关闭弹窗并重置状态 setTimeout(() => { @@ -775,13 +814,21 @@ color: #e6a23c; border-color: #e6a23c; } - + .see-btn { background-color: #6fd2ff; color: #0777ff; border-color: #0777ff; } + .packing-btn { + background-color: #f2e9ff; + /* 浅紫底色，与黄色#fff9e6、蓝色#6fd2ff等浅底色亮度/饱和度匹配 */ + color: #722ed1; + /* 深紫文字色，延续「同色系饱和色」的文字/边框逻辑 */ + border-color: #722ed1; + } + .move-btn:active { background-color: #fff3cc; opacity: 0.9; @@ -894,14 +941,14 @@ } } } - + /* 扫码按钮样式 */ .scan-btn-wrapper { display: flex; flex-direction: column; align-items: center; gap: 20rpx; - + .scan-icon { width: 160rpx; height: 160rpx; @@ -911,22 +958,22 @@ align-items: center; justify-content: center; box-shadow: 0 8rpx 24rpx rgba(52, 199, 89, 0.3); - + &:active { transform: scale(0.95); } } - + .icon-camera { font-size: 70rpx; color: #fff; } - + .scan-tip { font-size: 28rpx; color: #666; } - + .scan-hint { font-size: 24rpx; color: #999; diff --git a/apps/hand-factory/pages/easycode/packing.vue b/apps/hand-factory/pages/easycode/packing.vue new file mode 100644 index 0000000..fb8e4f6 --- /dev/null +++ b/apps/hand-factory/pages/easycode/packing.vue @@ -0,0 +1,592 @@ + + + + + diff --git a/apps/hand-factory/version.json b/apps/hand-factory/version.json index 63301f0..ab46915 100644 --- a/apps/hand-factory/version.json +++ b/apps/hand-factory/version.json @@ -1,5 +1,5 @@ { - "version": "klp 1.3.13", + "version": "klp 1.3.16", "wgtUrl": "http://49.232.154.205:10900/fadapp-update/klp/klp.wgt", "apkUrl": "http://49.232.154.205:10900/fadapp-update/klp/klp.apk" } \ No newline at end of file