From 5d34bc6761cea81c277db633e990afdc2028e023 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 13 九月 2022 15:43:10 +0800
Subject: [PATCH] #

---
 pages/basics/outPakin.vue |   96 +++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 87 insertions(+), 9 deletions(-)

diff --git a/pages/basics/outPakin.vue b/pages/basics/outPakin.vue
index 5f0e843..f69d1ce 100644
--- a/pages/basics/outPakin.vue
+++ b/pages/basics/outPakin.vue
@@ -45,7 +45,8 @@
 						<view class="matnr">{{item.matnr}}-{{item.batch}}</view>
 					</view>
 					<view class="data-list-right">
-						<uni-icons type="trash" size="20" color="#a5a5a5" @click="remove(item,index)"></uni-icons>
+						<label><uni-icons type="compose" size="20" color="#a5a5a5" @click="revise(item,index)"></uni-icons></label>
+						<label style="margin-left: 10%;"><uni-icons type="trash" size="21" color="#a5a5a5" @click="remove(item,index)"></uni-icons></label>
 					</view>
 				</view>
 			</checkbox-group>
@@ -87,6 +88,27 @@
 				</view>
 			</uni-popup>
 		</view>
+		
+		<!-- 寮圭獥 -->
+		<!-- 淇敼鏁伴噺 -->
+		<uni-popup ref="revise" background-color="#fff">
+			<view class="revise-box ">
+				<view class="revise-box-top">
+					<view class="color-block-blue"></view>
+					<text class="title">淇敼鎵瑰彿/鏁伴噺</text>
+				</view>
+				<view class="" style="position: relative;left: 50px;margin-bottom: 20px;">
+					<text style="display: inline-block;float: left;width: 50px;">鎵瑰彿锛�</text>
+					<input type="text" style="width: 100px;border-bottom: 1px solid #9e9e9e;" v-model="Rummage">
+				</view>
+				<view class="revise-box-buttom">
+					<view>
+						<button class="cu-btn bg-blue" @click="confirm()">纭</button>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
 	</view>
 </template>
 
@@ -112,7 +134,9 @@
 				origins: [{value:'1288'},{value:'5055'}],
 				origin: null, // 浠撳簱
 				current: 0,
-				isNum:false
+				isNum:false,
+				Rummage:''
+				
 			}
 		},
 		mounted(){
@@ -120,9 +144,8 @@
 			this.baseIP = UIP;
 			const UPORT = uni.getStorageSync('UPORT');
 			this.basePORT = UPORT
-			const PJO = uni.getStorageSync('PJO');
-			this.baseUrl = PJO
-			console.log(this.baseUrl)
+			const PROJ = uni.getStorageSync('UPROJ');
+			this.baseUrl = PROJ
 			this.getUrl()
 		},
 		onLoad() {
@@ -282,6 +305,7 @@
 			},
 			// 娣诲姞鎵弿鏃ュ織
 			addLog(matCode,userName) {
+				
 				let that = this;
 				uni.request({
 					url: that.commonUrl + "/mobile/addLog/auth",
@@ -294,6 +318,10 @@
 					},
 					// method:"POST",
 					success(result) {
+						var res = result.data
+						if(res.code === 200) {
+							// uni.showToast({title: "娣诲姞鎴愬姛", icon: "none",position: 'center'})
+						}
 					}
 				})
 				
@@ -307,6 +335,12 @@
 				that.addLog(matCode,userName)
 				// that.foucss();
 				// return;
+				if(that.matList.length > 15) {
+					that.messageToggle('warn');
+					that.messageText = '缁勬墭鍟嗗搧鏁伴噺宸茶秴杩�16浠讹紝璇峰畬鎴愬綋鍓嶇粍鎵�';
+					that.foucss();
+					return;
+				}
 				if (that.matnrId.length > 25){
 					that.messageToggle('warn');
 					that.messageText = '鍟嗗搧缂栫爜瓒呴暱锛岃閲嶈瘯';
@@ -317,6 +351,31 @@
 				let matnr = str[0] + '-' + str[1]
 				// 妫�鏌ユ潯鐮佷腑闈炴暟瀛�
 				that.checkNum(str[2])
+				// 妫�鏌ュ簭鍒楃爜闀垮害
+				if (str[2].length != 11) {
+					that.messageToggle('warn');
+					that.messageText = '鍟嗗搧搴忓垪鐮侀暱搴︽湁璇紝璇烽噸璇曪紒';
+					that.foucss();
+					return;
+				}
+				// 妫�鏌ュ勾浠�
+				var dt = new Date();
+				var year = (dt.getFullYear() + '').substring(2,4)
+				var month = (dt.getMonth()+1) < 10 ? '0'+ (dt.getMonth()+1) : (dt.getMonth()+1);
+				if (str[2].substring(0,2) > year) {
+					that.messageToggle('warn');
+					that.messageText = '鍟嗗搧搴忓垪鐮佸勾浠芥湁璇紝璇烽噸璇曪紒';
+					that.foucss();
+					return;
+				}
+				// 妫�鏌ユ湀浠� 
+				if (str[2].substring(2,4) > 12) {
+					that.messageToggle('warn');
+					that.messageText = '鍟嗗搧搴忓垪鐮佹湀浠芥湁璇紝璇烽噸璇曪紒';
+					that.foucss();
+					return;
+				}
+				if (str)
 				if (that.isNum == false) {
 					that.messageToggle('warn');
 					that.messageText = '鍟嗗搧缂栫爜鏈夎锛岃閲嶈瘯锛�';
@@ -335,15 +394,14 @@
 				// return;
 				// uni.showLoading();
 				uni.request({
-				    url: that.commonUrl + '/mat/auth',
+				    url: that.commonUrl + '/barcode/check/auth',
 				    data: {
-						matnr:matnr
+						barcode:that.matnrId
 				    },
 				    header: {
 						'token':uni.getStorageSync('token')
 				    },
 					success(result) {
-						console.log(result)
 						uni.hideLoading();
 						// uni.vibrateShort();
 						let res = result.data
@@ -389,6 +447,24 @@
 		
 			change(e) {
 				console.log('褰撳墠妯″紡锛�' + e.type + ',鐘舵�侊細' + e.show);
+			},
+			revise(item,index) {
+				this.count = this.matList[index].anfme
+				// var maxCount = this.matList[index].maxCount
+				// if (maxCount == undefined ) {
+				// 	this.matList[index]["maxCount"] = item.enableQty
+				// } 
+				// this.enableQty = item.enableQty
+				// this.count = this.minCount
+				// this.maxCount = item.maxCount
+				this.rowNum = index
+				this.eject()
+			},
+			confirm() {
+				this.matList[this.rowNum].anfme = this.count
+				this.matList[this.rowNum].batch = this.batch
+				this.$refs.revise.close()
+				this.$forceUpdate() // 寮哄埗鍒锋柊
 			},
 			
 		}
@@ -541,6 +617,8 @@
 		float: right;
 		height: 130rpx;
 		line-height: 130rpx;
-		margin-right: 10%;
+		margin-right: 2%;
+		width: 20%;
 	}
+	
 </style>
\ No newline at end of file

--
Gitblit v1.9.1