From 1378696a78903c5a31cddebb8951cab3eff12198 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 22 May 2025 16:03:37 +0800
Subject: [PATCH] change and add two pages

---
 pages.json                 |  16 ++++++
 pages/home/home.vue        |  16 +++---
 pages/manage/hnby.vue      |  14 +++--
 pages/manage/hnlgbd.vue    | 103 +++++++++++++++++++++++++++++++++++++
 pages/manage/hnlgcx.vue    |  86 +++++++++++++++++++++++++++++++
 pages/manage/smck.vue      |  44 +++++++++++-----
 static/image/menu/RF10.png | Bin 0 -> 1887 bytes
 static/image/menu/RF11.png | Bin 0 -> 2097 bytes
 utils/getData2.js          |  31 +++++++++--
 9 files changed, 281 insertions(+), 29 deletions(-)
 create mode 100644 pages/manage/hnlgbd.vue
 create mode 100644 pages/manage/hnlgcx.vue
 create mode 100644 static/image/menu/RF10.png
 create mode 100644 static/image/menu/RF11.png

diff --git a/pages.json b/pages.json
index d9346fb..59a7586 100644
--- a/pages.json
+++ b/pages.json
@@ -72,6 +72,22 @@
             }
             
         }
+        ,{
+            "path" : "pages/manage/hnlgbd",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/hnlgcx",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index bb80cab..c7679ec 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -15,7 +15,7 @@
 			<view class="zd_home_wrapper">
 				<view class="menus_wrap">
 					<view class="fir_menu_wrap">
-						<view class="fir_menu-item" v-for="e in menuList" :key="e.id" @tap="toPage(e)">
+						<view class="fir_menu-item" v-for="(e, i) in menuList" :key="i" @tap="toPage(e)">
 							<image class="menu-img" :src="require('../../static/image/menu/' + e.icon + '.png')" alt="">
 							<view class="menu-name">{{e.title}}</view>
 						</view>
@@ -32,12 +32,14 @@
 			return {
 				userName: '',
 				menuList: [
-					{id: 5, title: '任务管理', icon: 'RF05', path: '/pages/manage/task-manage'},
-					{id: 6, title: '指令管理', icon: 'RF06', path: '/pages/manage/inst-manage'},
-					{id: 4, title: '混碾搬运', icon: 'RF01', path: '/pages/manage/hnby'},
-					{id: 3, title: '扫码出库', icon: 'RF07', path: '/pages/manage/smck'},
-					{id: 7, title: '压制满料搬运', icon: 'RF02', path: '/pages/manage/yzmlby'},
-					{id: 8, title: '半成品解绑', icon: 'RF08', path: '/pages/manage/bcpjb'}
+					{title: '任务管理', icon: 'RF06', path: '/pages/manage/task-manage'},
+					{title: '指令管理', icon: 'RF05', path: '/pages/manage/inst-manage'},
+					{title: '混碾搬运', icon: 'RF01', path: '/pages/manage/hnby'},
+					{title: '扫码出入库', icon: 'RF11', path: '/pages/manage/smck'},
+					{title: '压制满料搬运', icon: 'RF02', path: '/pages/manage/yzmlby'},
+					{title: '半成品解绑', icon: 'RF08', path: '/pages/manage/bcpjb'},
+					{title: '混碾料罐绑定', icon: 'RF10', path: '/pages/manage/hnlgbd'},
+					{title: '料罐物料查询', icon: 'RF09', path: '/pages/manage/hnlgcx'}
 				],
 				show: false,
 				secM: []
diff --git a/pages/manage/hnby.vue b/pages/manage/hnby.vue
index 56e9af3..6696272 100644
--- a/pages/manage/hnby.vue
+++ b/pages/manage/hnby.vue
@@ -21,27 +21,31 @@
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
-						<span class="filter_label">重量</span>
+						<span class="filter_label">条码</span>
 					</view>
 					<view class="zd-col-17 filter_select">
-						<input type="number" class="filter_input" v-model="val1">
+						<search-box
+						v-model="val1"
+						/>
 					</view>
 				</view>
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap.stop="clearUp">清空</button>
-			<button class="zd-col-15 button-primary" :class="{'button-info': !index1 || !index2}" :disabled="disabled1" @tap="_pdaHnby">混碾搬运</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !index1 || !index2 || !val1}" :disabled="disabled1" @tap="_pdaHnby">混碾搬运</button>
 		</view>
 	</view>
 </template>
 
 <script>
 	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
 	import {pdaHnby} from '@/utils/getData2.js'
 	export default {
 		components: {
-			NavBar
+			NavBar,
+			SearchBox
 		},
 		data() {
 			return {
@@ -76,7 +80,7 @@
 			},
 			async _pdaHnby () {
 				this.disabled1 = true
-				if (!this.index1 || !this.index2) {
+				if (!this.index1 || !this.index2 || !this.val1) {
 					this.disabled1 = false
 					return
 				}
diff --git a/pages/manage/hnlgbd.vue b/pages/manage/hnlgbd.vue
new file mode 100644
index 0000000..5031ed2
--- /dev/null
+++ b/pages/manage/hnlgbd.vue
@@ -0,0 +1,103 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">设备</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<zxz-uni-data-select v-model="index1" filterable :localdata="options1"></zxz-uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">条码</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">重量</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<input type="number" class="filter_input" v-model="val2">
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap.stop="clearUp">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !index1 || !val1 || !val2}" :disabled="disabled1" @tap="_hnlgbd">混碾料罐绑定</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {hnlgbd} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options1: this.generateArray('HNJ', '混碾机', 8),
+				index1: '',
+				val1: null,
+				val2: null,
+				disabled1: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			generateArray(prefix, name, num) {
+				const array = []
+				for (let i = 1; i <= num; i++) {
+					array.push({
+						value: `${prefix}${String(i).padStart(2, '0')}`,
+						text: `${name}${String(i).padStart(2, '0')}`
+					})
+				}
+				return array
+			},
+			clearUp () {
+				this.index1 = ''
+				this.val1 = null
+				this.val2 = null
+				this.disabled1 = false
+			},
+			async _hnlgbd () {
+				this.disabled1 = true
+				if (!this.index1 || !this.val1 || !this.val2) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await hnlgbd(this.index1, this.val1, this.val2)
+					this.disabled1 = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+@import '../../common/style/mixin.styl';
+</style>
diff --git a/pages/manage/hnlgcx.vue b/pages/manage/hnlgcx.vue
new file mode 100644
index 0000000..79492cb
--- /dev/null
+++ b/pages/manage/hnlgcx.vue
@@ -0,0 +1,86 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">料罐条码</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<search-box
+						v-model="val1"
+						@handleChange="handleChange"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">物料编码</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<view class="filter_input" style="color: #E9B451; font-weight: 700;">{{code}}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap.stop="clearUp">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_hnlgcx(val1)">查询</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {hnlgcx} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				code: null,
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			clearUp () {
+				this.val1 = null
+				this.code = null
+				this.disabled = false
+			},
+			handleChange (e) {
+				if (e) {
+					this._hnlgcx(e)
+				}
+			},
+			async _hnlgcx (e) {
+				this.disabled = true
+				try {
+					let res = await hnlgcx(e)
+					this.disabled = false
+					if (res) {
+						this.code = res.material_code
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+@import '../../common/style/mixin.styl';
+.msg_wrapper
+	height auto
+	min-height 30%
+</style>
diff --git a/pages/manage/smck.vue b/pages/manage/smck.vue
index e30dc6e..ab28cdc 100644
--- a/pages/manage/smck.vue
+++ b/pages/manage/smck.vue
@@ -4,10 +4,10 @@
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
-					<view class="zd-col-5">
-						<span class="filter_label">扫码出库</span>
+					<view class="zd-col-7">
+						<span class="filter_label">木托盘编码</span>
 					</view>
-					<view class="zd-col-19 filter_select">
+					<view class="zd-col-17 filter_select">
 						<search-box
 						v-model="val1"
 						/>
@@ -16,8 +16,9 @@
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
-			<button class="zd-col-6 button-default" @tap.stop="clearUp">清空</button>
-			<button class="zd-col-15 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_pdaSmck">扫码出库</button>
+			<button class="zd-col-5 button-default" @tap.stop="clearUp">清空</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !val1}" :disabled="disabled1" @tap="toSure1">入库</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !val1}" :disabled="disabled2" @tap="toSure2">出库</button>
 		</view>
 	</view>
 </template>
@@ -35,7 +36,8 @@
 			return {
 				title: '',
 				val1: '',
-				disabled: false
+				disabled1: false,
+				disabled2: false
 			};
 		},
 		onLoad (options) {
@@ -44,20 +46,38 @@
 		methods: {
 			clearUp () {
 				this.val1 = null
-				this.disabled = false
+				this.disabled1 = false
+				this.disabled2 = false
 			},
-			async _pdaSmck () {
-				this.disabled = true
+			toSure1 () {
+				this.disabled1 = true
+				if (!this.val1) {
+					this.disabled1 = false
+					return
+				}
+				this._pdaSmck('1')
+			},
+			toSure2 () {
+				this.disabled2 = true
+				if (!this.val1) {
+					this.disabled2 = false
+					return
+				}
+				this._pdaSmck('2')
+			},
+			async _pdaSmck (type) {
 				try {
-					let res = await pdaSmck(this.val1)
-					this.disabled = false
+					let res = await pdaSmck(this.val1, type)
+					this.disabled1 = false
+					this.disabled2 = false
 					this.val1 = ''
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
 					})
 				} catch (e) {
-					this.disabled = false
+					this.disabled1 = false
+					this.disabled2 = false
 				}
 			}
 		}
diff --git a/static/image/menu/RF10.png b/static/image/menu/RF10.png
new file mode 100644
index 0000000000000000000000000000000000000000..df4e2f4a234a877cb2180ec55ce26e7daa23f6ba
GIT binary patch
literal 1887
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
LC>%T=yfx<^nalG1

literal 0
HcmV?d00001

diff --git a/static/image/menu/RF11.png b/static/image/menu/RF11.png
new file mode 100644
index 0000000000000000000000000000000000000000..1bc47ed7a441d8deaedfa51fffc4d1fe364d72b3
GIT binary patch
literal 2097
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

literal 0
HcmV?d00001

diff --git a/utils/getData2.js b/utils/getData2.js
index 1f3dfdd..f5e2c52 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -24,21 +24,22 @@ export const handLogin = (user, password) => request({
 /**
  * 混碾搬运
  */
-export const pdaHnby = (sp, ep, weight) => request({
+export const pdaHnby = (sp, ep, code) => request({
 	url:'api/pda/hnby',
 	data: {
 		startPoint: sp,
 		endPoint: ep,
-		weight: weight
+		barCode: code
 	}
 })
 /**
- * 扫码出库
+ * 扫码出入库
  */
-export const pdaSmck = (code) => request({
+export const pdaSmck = (code, type) => request({
 	url:'api/pda/smck',
 	data: {
-		barCode: code
+		barCode: code,
+		type: type 
 	}
 })
 /**
@@ -100,3 +101,23 @@ export const handInst = (type, id) => request({
 		inst_uuid: id
 	}
 })
+/**
+ * 混碾料罐绑定
+ */
+export const hnlgbd = (code, vcode, weight) => request({
+	url:'api/pda/hnlgbd',
+	data: {
+		deviceCode: code,
+		barCode: vcode,
+		weight: weight
+	}
+})
+/**
+ * 料罐物料查询
+ */
+export const hnlgcx = (vcode) => request({
+	url:'api/pda/hnlgcx',
+	data: {
+		barCode: vcode
+	}
+})
\ No newline at end of file