From 6b7ac97344c89df64b87cafb2203bf55f8506eb7 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 24 七月 2024 09:00:39 +0800
Subject: [PATCH] #

---
 pages/pakin/pakin.vue |   93 +++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 83 insertions(+), 10 deletions(-)

diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 116e5c1..8243044 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -1,5 +1,19 @@
 <template>
 	<view>
+		<view class="status_bar">
+			<!-- 杩欓噷鏄姸鎬佹爮 -->
+		</view>
+		<uni-nav-bar left-icon="left" background-color="#f8f8f8" title="缁勬墭鍏ュ簱" @clickLeft="back"  :fixed="true"
+			:border="false" rightWidth="160rpx" leftWidth="160rpx"
+			>
+			<block slot="right">
+				<view class="city">
+					<view>
+						<text class="uni-nav-bar-text">{{store}}</text>
+					</view>
+				</view>
+			</block>
+		 </uni-nav-bar>
 		<view class="code">
 			<view class="item">
 				<view class="code-decs">鎵樼洏鐮�:</view>
@@ -8,14 +22,27 @@
 			</view>
 			<view class="item">
 				<view class="code-decs">鐗╂枡鐮�:</view>
-				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
+				<input type="text" style="width: 350rpx;" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
+				<uni-icons type="close" color="#c1c1c1" @click="clearMatnr"></uni-icons>
 				<view class="item-right">
 					<button></button>
 					<text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text>
 					<uni-icons type="right" color="#c1c1c1"></uni-icons>
 				</view>
 			</view>
+			<view class="item">
+				<view class="code-decs" style="width: 25vw;">鏄惁婊℃澘:</view>
+				<radio-group @change="isFullPlt">
+					<label>
+						<radio :checked="ck1" /><text>鏄�</text>
+					</label>
+					<label>
+						<radio :checked="ck2" style="margin-left: 50rpx;"/><text>鍚�</text>
+					</label>
+				</radio-group>
+			</view>
 		</view>
+		
 		<view class="mat-list-title">
 			鍟嗗搧鍒楄〃
 		</view>
@@ -46,6 +73,12 @@
 							<uni-tag :text="item.batch" type="warning"></uni-tag>
 						</view>
 					</view>
+					<!-- <view class="list-left-item">
+						<view class="desc">閲嶉噺锛�</view>
+						<view class="left-item">
+							<uni-tag :text="item.weight" type="warning"></uni-tag>
+						</view>
+					</view> -->
 					<view class="list-left-item">
 						<view class="desc">鏁伴噺锛�</view>
 						<view class="left-item">{{item.anfme}}</view>
@@ -76,14 +109,18 @@
 								style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
 						</view>
 					</view>
-					<!-- <view class="popup-item">
+					<view class="popup-item">
 						<view class="popup-item-left">鎵瑰彿:</view>
 						<view class="popup-item-right"><input type="text" v-model="batch"></view>
+					</view>
+					<!-- <view class="popup-item">
+						<view class="popup-item-left">閲嶉噺:</view>
+						<view class="popup-item-right"><input type="text" v-model="weight"></view>
 					</view> -->
 					<view class="popup-item">
 						<view class="popup-item-left">鏁伴噺:</view>
 						<view class="popup-item-right" style="border: none;justify-content: center;">
-							<uni-number-box :value="count" :max="9999999" color="#747474" @change="changeValue" />
+							<uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
 						</view>
 					</view>
 					<view class="btn">
