From fd5b9d30f69434fb2ca1ac4e38a5a811083ae108 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 23 Jun 2025 13:26:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93=E7=BB=84?=
 =?UTF-8?q?=E7=9B=98=E3=80=81=E5=85=A5=E5=BA=93=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                |   8 ++
 pages/home/home.vue       |   1 +
 pages/task/rkqr.vue       | 118 +++---------------------------
 pages/task/rkzp.vue       | 150 ++++++++++++++++++++++++++++++++++++++
 static/image/menu/RF7.png | Bin 0 -> 3101 bytes
 5 files changed, 168 insertions(+), 109 deletions(-)
 create mode 100644 pages/task/rkzp.vue
 create mode 100644 static/image/menu/RF7.png

diff --git a/pages.json b/pages.json
index 79e8c09..23afa3f 100644
--- a/pages.json
+++ b/pages.json
@@ -72,6 +72,14 @@
             }
             
         }
+        ,{
+            "path" : "pages/task/rkzp",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 968238d..38fd158 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -32,6 +32,7 @@
 			return {
 				userName: '',
 				menuList: [
+					{title: '入库组盘', icon: 'RF7', path: '/pages/task/rkzp'},
 					{title: '入库确认', icon: 'RF1', path: '/pages/task/rkqr'},
 					{title: '出库确认', icon: 'RF2', path: '/pages/task/ckqr'},
 					{title: '盘点确认', icon: 'RF3', path: '/pages/task/pdqr'},
diff --git a/pages/task/rkqr.vue b/pages/task/rkqr.vue
index 41e9e01..7b6043f 100644
--- a/pages/task/rkqr.vue
+++ b/pages/task/rkqr.vue
@@ -2,14 +2,7 @@
 	<view class="zd_container">
 		<nav-bar :title="title"></nav-bar>
 		<!-- 入库确认 -->
-		<view class="zd_content" style="padding-bottom: 20rpx">
-			<view class="zd_wrapper">
-				<search-box
-				placeholder="请扫码"
-				v-model="code"
-				@handleChange="handleChange"
-				/>
-			</view>
+		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
 					<view class="zd-col-6">
@@ -22,46 +15,6 @@
 						/>
 					</view>
 				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-6">
-						<span class="filter_label">物料编码</span>
-					</view>
-					<view class="zd-col-18 filter_select">
-						<input type="text" class="filter_input" v-model="initData.material_code" disabled>
-					</view>
-				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-6">
-						<span class="filter_label">批次</span>
-					</view>
-					<view class="zd-col-18 filter_select">
-						<input type="text" class="filter_input" v-model="initData.pcsn" disabled>
-					</view>
-				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-6">
-						<span class="filter_label">数量</span>
-					</view>
-					<view class="zd-col-18 filter_select">
-						<input type="text" class="filter_input" v-model="initData.qty" disabled>
-					</view>
-				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-6">
-						<span class="filter_label">单位</span>
-					</view>
-					<view class="zd-col-18 filter_select">
-						<input type="text" class="filter_input" v-model="initData.qty_unit_name" disabled>
-					</view>
-				</view>
-				<view class="zd-row jccenter mgt10">
-					<view class="mgt10">
-						<button type="default" size="mini" style="margin-right: 10px" @tap="clearUp1">清空</button>
-						<button type="primary" size="mini" :disabled="disabled1" @tap="_groupPlate">组盘确认</button>
-					</view>
-				</view>
-			</view>
-			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
 					<view class="zd-col-6">
 						<span class="filter_label">点位编码</span>
@@ -78,12 +31,6 @@
 						<uni-data-select v-model="sectId" :localdata="options"></uni-data-select>
 					</view>
 				</view>
-				<view class="zd-row jccenter mgt10">
-					<view class="mgt10">
-						<button type="default" size="mini" style="margin-right: 10px" @tap="clearUp2">清空</button>
-						<button type="primary" size="mini" :disabled="disabled2" @tap="_confirmIn">入库确认</button>
-					</view>
-				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
@@ -112,13 +59,17 @@
 				</view>
 			</view>
 		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="clearUp2">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !vcode || !pointCode || !sectId}" :disabled="disabled2" @tap="_confirmIn">入库确认</button>
+		</view>
 	</view>
 </template>
 
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {sweepCode, getPlateDtl, getSect, groupPlate, confirmIn, deleteDtl} from '@/utils/getData.js'
+	import {getPlateDtl, getSect, confirmIn, deleteDtl} from '@/utils/getData.js'
 	export default {
 		components: {
 			NavBar,
@@ -127,9 +78,7 @@
 		data() {
 			return {
 				title: '',
-				code: '',
 				vcode: '',
-				initData: {},
 				dataList: [],
 				pointCode: '',
 				sectId: '',
@@ -145,32 +94,11 @@
 			this._getSect()
 		},
 		methods: {
-			handleChange (e) {
-				if (e) {
-					this._sweepCode(e)
-				}
-			},
 			handleChange1 (e) {
 				if (e) {
 					this._getPlateDtl(e)
 				}
 			},
-			async _sweepCode (e) {
-				try {
-					let res = await sweepCode(e)
-					if (res && res.data) {
-						this.initData = res.data
-						this.vcode = res.data.storagevehicle_code
-						if (this.vcode) {
-							this._getPlateDtl(this.vcode)
-						}
-					} else {
-						this.initData = {}
-					}
-				} catch (e) {
-					this.initData = {}
-				}
-			},
 			async _getPlateDtl (e) {
 				try {
 					let res = await getPlateDtl(e)
@@ -183,40 +111,13 @@
 					this.dataList = []
 				}
 			},
-			clearUp1 () {
-				this.code = ''
-				this.vcode = ''
-				this.initData = {}
-				this.dataList = []
-				this.id = ''
-				this.disabled = false
-			},
 			clearUp2 () {
+				this.vcode = ''
 				this.pointCode = ''
 				this.sectId = ''
 				this.disabled = false
-			},
-			// 组盘确认
-			async _groupPlate () {
-				this.disabled1 = true
-				if (!this.vcode || JSON.stringify(this.initData) === '{}') {
-					this.disabled1 = false
-					return
-				}
-				try {
-					const obj = Object.assign({}, this.initData, {storagevehicle_code: this.vcode})
-					let res = await groupPlate(obj)
-					this.disabled1 = false
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-					this.code = ''
-					this.initData = {}
-					this._getPlateDtl(this.vcode)
-				} catch (e) {
-					this.disabled1 = false
-				}
+				this.dataList = []
+				
 			},
 			async _getSect () {
 				try {
@@ -246,7 +147,6 @@
 						title: res.message,
 						icon: 'none'
 					})
-					this.clearUp1()
 					this.clearUp2()
 				} catch (e) {
 					this.disabled2 = false
diff --git a/pages/task/rkzp.vue b/pages/task/rkzp.vue
new file mode 100644
index 0000000..53655cf
--- /dev/null
+++ b/pages/task/rkzp.vue
@@ -0,0 +1,150 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :title="title"></nav-bar>
+		<!-- 入库组盘 -->
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<search-box
+				placeholder="请扫码"
+				v-model="code"
+				@handleChange="handleChange"
+				/>
+			</view>
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">载具码</span>
+					</view>
+					<view class="zd-col-18 filter_select">
+						<search-box
+						v-model="vcode"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-6">
+						<span class="filter_label">物料编码</span>
+					</view>
+					<view class="zd-col-18 filter_select">
+						<input type="text" class="filter_input" v-model="initData.material_code" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-6">
+						<span class="filter_label">物料名称</span>
+					</view>
+					<view class="zd-col-18 filter_select">
+						<input type="text" class="filter_input" v-model="initData.material_name" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-6">
+						<span class="filter_label">物料规格</span>
+					</view>
+					<view class="zd-col-18 filter_select">
+						<input type="text" class="filter_input" v-model="initData.material_spec" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-6">
+						<span class="filter_label">批次</span>
+					</view>
+					<view class="zd-col-18 filter_select">
+						<input type="text" class="filter_input" v-model="initData.pcsn" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-6">
+						<span class="filter_label">数量</span>
+					</view>
+					<view class="zd-col-18 filter_select">
+						<input type="text" class="filter_input" v-model="initData.qty" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-6">
+						<span class="filter_label">单位</span>
+					</view>
+					<view class="zd-col-18 filter_select">
+						<input type="text" class="filter_input" v-model="initData.qty_unit_name" disabled>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="clearUp1">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !vcode || JSON.stringify(initData) === '{}'}" :disabled="disabled1" @tap="_groupPlate">组盘确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {sweepCode, groupPlate} from '@/utils/getData.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				code: '',
+				vcode: '',
+				initData: {},
+				disabled1: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			handleChange (e) {
+				if (e) {
+					this._sweepCode(e)
+				}
+			},
+			async _sweepCode (e) {
+				try {
+					let res = await sweepCode(e)
+					if (res && res.data) {
+						this.initData = res.data
+						this.vcode = res.data.storagevehicle_code
+					} else {
+						this.initData = {}
+					}
+				} catch (e) {
+					this.initData = {}
+				}
+			},
+			clearUp1 () {
+				this.code = ''
+				this.vcode = ''
+				this.initData = {}
+				this.disabled1 = false
+			},
+			// 组盘确认
+			async _groupPlate () {
+				this.disabled1 = true
+				if (!this.vcode || JSON.stringify(this.initData) === '{}') {
+					this.disabled1 = false
+					return
+				}
+				try {
+					const obj = Object.assign({}, this.initData, {storagevehicle_code: this.vcode})
+					let res = await groupPlate(obj)
+					this.disabled1 = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.code = ''
+					this.initData = {}
+				} catch (e) {
+					this.disabled1 = false
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/static/image/menu/RF7.png b/static/image/menu/RF7.png
new file mode 100644
index 0000000000000000000000000000000000000000..18a06e7db227e563c0739b88f0fc96e0ffd541bd
GIT binary patch
literal 3101
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

literal 0
HcmV?d00001