From 2f47047ae62a43b9fb0cefe592589ae90e16be09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Tue, 27 Jan 2026 09:45:06 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=87=B31.3.25=E5=B9=B6=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 更新config.js、manifest.json等文件中的版本号至1.3.25
- 在editby.vue页面添加品名、规格等钢卷信息展示
- 调整easycode.vue中otherTypes的过滤条件
- 修改klp-header.vue中的镀锌机组名称
- 更新update.js中的静态版本号
---
 .../components/klp-header/klp-header.vue      |  2 +-
 apps/hand-factory/config.js                   |  2 +-
 apps/hand-factory/manifest.json               |  2 +-
 apps/hand-factory/pages/easycode/easycode.vue |  2 +-
 apps/hand-factory/pages/easycode/editby.vue   | 29 +++++++++++++++++--
 apps/hand-factory/utils/update.js             |  3 +-
 apps/hand-factory/version.json                |  2 +-
 7 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/apps/hand-factory/components/klp-header/klp-header.vue b/apps/hand-factory/components/klp-header/klp-header.vue
index f944b8b..8bd4e63 100644
--- a/apps/hand-factory/components/klp-header/klp-header.vue
+++ b/apps/hand-factory/components/klp-header/klp-header.vue
@@ -38,7 +38,7 @@ export default {
       lineList: [
         { name: "科伦普重工-酸轧机组", key: "acidity" },
 				// { name: "科伦普重工-彩涂机组", key: "paint" },
-        { name: "科伦普重工-镀锌线一组", key: "zinc1" },
+        { name: "科伦普重工-镀锌机组", key: "zinc1" },
         // { name: "科伦普重工-镀锌线二组", key: "zinc2" },
         // { name: "科伦普重工-镀锌线三组", key: "zinc3" },
       ],
diff --git a/apps/hand-factory/config.js b/apps/hand-factory/config.js
index f0dc466..39fd8a4 100644
--- a/apps/hand-factory/config.js
+++ b/apps/hand-factory/config.js
@@ -9,7 +9,7 @@ module.exports = {
     // 应用名称
     name: "ruoyi-app",
     // 应用版本
-    version: "1.3.24",
+    version: "1.3.25",
     // 应用logo
     logo: "/static/logo.jpg",
     // 官方网站
diff --git a/apps/hand-factory/manifest.json b/apps/hand-factory/manifest.json
index 447fcd7..7bc7581 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.24",
+    "versionName" : "1.3.25",
     "versionCode" : 1,
     "transformPx" : false,
     "app-plus" : {
diff --git a/apps/hand-factory/pages/easycode/easycode.vue b/apps/hand-factory/pages/easycode/easycode.vue
index d6ae79d..7892db9 100644
--- a/apps/hand-factory/pages/easycode/easycode.vue
+++ b/apps/hand-factory/pages/easycode/easycode.vue
@@ -229,7 +229,7 @@
 			otherTypes() {
 				return this.types.filter(item => {
 					const value = parseInt(item.dictValue);
-					return value < 100 || value > 199;
+					return value < 100 || (value > 199 && value < 400);
 				});
 			}
 		},
diff --git a/apps/hand-factory/pages/easycode/editby.vue b/apps/hand-factory/pages/easycode/editby.vue
index c010f0c..ea7fcd6 100644
--- a/apps/hand-factory/pages/easycode/editby.vue
+++ b/apps/hand-factory/pages/easycode/editby.vue
@@ -1,6 +1,22 @@
 <template>
 	<view class="typing-container">
 		<view class="info-grid">
+			<view class="info-item">
+				<text class="item-label">品名</text>
+				<text class="item-value">{{ coilDetail.itemName }}</text>
+			</view>
+			<view class="info-item">
+				<text class="item-label">规格</text>
+				<text class="item-value">{{ coilDetail.itemSpecification }}</text>
+			</view>
+			<view class="info-item">
+				<text class="item-label">材质</text>
+				<text class="item-value">{{ coilDetail.itemMaterial }}</text>
+			</view>
+			<view class="info-item">
+				<text class="item-label">厂家</text>
+				<text class="item-value">{{ coilDetail.itemManufacturer }}</text>
+			</view>
 			<view class="info-item">
 				<text class="item-label">入场钢卷号</text>
 				<text class="item-value">{{ coilDetail.enterCoilNo || '-' }}</text>
@@ -93,7 +109,8 @@
 		data() {
 			return {
 				form: {},
-				coilDetail: {},
+				coilDetail: {
+				},
 				loading: false,
 			}
 		},
@@ -107,8 +124,14 @@
 			fetchCoil(coilId) {
 				getMaterialCoil(coilId).then(res => {
 					this.form = res.data;
-					this.coilDetail = res.data;
-					console.log(this.form, '钢卷信息')
+					this.coilDetail = {
+						...res.data,
+						itemName: res.data.materialType == '成品' ? res.data.product.productName : res.data.rawMaterial.rawMaterialName,
+						itemSpecification: res.data.materialType == '成品' ? res.data.product.specification : res.data.rawMaterial.specification,
+						itemManufacturer: res.data.materialType == '成品' ? res.data.product.manufacturer : res.data.rawMaterial.manufacturer, 
+						itemMaterial: res.data.materialType == '成品' ? res.data.product.material : res.data.rawMaterial.material
+					};
+					console.log('钢卷信息', this.form, )
 				})
 			},
 			// 获取设备信息（原有方法不变）
diff --git a/apps/hand-factory/utils/update.js b/apps/hand-factory/utils/update.js
index cc6fbf5..e57231f 100644
--- a/apps/hand-factory/utils/update.js
+++ b/apps/hand-factory/utils/update.js
@@ -73,7 +73,8 @@ function checkStorageSpace() {
 function checkUpdate(forceCheck = false) {
   // 1. 准备本地版本信息
   const localVersion = plus.runtime.version; // 基座版本
-  const staticVersion = '1.3.24'; // 静态默认版本
+  const staticVersion = '1.3.25'; // 静态默认版本
+	// const localWgtVersion = staticVersion;
   const localWgtVersion = uni.getStorageSync('wgtVersion') || staticVersion; // 本地wgt版本（从存储获取或用默认）
   const currentVersion = compareVersion(localWgtVersion, localVersion) > 0 
     ? localWgtVersion 
diff --git a/apps/hand-factory/version.json b/apps/hand-factory/version.json
index 486aefd..f6b5efd 100644
--- a/apps/hand-factory/version.json
+++ b/apps/hand-factory/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "klp 1.3.24",
+  "version": "klp 1.3.25",
   "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