@@ -130,12 +167,15 @@
 			return {
 				baseUrl: '',
 				token: '',
+				storeId: 0,
+				store: '',
 				barcode: '',
 				dataList: [],
 				count: 0,
 				rowNum: '',
 				matnr: '',
 				batch: '',
+				weight: '',
 				msgType1: 'success',
 				msgType: 'success',
 				messageText: '',
@@ -145,6 +185,9 @@
 				matFocus: false,
 				matData: '',
 				removeNum: 0,
+				ck1: false,
+				ck2: true,
+				fullPlt: 'N',
 			}
 		},
 		onLoad() {
@@ -153,8 +196,31 @@
 		onShow() {
 			this.baseUrl = uni.getStorageSync('baseUrl');
 			this.token = uni.getStorageSync('token');
+			this.storeId = uni.getStorageSync('store')
+			if (this.storeId == 1) {
+				this.store = '瀹佹尝浠�'
+			}
+			if (this.storeId == 2) {
+				this.store = '鏂版槍浠�'
+			}
 		},
 		methods: {
+			back() { uni.navigateBack({}) },
+			// 鏄惁婊℃澘
+			isFullPlt() {
+				var temp = this.ck1
+				this.ck1 = this.ck2
+				this.ck2 = temp
+				if (this.ck1) {
+					this.fullPlt = 'Y'
+				} else {
+					this.fullPlt = 'N'
+				}
+			},
+			clearMatnr() {
+				// this.matnr = ''
+				this.focuss()
+			},
 			messageToggle(type) {
 				this.msgType1 = type
 				this.$refs.message.open()
@@ -187,7 +253,7 @@
 			},
 			// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
 			focuss() {
-				this.focus = false;
+				this.matFocus = false;
 				setTimeout(() => {
 					this.matnr = '';
 					this.matFocus = true;
@@ -226,9 +292,9 @@
 									},
 								},
 							});
-						} else if (res.code == 403) {
+						} else if (result.code == 403) {
 							uni.showToast({
-								title: res.msg,
+								title: result.msg,
 								icon: "none",
 								position: 'top'
 							})
@@ -239,7 +305,7 @@
 							}, 1000);
 						} else {
 							uni.showToast({
-								title: res.msg,
+								title: result.msg,
 								icon: "none",
 								position: 'top'
 							})
@@ -307,6 +373,7 @@
 				this.matnr = this.dataList[i].matnr
 				this.count = this.dataList[i].anfme
 				this.batch = this.dataList[i].batch
+				this.weight = this.dataList[i].weight
 				this.rowNum = i
 				this.eject()
 			},
@@ -335,6 +402,7 @@
 			reviseConfirm() {
 				this.dataList[this.rowNum].anfme = this.count
 				this.dataList[this.rowNum].batch = this.batch
+				this.dataList[this.rowNum].weight = this.weight
 				this.matnr = ''
 				this.messageText = "淇敼鎴愬姛"
 				this.messageToggle('success')
@@ -378,6 +446,8 @@
 				uni.request({
 					url: that.baseUrl + '/mobile/comb/auth',
 					data: JSON.stringify({
+						owner: that.store,
+						fullPlt: that.fullPlt,
 						barcode: that.barcode,
 						combMats: that.dataList
 					}),
@@ -391,6 +461,9 @@
 							that.resst();
 							that.messageText = "缁勬墭鎴愬姛"
 							that.messageToggle('success')
+							const innerAudioContext = uni.createInnerAudioContext();
+							innerAudioContext.src = '/static/music/pakinOk.mp3';
+							innerAudioContext.play()
 						} else if (res.code == 403) {
 							that.messageText = res.msg
 							that.messageToggle('error')
@@ -438,7 +511,7 @@
 	.code {
 		width: 100%;
 		position: fixed;
-		min-height: 200rpx;
+		min-height: 210rpx;
 		background-color: #FFF;
 		z-index: 10;
 	}
@@ -446,7 +519,7 @@
 	.item {
 		display: flex;
 		align-items: center;
-		height: 100rpx;
+		height: 70rpx;
 		margin-left: 20rpx;
 		border-bottom: 1px solid #DCDFE6;
 	}
@@ -482,6 +555,6 @@
 		z-index: 9;
 		/* border-top: 1px solid #DCDFE6; */
 		text-align: center;
-		box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
+		box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
 	}
 </style>

--
Gitblit v1.9.1