chenrui il y a 2 ans
Parent
commit
2af4d0ae6a

+ 7 - 4
pages/shuntBackManage/addBackOrder.vue

@@ -120,7 +120,7 @@
 			</view>
 			</view>
 		</u-popup>
 		</u-popup>
 		<!-- 查看明细弹窗 -->
 		<!-- 查看明细弹窗 -->
-		<detailModal @clearList='clearOneList' @clearAllList="clearAll" @changeNumRecount="recount" :detailShow="detailFlag" :chooseData="chooseArr"  @close="detailFlag=false"></detailModal>
+		<detailModal ref="detailPopup" @clearList='clearOneList' @clearAllList="clearAll" @changeNumRecount="recount" :detailShow="detailFlag" :chooseData="chooseArr"  @close="detailFlag=false"></detailModal>
 	</view>
 	</view>
 </template>
 </template>
 
 
@@ -220,12 +220,13 @@ export default {
 				this.recallBillList.map(item=>{
 				this.recallBillList.map(item=>{
 					item.isChecked = true;
 					item.isChecked = true;
 				})
 				})
-				this.chooseArr = this.recallBillList;
+				this.chooseArr = this.chooseArr.concat(this.recallBillList);
 			 }else{
 			 }else{
 				 this.recallBillList.map(item=>{
 				 this.recallBillList.map(item=>{
 				 	item.isChecked = false;
 				 	item.isChecked = false;
 				 })
 				 })
-				 this.chooseArr =[]
+				 this.chooseArr = []
+				 this.$refs.detailPopup.clearAllList();
 			 }
 			 }
 			 this.calculateTotal()
 			 this.calculateTotal()
 		},
 		},
@@ -250,7 +251,7 @@ export default {
 		},
 		},
 		// 详情删除其中一条选中数据
 		// 详情删除其中一条选中数据
 		clearOneList(id){
 		clearOneList(id){
-			let i =this.recallBillList.findIndex(val =>{
+			let i = this.recallBillList.findIndex(val =>{
 				return val.id == id;
 				return val.id == id;
 			})
 			})
 			this.recallBillList[i].isChecked = false
 			this.recallBillList[i].isChecked = false
@@ -260,7 +261,9 @@ export default {
 			this.recallBillList.map(item=>{
 			this.recallBillList.map(item=>{
 				item.isChecked = false;
 				item.isChecked = false;
 			})
 			})
+			this.allChecked =false;
 			this.chooseArr = []
 			this.chooseArr = []
+			this.calculateTotal();
 		},
 		},
 		//进步器change事件
 		//进步器change事件
 		numberBoxChange(){
 		numberBoxChange(){

+ 5 - 4
pages/shuntBackManage/detailModal.vue

@@ -76,14 +76,14 @@
 		data() {
 		data() {
 			return {
 			return {
 				isShow:this.detailShow,
 				isShow:this.detailShow,
-				list:this.chooseData
+				list:[]
 			}
 			}
 		},
 		},
 		methods: {
 		methods: {
 			clearList(id,i){
 			clearList(id,i){
-				this.chooseData.splice(i,1);
-				 this.$emit("clearList",id)
-				 if(this.chooseData.length == 0){
+				this.list.splice(i,1);
+				this.$emit("clearList",id)
+				 if(this.list.length == 0){
 					  this.$emit('close')
 					  this.$emit('close')
 				 }
 				 }
 			},
 			},
@@ -92,6 +92,7 @@
 				 this.$emit("clearAllList")
 				 this.$emit("clearAllList")
 				 this.$emit('close')
 				 this.$emit('close')
 			},
 			},
+			
 			minus(){
 			minus(){
 				this.$emit("changeNumRecount")
 				this.$emit("changeNumRecount")
 			},
 			},