From f0cf644d5f83c979ed4fd497154c8a31f2819895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
 <8702040+cai-ling@user.noreply.gitee.com>
Date: Wed, 13 Nov 2024 16:14:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=A3=E9=80=89=E4=BD=9C=E4=B8=9A=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/home.vue      |   5 +-
 pages/pick/pick-task.vue | 144 ++++++++++++++++++---------------------
 utils/getData2.js        |   5 ++
 3 files changed, 76 insertions(+), 78 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index b72e901..0463c9e 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -43,7 +43,7 @@
 				menuList: [
 					{title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘入库', path: '/pages/entry/mater-group-to-store'}, {title: '组盘入库', path: '/pages/entry/group-to-store'}, {title: '空托盘入库', path: '/pages/entry/empty-tray-to-store'}]},
 					{title: '出库管理', path: 'RF02', sonTree: [{title: '托盘出库', path: '/pages/outbound/tray-out-store'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}]},
-					{title: '在库管理', path: 'RF03', sonTree: [{title: '库存信息', path: '/pages/in/store-info'}]},
+					{title: '在库管理', path: 'RF03', sonTree: [{title: '库存信息', active: false, path: '/pages/in/store-info'}]},
 					{title: '拣选管理', path: 'RF04', sonTree: [{title: '拣选作业', path: '/pages/pick/pick-task'}]},
 					{title: '盘点管理', path: 'RF05', sonTree: [{title: '盘点作业', path: '/pages/check/check-task'}]},
 					{title: '任务管理', path: 'RF06', sonTree: [{title: '任务管理', path: '/pages/task/task-manage'}]},
@@ -72,6 +72,9 @@
 			},
 			toPage2 (e) {
 				let url = e.path + '?title=' + e.title
+				if (e.active === false) {
+					return
+				}
 				uni.redirectTo({
 					url: url
 				})	
diff --git a/pages/pick/pick-task.vue b/pages/pick/pick-task.vue
index 4090994..19520ee 100644
--- a/pages/pick/pick-task.vue
+++ b/pages/pick/pick-task.vue
@@ -5,114 +5,90 @@
 		<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-24">
-						<input type="text" class="filter_input" @click="toJump" v-model="data.code">
-					</view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
+					<view class="zd-col-8">
 						<span class="filter_label">料箱编码</span>
 					</view>
-					<view class="zd-col-24">
-						<input type="text" class="filter_input" v-model="data.vehicle_code">
+					<view class="zd-col-16">
+						<search-box
+						v-model="val1"
+						@handleChange="handleChange"
+						/>
 					</view>
 				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8">
+						<span class="filter_label">拣选单据</span>
+					</view>
+					<view class="zd-col-16">
+						<input type="text" class="filter_input" v-model="data.code" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8">
 						<span class="filter_label">车间</span>
 					</view>
-					<view class="zd-col-24">
-						<input type="text" class="filter_input" v-model="data.product_area">
+					<view class="zd-col-16">
+						<input type="text" class="filter_input" v-model="data.product_area" disabled>
 					</view>
 				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8">
 						<span class="filter_label">拣选仓库</span>
 					</view>
-					<view class="zd-col-24">
-						<input type="text" class="filter_input" v-model="data.stor_code">
+					<view class="zd-col-16">
+						<input type="text" class="filter_input" v-model="data.stor_code" disabled>
 					</view>
 				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8">
 						<span class="filter_label">拣选站台</span>
 					</view>
-					<view class="zd-col-24">
-						<input type="text" class="filter_input" v-model="data.point_code">
+					<view class="zd-col-16">
+						<input type="text" class="filter_input" v-model="data.point_code" disabled>
 					</view>
 				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
-						<span class="filter_label">物料名称</span>
-					</view>
-					<view class="zd-col-24">
-						<input type="text" class="filter_input" v-model="data.material_name">
-					</view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
-						<span class="filter_label">物料数量</span>
-					</view>
-					<view class="zd-col-24">
-						<input type="text" class="filter_input" v-model="data.qty">
-					</view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8">
 						<span class="filter_label">拣选数量</span>
 					</view>
-					<view class="zd-col-24">
-						<input type="text" class="filter_input" v-model="data.assign_qty">
+					<view class="zd-col-16">
+						<input type="number" class="filter_input" v-model="data.qty" disabled>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
+					<view class="zd-col-8">
 						<span class="filter_label">移出料箱</span>
 					</view>
-					<view class="zd-col-24">
-						<input type="text" class="filter_input" v-model="data.out_pick_vehicle">
+					<view class="zd-col-16">
+						<search-box
+						v-model="val2"
+						/>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
-						<span class="filter_label">移出数量</span>
+					<view class="zd-col-8">
+						<span class="filter_label">是否机械搬运</span>
 					</view>
-					<view class="zd-col-24">
-						<input type="text" class="filter_input" v-model="data.out_qty">
+					<view class="relative zd-col-16">
+						<switch :checked="isChecked" color="#4e6ef2" style="transform:scale(0.8)"/>
+						<text @tap="setWStatus" style="position: absolute;display: inline-block;width: 52px; height: 32px;left: 0;"></text>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
-						<span class="filter_label">是否人工搬运</span>
-					</view>
-					<view class="zd-col-24">
-						<input type="text" class="filter_input" v-model="data.is_move">
-					</view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
+					<view class="zd-col-8">
 						<span class="filter_label">移入料箱</span>
 					</view>
-					<view class="zd-col-24">
-						<input type="text" class="filter_input" v-model="data.in_pick_vehicle">
-					</view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
-						<span class="filter_label">移入数量</span>
-					</view>
-					<view class="zd-col-24">
-						<input type="text" class="filter_input" v-model="data.in_qty">
+					<view class="zd-col-16">
+						<search-box
+						v-model="val3"
+						/>
 					</view>
 				</view>
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-15 button-primary" :class="{'button-info': JSON.stringify(data) === '{}'}" :disabled="disabled" @tap="_savePickTask">拣选确认</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !val1|| !val2 || !val3}" :disabled="disabled" @tap="_savePickTask">拣选确认</button>
 		</view>
 	</view>
 </template>
@@ -120,7 +96,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {savePickTask} from '@/utils/getData2.js'
+	import {queryPick, savePickTask} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -128,6 +104,10 @@
 		},
 		data() {
 			return {
+				val1: '',
+				val2: '',
+				val3: '',
+				isChecked: true,
 				data: {},
 				disabled: false
 			};
@@ -141,23 +121,33 @@
 			}
 		},
 		methods: {
-			toJump () {
-				uni.navigateTo({
-					url: '/pages/pick/pick-list?title=拣选单列表'
-				})
+			handleChange (e) {
+				this._queryPick(e)
+			},
+			async _queryPick (e) {
+				let res = await queryPick('Picking', e)
+				this.data = res
+			},
+			setWStatus () {
+				this.isChecked = !this.isChecked
 			},
 			clearUp () {
 				this.data = {}
+				this.val1 = ''
+				this.val2 = ''
+				this.val3 = ''
+				this.isChecked = true
 				this.disabled = false
 			},
 			async _savePickTask () {
 				this.disabled = true
-				if (JSON.stringify(this.data) === '{}') {
+				if (!this.val1|| !this.val2 || !this.val3) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await savePickTask(this.data)
+					let obj = Object.assign({}, this.data, {is_move: this.isChecked, pick_vehicle_23: this.val2, pick_vehicle_13: this.val3})
+					let res = await savePickTask(obj)
 					if (res.code === '200') {
 						uni.showToast({
 							title: res.msg,
diff --git a/utils/getData2.js b/utils/getData2.js
index 2e16ea4..243dc09 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -101,6 +101,11 @@ export const pmFormData2 = (page, size, form_type, status, code) => request({
 	method: 'GET',
 	url:'api/pmFormData?page=' + page + '&size=' + size + '&form_type=' + form_type + '&status=' + status + '&vehicle_code=' + code
 })
+// 扫载具查看拣选单信息
+export const queryPick = (type, code) => request({
+	url:'api/pda/pick/queryPick',
+	data: {form_type: type, vehicle_code: code}
+})
 export const savePickTask = (data) => request({
 	url:'api/pda/pick/savePickTask',
 	data: data