From d6b5426ec33378fbe991beb7cec089fe7e8b2659 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 22 九月 2022 09:33:35 +0800
Subject: [PATCH] #可回退版本

---
 pages/basics/pakStore.vue |   62 ++++++++++++++++++++-----------
 1 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/pages/basics/pakStore.vue b/pages/basics/pakStore.vue
index a9d1695..6fade10 100644
--- a/pages/basics/pakStore.vue
+++ b/pages/basics/pakStore.vue
@@ -16,37 +16,34 @@
 				</view>
 			</view>
 		</view>
-		<!-- <view class="square-2">
-			<view class="square-title">
-				<view class="title-sign"><view class="sign"></view></view>
-				<view class="title-text"><text>搴撲綅鍙风爜</text></view>
-			</view>
-			<view class="square-content">
-				<view class="content-input">
-					<input type="text" v-model="locNo" placeholder="鎵爜 / 杈撳叆" @input="searchLocNo" placeholder-style="line-height:  85rpx;">
-					<uni-icons type="closeempty" size="20" color="#dadada" @click="removeLocNo"></uni-icons>
-				</view>
-			</view>
-		</view> -->
 		<view class="square-2">
 			<view class="square-title">
 				<view class="title-sign"><view class="sign"></view></view>
 				<view class="title-text"><text>鍏ュ簱鍙�</text></view>
-				
 			</view>
 				<view class="content-combox">
 					<uni-combox  emptyTips="鏆傛棤鏁版嵁" 
-						:candidates="sites" v-model="siteId"  @click="staNoSelect()" placeholder="璇烽�夋嫨鍑哄簱绔欑偣">
+						:candidates="sites" v-model="siteId"  @click="getInBound()" placeholder="璇烽�夋嫨鍏ュ簱绔欑偣">
 					</uni-combox>
 				</view>
 		</view>
-		
+		<view class="square-2">
+			<view class="square-title">
+				<view class="title-sign"><view class="sign"></view></view>
+				<view class="title-text"><text>妗剁被鍨�</text></view>
+			</view>
+			<view class="content-combox">
+				<uni-combox  emptyTips="鏆傛棤鏁版嵁" 
+					:candidates="bucket" v-model="bucketId"  placeholder="璇烽�夋嫨妗剁被鍨�">
+				</uni-combox>
+			</view>
+		</view>
+
 		<view class="square-1">
 			<view class="square-title">
 				<view class="title-sign"><view class="sign"></view></view>
 				<view class="title-text"><text>鍟嗗搧鍒楄〃</text></view>
 			</view>
-			
 		</view>
 		
 		<view class="square-none" v-show="matList.length === 0">
@@ -62,12 +59,12 @@
 				<view><text style="width: 400rpx;">鍝佸悕锛歿{item.maktx}}</text></view>
 				<view><text style="width: 400rpx;">鎵瑰彿锛歿{item.batch}}</text></view>
 				<view>
-					<text style="width: 400rpx;">鏁伴噺锛歿{item.anfme}}</text>
+					<text style="width: 400rpx;">閲嶉噺锛歿{item.anfme}}kg</text>
 				</view>
 			</view>
 			<view class="data-list-right">
 				<label><uni-icons type="compose" size="20" color="#a5a5a5" @click="revise(item,index)"></uni-icons></label>
-				<label><uni-icons type="trash" size="25" color="#a5a5a5" @click="remove(item,index)"></uni-icons></label>
+				<label><uni-icons type="trash" size="25" color="#a5a5a5" @click="removeMat(item,index)"></uni-icons></label>
 			</view>
 		</view>
         <!-- 搴曢儴鎸夐挳 -->
@@ -112,7 +109,9 @@
                 matList: [],
                 sites: [],
                 siteId: '',
-				count:0
+				count:0,
+				bucket:['娌规《','鍑�妗�'],
+				bucketId:'',
             }
         },
         mounted(){
@@ -133,6 +132,10 @@
 			// 娓呯┖input
 			remove(e) {
 				this[e] = ''
+			},
+			// 绉婚櫎鐗╂枡
+			removeMat(item,index) {
+				this.matList.splice(index,1)
 			},
 			// 鎼滅储鐗╂枡
 			findMat() {
@@ -175,7 +178,6 @@
 						} else {
 							uni.showToast({title: res.msg, icon: "none",position: 'top'})
 						}
-						
 					}
 				});
 			},
@@ -249,13 +251,28 @@
 					return;
                 } 
 				if (that.siteId == '') {
-				    uni.showToast({title: "璇烽�夋嫨鍑哄簱鍙�", icon: "none",position: 'top'})
+				    uni.showToast({title: "璇烽�夋嫨鍏ュ簱鍙�", icon: "none",position: 'top'})
 				    return;
+				}
+				let buchid=0;
+				if (that.bucketId == '') {
+				    uni.showToast({title: "璇烽�夋嫨妗剁被鍨�", icon: "none",position: 'top'})
+				    return;
+				}else{
+					if(that.bucketId == '娌规《'){
+						buchid=1;
+					}else if(that.bucketId == '鍑�妗�'){
+						buchid=2;
+					}else{
+						uni.showToast({title: "璇烽�夋嫨姝g‘妗剁被鍨�", icon: "none",position: 'top'})
+						return;
+					}
 				}
                 var list = [];
                 let param = {
                     devpNo: that.siteId,
-                    list: that.matList
+                    list: that.matList,
+					bucket:buchid
                 }
                 uni.request({
                     url: that.commonUrl + "/full/store/put/start",
@@ -278,6 +295,7 @@
                 this.matnr = '';
                 this.siteId = '';
 				this.matList = [];
+				this.bucketId='';
             },
 			// 淇敼鏁伴噺
 			revise(item,index) {

--
Gitblit v1.9.1