From 3bdac82e0066f97307fc6a7177cecdf89a5ba7e1 Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期四, 07 四月 2022 09:23:39 +0800
Subject: [PATCH] #

---
 pages/basics/stockCheck.vue |  195 ++++++++++++++++++++++++++----------------------
 1 files changed, 105 insertions(+), 90 deletions(-)

diff --git a/pages/basics/stockCheck.vue b/pages/basics/stockCheck.vue
index aecbad3..58b8ce5 100644
--- a/pages/basics/stockCheck.vue
+++ b/pages/basics/stockCheck.vue
@@ -6,46 +6,40 @@
 			<button v-model="matBtn" class="cu-btn bg-yellow" @click="toggle('right')"><text>+琛ュ厖</text></button>
 			
 		</view>
-		<!-- <view class="cu-form-group margin-top">
-			<view>
-				鍑哄簱鍙�
-			</view>
-			<view class="uni-list-cell-db">
-				<picker @change="bindPickerChange" :value="index" :range="array" range-key="name">
-					<view class="uni-input">{{array[index]}}</view>
-				</picker>
-			</view>
-			<view>
-				<button v-model="matBtn" class="cu-btn bg-yellow" @click="toggle('right')"><text>+琛ュ厖</text></button>
-			</view>
-		</view> -->
 		<view class="margin-top">
 			<uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁">
 				<uni-tr>
-					<uni-th width="50">鏁伴噺</uni-th>
-					<uni-th width="100">浜у搧ID</uni-th>
-					<uni-th width="100">浜у搧鍚嶇О</uni-th>
-					<uni-th width="100">搴撲綅</uni-th>
-					<uni-th width="100">纭鏁伴噺</uni-th>
+					<uni-th align="center" width="80">鏁伴噺</uni-th>
+					<uni-th align="center" width="100">浜у搧缂栫爜</uni-th>
+					<uni-th align="center" width="100">浜у搧鍚嶇О</uni-th>
+					<uni-th align="center" width="100">浜у搧鎵瑰彿</uni-th>
+					<uni-th align="center" width="100">搴撲綅</uni-th>
+					<uni-th align="center" width="150">纭鏁伴噺</uni-th>
 				</uni-tr>
 				<uni-tr v-for="(item, index) in locDetlData" :key="index">
 					<uni-td>{{item.count}}</uni-td>
 					<uni-td>{{item.matNo}}</uni-td>
 					<uni-td>{{item.matName}}</uni-td>
+					<uni-td>{{item.itemBatch}}</uni-td>
 					<uni-td>{{item.locNo}}</uni-td>
 					<uni-td align="center">
-						<button class="uni-button" size="mini" type="primary" @click="conf(index,item)">淇敼</button>
-						<button class="uni-button" size="mini" type="warn" @click="remove(index,item)">鍒犻櫎</button>
+						<button class ="cu-btn bg-orange margin-xs" @click="conf(index,item)">淇敼</button>
+						<button class ="cu-btn bg-red margin-xs" @click="remove(index,item)">鍒犻櫎</button>
 					</uni-td>
 				</uni-tr>
 			</uni-table>
-			
 		</view>
-		<view>
-			<button class="cu-btn bg-yellow pda-btn" @click="check">纭� 璁�</button>
-			<button class="cu-btn bg-grey pda-btn" @click="reset">閲� 缃�</button>
+		<view style="height: 200rpx;">
+			 <!-- 绌虹櫧灞� -->
+		</view> 
+		<view class="cu-bar foot input" style="height: 130rpx;">
+			<view class="flex solid-bottom padding justify-start" >
+				<button class="cu-btn bg-yellow main-btn margin-xs" style="width: 430rpx;" @click="check">纭� 璁�</button>
+				<button class="cu-btn bg-grey main-btn margin-xs" @click="reset">閲� 缃�</button>
+			</view>
 		</view>
-		<view>
+		
+		<scroll-view>
 			<uni-popup ref="popup" background-color="#fff" style="width: 500rpx;">
 				<view class="popup-content" :class="{ 'popup-height': type === 'left' || type === 'right' }">
 						<view class="cu-form-group margin-top">
@@ -61,7 +55,7 @@
 						</view>
 						<view class="cu-form-group margin-top">
 							<text class="title">瑙勬牸鍨嬪彿</text>
-							<input type="text" name="input" autocomplete="off" v-model="specs">
+							<input type="text" name="input" autocomplete="off" v-model="size">
 						</view>
 						<view class="cu-form-group margin-top">
 							<text class="title">鍗曚綅</text>
@@ -69,13 +63,17 @@
 						</view>
 						<view class="cu-form-group margin-top">
 							<text class="title">鏁伴噺</text>
-							<uni-number-box @change="countDom" v-model="count" />
+							<uni-number-box :min="0" :max="999" @change="countDom" v-model="count" />
 						</view>
-						<button class="cu-btn bg-yellow pda-btn2" @click="confirm">琛ュ厖</button>
-						
+						<view class="flex solid-bottom padding justify-center">
+							<button class="cu-btn bg-yellow pda-btn2" @click="confirm">鎻愬彇</button>
+						</view>
+						<view style="height: 200rpx;">
+							 <!-- 绌虹櫧灞� -->
+						</view>
 				</view>
 			</uni-popup>
