diff --git a/apps/hand-factory/config.js b/apps/hand-factory/config.js
index 8afa89a..aa46d10 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.21",
+ version: "1.3.22",
// 应用logo
logo: "/static/logo.jpg",
// 官方网站
diff --git a/apps/hand-factory/manifest.json b/apps/hand-factory/manifest.json
index 8c1637c..1b831f1 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.21",
+ "versionName" : "1.3.22",
"versionCode" : 1,
"transformPx" : false,
"app-plus" : {
diff --git a/apps/hand-factory/pages.json b/apps/hand-factory/pages.json
index 1d3c9a8..4acfad2 100644
--- a/apps/hand-factory/pages.json
+++ b/apps/hand-factory/pages.json
@@ -82,6 +82,12 @@
"style": {
"navigationBarTitleText": "钢卷收货"
}
+ },
+ {
+ "path": "pages/search/search",
+ "style": {
+ "navigationBarTitleText": "钢卷查询"
+ }
}
// {
// "path": "pages/register",
@@ -168,6 +174,12 @@
"selectedIconPath": "/static/images/tabbar/receive_.png",
"iconPath": "/static/images/tabbar/receive.png"
},
+ {
+ "text": "查找",
+ "pagePath": "pages/search/search",
+ "selectedIconPath": "/static/images/tabbar/search_.png",
+ "iconPath": "/static/images/tabbar/search.png"
+ },
{
"text": "我的",
"pagePath": "pages/mine/index",
diff --git a/apps/hand-factory/pages/easycode/easycode.vue b/apps/hand-factory/pages/easycode/easycode.vue
index a6714d2..8c388ac 100644
--- a/apps/hand-factory/pages/easycode/easycode.vue
+++ b/apps/hand-factory/pages/easycode/easycode.vue
@@ -564,7 +564,7 @@
// uni.hideLoading();
},
- async handleShipSubmit() {
+ async handleShipSubmit() {
try {
// 判断钢卷的质量状态,必须是A+, A,A-, B+其中之一
if (!['A+', 'A', 'A-', 'B+', 'B', 'B-'].includes(this.coilDetail.qualityStatus)
diff --git a/apps/hand-factory/pages/search/search.vue b/apps/hand-factory/pages/search/search.vue
new file mode 100644
index 0000000..a1b787e
--- /dev/null
+++ b/apps/hand-factory/pages/search/search.vue
@@ -0,0 +1,756 @@
+
+
+
+
+
+ 设置条件查询钢卷
+
+
+
+
+ 入场钢卷号
+
+
+
+
+ 当前钢卷号
+
+
+
+
+
+ 班组
+
+
+
+
+
+ 逻辑库区
+
+
+
+
+
+
+
+
+
+ 品名
+
+
+
+
+ 规格
+
+
+
+
+ 材质
+
+
+
+
+ 厂家
+
+
+
+
+
+ 毛重 (吨)
+
+
+
+
+
+ 净重 (吨)
+
+
+
+
+
+ 长度 (米)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无符合条件的钢卷数据
+
+
+
+
+
+
+
+
+
+
+
+
+ 入场钢卷号
+ {{ coilDetail.enterCoilNo || '-' }}
+
+
+ 当前钢卷号
+ {{ coilDetail.currentCoilNo || '-' }}
+
+
+ 供应商卷号
+ {{ coilDetail.supplierCoilNo || '-' }}
+
+
+ 状态
+ {{ getStatusText(coilDetail.status) }}
+
+
+ 毛重 (吨)
+ {{ coilDetail.grossWeight || '-' }}
+
+
+ 净重 (吨)
+ {{ coilDetail.netWeight || '-' }}
+
+
+ 逻辑库区
+ {{ coilDetail.warehouseName || '-' }}
+
+
+ 真实库区
+ {{ coilDetail.actualWarehouseName || '-' }}
+
+
+ 班组
+ {{ coilDetail.team || '-' }}
+
+
+ 物料类型
+ {{ coilDetail.materialType || '-' }}
+
+
+ 品名
+ {{ coilDetail.itemName || '-' }}
+
+
+ 规格
+ {{ coilDetail.specification || '-' }}
+
+
+ 材质
+ {{ coilDetail.material || '-' }}
+
+
+ 厂家
+ {{ coilDetail.manufacturer || '-' }}
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+ 重新查找
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/hand-factory/static/images/tabbar/search.png b/apps/hand-factory/static/images/tabbar/search.png
new file mode 100644
index 0000000..1047b86
Binary files /dev/null and b/apps/hand-factory/static/images/tabbar/search.png differ
diff --git a/apps/hand-factory/static/images/tabbar/search_.png b/apps/hand-factory/static/images/tabbar/search_.png
new file mode 100644
index 0000000..a376714
Binary files /dev/null and b/apps/hand-factory/static/images/tabbar/search_.png differ
diff --git a/apps/hand-factory/utils/update.js b/apps/hand-factory/utils/update.js
index 5307b91..d3ffc95 100644
--- a/apps/hand-factory/utils/update.js
+++ b/apps/hand-factory/utils/update.js
@@ -73,7 +73,7 @@ function checkStorageSpace() {
function checkUpdate(forceCheck = false) {
// 1. 准备本地版本信息
const localVersion = plus.runtime.version; // 基座版本
- const staticVersion = '1.3.21'; // 静态默认版本
+ const staticVersion = '1.3.22'; // 静态默认版本
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 eeab412..de3dc4d 100644
--- a/apps/hand-factory/version.json
+++ b/apps/hand-factory/version.json
@@ -1,5 +1,5 @@
{
- "version": "klp 1.3.21",
+ "version": "klp 1.3.22",
"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