From 75ea1362b54946c8a8b6aa8260c2f4e5843154ab Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期一, 28 二月 2022 16:58:28 +0800
Subject: [PATCH] #

---
 pages/basics/combPro.vue |   64 ++++++++++++++++++++++++--------
 1 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/pages/basics/combPro.vue b/pages/basics/combPro.vue
index bd16c60..5374feb 100644
--- a/pages/basics/combPro.vue
+++ b/pages/basics/combPro.vue
@@ -14,34 +14,38 @@
 			<uni-table ref="table" border stripe emptyText="鏆傛棤鏇村鏁版嵁" type="selection" @selection-change="selectionChange">
 				<uni-tr>
 					<uni-th align="center" width="90">鏁伴噺</uni-th>
+					<uni-th align="center" width="90">缁勬墭鏁伴噺</uni-th>
 					<uni-th align="center" width="90">浜у搧浠e彿</uni-th>
 					<uni-th align="center" width="90">浜у搧缂栫爜</uni-th>
 					<uni-th align="center" width="90">浜у搧鍚嶇О</uni-th>
 					<uni-th align="center" width="90">搴忓彿</uni-th>
 					<uni-th align="center" width="90">鎵瑰彿</uni-th>
-					<uni-th align="center" width="200">缁勬墭鏁伴噺</uni-th>
+					
 					
 				</uni-tr>
 				<uni-tr v-for="(item, index) in matData" :key="index">
 					<uni-td align="center">{{item.count}}</uni-td>
+					<uni-td align="center">
+						<button class ="cu-btn bg-orange margin-xs" @click="confirm(index,item)">淇� 鏀�</button>
+						<!-- <button class="uni-button" size="mini" type="warn" @click="remove(index,item)">鍒犻櫎</button> -->
+					</uni-td>
 					<uni-td align="center">{{item.size}}</uni-td>
 					<uni-td align="center">{{item.matNo}}</uni-td>
 					<uni-td align="center">{{item.matName}}</uni-td>
 					<uni-td align="center">{{item.seqNo}}</uni-td>
 					<uni-td align="center">{{item.itemBatch}}</uni-td>
-					<uni-td align="center">
-						<button class="uni-button" size="mini" type="primary" @click="confirm(index,item)">淇敼</button>
-						<button class="uni-button" size="mini" type="warn" @click="remove(index,item)">鍒犻櫎</button>
-					</uni-td>
+					
 				</uni-tr>
 			</uni-table>
 		</view>
-		<view>
-			<button class ="delTable" @click="delTable">鎵归噺鍒犻櫎</button>
+		<view class="flex solid-bottom  justify-between">
+			<button class ="cu-btn bg-red margin-xs" @click="delTable">鎵归噺鍒犻櫎</button>
+			<button class ="cu-btn bg-olive margin-xs" @click="reSelection">鍙嶉��</button>
+			<button class ="cu-btn bg-cyan margin-xs" @click="clearSel">娓呯┖閫夋嫨</button>
 		</view>
-		<view>
-			<button class="cu-btn bg-yellow pda-btn" @click="comb()">缁� 鎵�</button>
-			<button class="cu-btn bg-grey pda-btn" @click="reset">閲� 缃�</button>
+		<view class="flex solid-bottom padding justify-around">
+			<button class="cu-btn bg-yellow  lg" @click="comb()">缁� 鎵�</button>
+			<button class="cu-btn bg-grey lg" @click="reset">閲� 缃�</button>
 		</view>
 		<view>
 			<!-- 鎻愮ず淇℃伅寮圭獥 -->
@@ -78,6 +82,7 @@
 				couChange:true,
 				baseIP:'',
 				selectArr : [],
+				selectedIndexs:[],
 				
 				
 			}
@@ -90,23 +95,50 @@
 			// 澶氶��
 			selectionChange(e) {
 				// 鑾峰彇閫変腑鐘舵��
-				console.log(e.detail.index)
 				this.selectedIndexs = e.detail.index
+				this.selectedIndexs.sort(function(a,b){
+					return a-b
+				});// 閲嶆柊鎺掑簭锛堝崌搴忥級
+			},
+			
+			// 鍏ㄩ��
+			// 鎵归噺鍒犻櫎鐨勬柟娉�
+			toggleSelection(rows) {
+				console.log(rows)
+				if (rows) {
+				this.$refs["table"].toggleAllSelection(rows);
+				} else {
+					this.$refs["table"].clearSelection();
+				}
 			},
 			//鎵归噺鍒犻櫎
 			delTable() {
-				//瀹炵幇鍏ㄩ�夊垹闄ゅ拰澶氶�夊垹闄�
+				// 瀹炵幇鍏ㄩ�夊垹闄ゅ拰澶氶�夊垹闄�
 				let len = this.selectedIndexs.length
-				for (let i = 0; i < len; i++) {
-					this.matData.splice(this.selectedIndexs[i],1)
+				// len.forEach(index => {
+				// 	console.log(index)
+				//            this.matData.splice(index,1);
+				// 		   })
+				for (let i = len-1; i >= 0; i--) {
+					console.log(this.selectedIndexs[i])
+					this.matData.splice(this.selectedIndexs[i],1)	// splice鍒犻櫎鏁扮粍浼氭敼鍙樺師鏁扮粍锛屾墍浠ラ渶瑕侀�嗗悜鍒犻櫎
 				}
-				this.selectedIndexs = ''
+				this.$refs["table"].clearSelection(); // 娓呯┖閫夋嫨
 				
+			},
+			// 鍙嶉��
+			reSelection(){
+				this.toggleSelection(this.selectedIndexs)
+			},
+			// 娓呯┖
+			clearSel() {
+				this.toggleSelection()
 			},
 				reset:function() {
 					this.billNo = '';
 					this.code = '';
-					this.matData = []
+					this.matData = [];
+					this.toggleSelection()
 				},
 				messageToggle(type) {
 					this.msgType = type

--
Gitblit v1.9.1