-		</view>
+		</scroll-view>
 		<view>
 			<!-- 鎻愮ず淇℃伅寮圭獥 -->
 			<uni-popup ref="message" type="message">
@@ -85,13 +83,19 @@
 		<view>
 			<!-- 杈撳叆妗嗙ず渚� -->
 			<uni-popup ref="inputDialog" type="dialog">
-				<uni-popup-dialog ref="inputClose" mode="input" title="缁勬墭鏁伴噺" 
+				<uni-popup-dialog ref="inputClose" mode="input" title="浜у搧鏁伴噺" 
 					placeholder="璇疯緭鍏ョ粍鎵樻暟閲�" @confirm="dialogInputConfirm">
-						<uni-number-box :min="minCount" :max="maxCount" v-model="value" />
-				</uni-popup-dialog>
-					
+						<uni-number-box :min="0" :max="999" v-model="value" />
+				</uni-popup-dialog>	
 			</uni-popup>
 		</view>
+		<!-- <view>
+			<view class="uni-padding-wrap uni-common-mt">
+				<view class="uni-btn-v">
+					<button type="default" @tap="noTitlemodalTap">鏃犳爣棰樼殑modal</button>
+				</view>
+			</view>
+		</view> -->
 	</view>
 </template>
 
@@ -102,32 +106,30 @@
 				msgType: '',
 				messageText: '',
 				matBtn:'',
-				souceData:[], 
-				locDetlData:[], // 琛ㄦ牸鏁版嵁
+				souceData:[], // 鍒濆鍖栬〃鏍兼暟鎹褰�
+				locDetlData:[],
 				matNo:'',
 				matName:'',
-				specs:'',
+				size:'',
 				unit:'',
-				count:'0',
+				count:0,
 				type: '',
-				msgType:'',
-				messageText:'',
 				baseIP:'',
-				outlet:'',
+				basePORT:'',
 				checkList:[],
 				sourceList:[],
-				minCount:0,
-				maxCount:1,
 				billNo:'',
 				matData:[],
 				rowNum:'',
-				value:'',
+				value:'0',
 			}
 		},
 		mounted(){
 			// 鑾峰彇IP绔彛
 			const UIP = uni.getStorageSync('UIP');
-			this.baseIP = UIP
+			this.baseIP = UIP;
+			const UPORT = uni.getStorageSync('UPORT');
+			this.basePORT = UPORT;
 		},
 		methods: {
 			// 鎻愮ず绐楀彛
@@ -144,9 +146,9 @@
 				}
 				let barCode = that.billNo
 				// 璧嬪�煎墠娓呯┖琛ㄦ牸
