From 679e5ee2d8792be7b5590e263f70b51bd3e78ea7 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 25 九月 2023 17:02:06 +0800
Subject: [PATCH] #

---
 pages/order/orderPakin.vue |   51 +++++++++++++++++++++++++++++++++------------------
 1 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/pages/order/orderPakin.vue b/pages/order/orderPakin.vue
index 118ae3e..24be376 100644
--- a/pages/order/orderPakin.vue
+++ b/pages/order/orderPakin.vue
@@ -1,11 +1,6 @@
 <template>
 	<view>
 		<view class="code">
-			<!-- <view class="item">
-				<view class="code-decs">璁㈠崟鍙�:</view>
-				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="order" :focus="orderFocus"
-					@input="orderInput()" disabled>
-			</view> -->
 			<view class="item">
 				<view class="code-decs">鎵樼洏鐮�:</view>
 				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
@@ -57,6 +52,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>
@@ -71,7 +72,7 @@
 		<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
 		<view class="buttom">
 			<button size="mini" @click="reset('warn')">閲嶇疆</button>
-			<button size="mini" type="primary" @click="combConfirm('warn')">缁勬墭</button>
+			<button size="mini" type="primary" @click="combConfirm('warn')">鍏ュ簱</button>
 		</view>
 		<!-- 寮圭獥 -->
 		<!-- 淇敼鏁伴噺 -->
@@ -87,14 +88,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> -->
+					<!-- <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">
@@ -118,7 +123,7 @@
 				<uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
 			</uni-popup>
 		</view>
-		<!-- 纭缁勬墭 -->
+		<!-- 纭鍏ュ簱 -->
 		<view>
 			<uni-popup ref="combConfirm" type="dialog">
 				<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
@@ -148,23 +153,23 @@
 				baseUrl: '',
 				token: '',
 				order: '',
-				orderFocus: true,
 				barcode: '',
-				barcodeFocus: '',
 				dataList: [],
 				count: 0,
 				rowNum: '',
 				matnr: '',
 				matnr1: '',
 				batch: '',
+				weight: '',
 				msgType1: 'success',
 				msgType: 'success',
 				messageText: '',
 				title: '',
 				content: '',
-				barcodeFocus: false,
+				barcodeFocus: true,
 				matFocus: false,
-				matData: ''
+				matData: '',
+				removeNum: 0
 			}
 		},
 		onShow() {
@@ -279,7 +284,7 @@
 			combConfirm(type) {
 				this.msgType = type
 				this.title = '璀﹀憡'
-				this.content = '鏄惁鐜板湪缁勬墭!'
+				this.content = '鏄惁鐜板湪鍏ュ簱!'
 				this.$refs.combConfirm.open()
 			},
 			comb() {
@@ -297,7 +302,7 @@
 				}
 				for (var i = 0; i < that.dataList.length; i++) {
 					if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
-						this.messageText = that.dataList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0'
+						this.messageText = that.dataList[i].matnr + '鍏ュ簱鏁伴噺涓嶈兘涓�0'
 						this.messageToggle('error')
 						return;
 					}
@@ -316,7 +321,7 @@
 						var res = result.data
 						if (res.code === 200) {
 							that.resst();
-							that.messageText = "缁勬墭鎴愬姛"
+							that.messageText = "鍏ュ簱鎴愬姛"
 							that.messageToggle('success')
 						} else if (res.code == 403) {
 							that.messageText = res.msg
@@ -357,6 +362,7 @@
 				this.matnr1 = 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()
 			},
@@ -366,6 +372,7 @@
 			},
 			// 鍒楄〃绉婚櫎鎸夐挳
 			remove(item, i, type) {
+				this.removeNum  = i
 				this.msgType = type
 				this.title = '璀﹀憡'
 				this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
@@ -375,11 +382,12 @@
 			removeConfirm(i) {
 				this.messageText = "绉婚櫎鎴愬姛"
 				this.messageToggle('success')
-				this.dataList.splice(i, 1)
+				this.dataList.splice(this.removeNum, 1)
 			},
 			reviseConfirm() {
 				this.dataList[this.rowNum].anfme = this.count
 				this.dataList[this.rowNum].batch = this.batch
+				this.dataList[this.rowNum].weight = this.weight
 				this.messageText = "淇敼鎴愬姛"
 				this.messageToggle('success')
 				this.$refs.revise.close()
@@ -397,6 +405,13 @@
 				this.barcode = ''
 				this.barcodeFocuss()
 			},
+			combClose() {
+				this.$refs.combConfirm.close()
+			},
+			// 鍙栨秷绉婚櫎
+			removeClose() {
+				this.$refs.alertDialog.close()
+			},
 		}
 	}
 </script>

--
Gitblit v1.9.1