-				that.locDetlData = [] // 鍒濆鍖栬〃鏍兼暟鎹�
+				that.locDetlData = []
 				uni.request({
-					url: that.baseHttp + that.baseIP + that.baseUrl + "/mobile/check/queryMatFromBarCode?barCode=" + barCode,
+					url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + "/mobile/check/queryMatFromBarCode?barCode=" + barCode,
 					header: {
 						'content-type':'application/x-www-form-urlencoded',
 						'token':uni.getStorageSync('token')
@@ -156,7 +158,6 @@
 					},
 					method:'GET',
 					success(res) {
-						console.log(res)
 						if (res.data.code === 200) {
 							that.locDetlData = res.data.data
 							if (res.data.data && res.data.data.length > 0) {
@@ -197,7 +198,7 @@
 					return;
 				}
 				uni.request({
-					url: that.baseHttp + that.baseIP + that.baseUrl + "/matCode/auth",
+					url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + "/matCode/auth",
 					header: {
 						'content-type':'application/x-www-form-urlencoded',
 						'token':uni.getStorageSync('token')
@@ -208,11 +209,10 @@
 					method: 'POST',
 					success(res){
 						let data = res.data.data
-							
 						if(res.data.code === 200){
 							if(data != null){
 								that.matName = data.matName
-								that.specs = data.specs
+								that.size = data.size
 								that.unit = data.unit
 							}
 						} else if (res.data.code ===403 ){
@@ -238,17 +238,18 @@
 				
 			},
 			// 淇敼鏁伴噺
-			conf(){
+			conf(index,item){
 				this.$refs.inputDialog.open()
-				this.maxCount = item.count
 				this.rowNum = index
-				this.value = this.maxCount
+				if (item.count === undefined ) {
+					this.value = 0
+				}
 			},
 			// 淇敼鏁伴噺寮圭獥
-			dialogInputConfirm() {
-				this.locDetlData[this.rowNum].count = this.value
-				this.messageToggle('success')
-				this.messageText = '淇敼鎴愬姛'	
+			dialogInputConfirm(value) {
+			    this.locDetlData[this.rowNum].count = this.value
+			    this.messageToggle('success')
+			    this.messageText = '淇敼鎴愬姛'    
 			},
 			// 绉婚櫎鐗╂枡
 			remove(index,item){
@@ -256,98 +257,112 @@
 				this.messageToggle('success')
 				this.messageText = '鍒犻櫎鎴愬姛'
 			},
-			// 琛ュ厖鐨勬暟鎹坊鍔犲埌鎬绘暟鎹腑
+			// 琛ㄦ牸娓叉煋
 			addTableData(data){
 				let that = this
-				console.log(data.matNo.length)
 				if(data.matNo.length === 0){
 					that.messageToggle('error')
-					that.messageText = '琛ュ厖澶辫触'
+					that.messageText = '鎻愬彇澶辫触'
 					return
 				}
 				var toPush = true
-				for (var j = 0; j < this.locDetlData.length; j++) {
-					if (data.matNo === this.locDetlData[j].matNo && data.locNo === this.locDetlData[j].locNo) {
+				for (var j = 0; j < that.locDetlData.length; j++) {
+					if (data.matNo === that.locDetlData[j].matNo && data.locNo === that.locDetlData[j].locNo) {
 						toPush = false;
 				    }
 				}
 				if (toPush) {
 					var pushData = {
-						locNo: this.locDetlData[0] ? this.locDetlData[0].locNo : null,
+						locNo: that.locDetlData[0] ? that.locDetlData[0].locNo : null,
 						matNo: data.matNo,
 						count: data.count,
 						matName: data.matName
 				    }
-				    locDetlData.push(pushData);
+				    that.locDetlData.push(pushData);
 				}
-				this.$refs.popup.close()
-				
+				that.$refs.popup.close()
 			},
 			// 閲嶇疆
 			reset(){
 				this.billNo = ''
-				this.addTableData()
+				this.locDetlData = []
 			},
 			check(){
-				if(this.souceData.length === 0) {
-					this.messageToggle('error')
-					this.messageText = '绔欑偣鏃犺揣锛屾棤娉曠洏鐐�'
+				let that = this
+				if(that.billNo.length === 0) {
+					that.messageToggle('error')
+					that.messageText = '璇� 鎵爜 / 杈撳叆 鎵樼洏鐮�'
 					return
 				}
-				if(this.locDetlData.length > 0) {
+				if(that.billNo.length < 8) {
+					that.messageToggle('error')
+					that.messageText = '鎵樼洏鐮佸繀椤讳负8浣�'
+					return
+				}
+				if(that.locDetlData.length > 0) {
 					for(var i = 0; i < that.locDetlData.length; i++){
 						if (that.locDetlData[i].count === null || that.locDetlData[i].count === 0 || 
 						that.locDetlData[i].count === undefined) {
-							this.messageToggle('error')
-							this.messageText = that.locDetlData[i].matNo + '鍟嗗搧鏁伴噺閿欒'
+							that.messageToggle('error')
+							that.messageText = that.locDetlData[i].matNo + '鍟嗗搧鏁伴噺閿欒'
 							return
 						}
 					}
 				}
-				if (this.locDetlData.length > 0) {
-				    this.locDetlData.map(function (item) {
-				        this.checkList.push({
+				if (that.locDetlData.length > 0) {
+				    that.locDetlData.map(function (item) {
+				        that.checkList.push({
 				            locNo: item.locNo,
 				            matNo: item.matNo,
-				            checkQty: item.count
+				            checkQty: item.count,
+							itemBatch: item.itemBatch
 				        });
 				    });
 				}
-				if (this.souceData.length > 0) {
-				    this.souceData.map(function (item) {
-				        this.sourceList.push({
+				if (that.souceData.length > 0) {
+				    that.souceData.map(function (item) {
+				        that.sourceList.push({
 				            locNo: item.locNo,
 				            matNo: item.matNo,
-				            count: item.count
+				            count: item.count,
+							itemBatch: item.itemBatch
 				        });
 				    });
 				}
+				// this.noTitlemodalTap()
 				uni.request({
-					url: that.baseHttp + that.baseIP + that.baseUrl + "/mobile/stock/check",
+					url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + "/mobile/stock/check",
 					header: {
 						'token':uni.getStorageSync('token')
 					},
 					data: JSON.stringify({
-						checkList: this.checkList
+						checkList: that.checkList
 					}),
 					method:'POST',
 					async:false,
 					success(res){
 						if(res.data.code === 200){
-							this.reset();
-							this.messageToggle('success')
-							this.messageText = '鐩樼偣鎴愬姛'
+							that.reset();
+							that.messageToggle('success')
+							that.messageText = '鐩樼偣鎴愬姛'
 						} else if (res.data.code === 403) {
 							uni.navigateBack({
 							    delta: 1
 							})
 						} else {
-							this.messageToggle('error')
-							this.messageText = res.data.msg
+							that.messageToggle('error')
+							that.messageText = res.data.msg
 						}
-						
 					} 
 				})
+			},
+			noTitlemodalTap: function (e) {
+				uni.showModal({
+					content: "鏄惁纭鐩樼偣",
+					confirmText: "鏄�",
+					cancelText: "鍚�"
+				})
+				
 			}
 		}
 	}

--
Gitblit v1.9.1