diff --git a/pages/management/in-storage.vue b/pages/management/in-storage.vue
index 0a84265..d5e0d8c 100644
--- a/pages/management/in-storage.vue
+++ b/pages/management/in-storage.vue
@@ -95,12 +95,17 @@
 							<view class="zd-col-2 zd-sec-td nowrap"><text>{{el.update_time}}</text></view>
 							<view class="zd-col-1 zd-sec-td"><uni-icons type="more-filled" size="14" color="#fff" @tap="getDetails(2,el)"></uni-icons></view>
 						</view>
-						<view class="zd-row">
-							<view class="zd-col-12 zd-row jcflexstart">
-								<button class="confirm-button" :class="{'confirm-button_disabled': checkArr2.length === 0}" @tap="kuwConfirm">{{crType === 'IN' ? '入库' : '出库'}}</button>
-							</view>
-							<view class="zd-col-12 zd-row jcflexend">
-								<pagination :total="totalCount2" :page-size="queryParams2.pageSize" :current-page="currentPage2" @page-change="handlePageChange2" />
+						<view class="zd-row jcenter">
+							<view class="zd-col-22 zd-row">
+								<view class="zd-col-1 zd-row jcenter">
+									<view class="zd-checkbox" :class="{'zd-checkbox_active': checkArrActive}" @tap="selectAll"></view>
+								</view>
+								<view class="zd-col-11 zd-row jcflexstart">
+									<button class="confirm-button" :class="{'confirm-button_disabled': checkArr2.length === 0}" @tap="kuwConfirm">{{crType === 'IN' ? '入库' : '出库'}}</button>
+								</view>
+								<view class="zd-col-12 zd-row jcflexend">
+									<pagination :total="totalCount2" :page-size="queryParams2.pageSize" :current-page="currentPage2" @page-change="handlePageChange2" />
+								</view>
 							</view>
 						</view>
 					</view>
@@ -206,6 +211,7 @@
 				},
 				currentPage2: 1,
 				checkArr2: [],
+				checkArrActive: false,
 				disabled2: false,
 				show: false,
 				type: '',
@@ -236,6 +242,7 @@
 			this.toSearch()
 		},
 		methods: {
+			// 查询一级表格
 			toSearch () {
 				this.queryParams1 = {
 					pageSize: 10,
@@ -246,6 +253,7 @@
 				this.pkId = ''
 				this._easOutInBillPage()
 			},
+			// 一级表格接口
 			async _easOutInBillPage () {
 				let res = await easOutInBillPage(this.val1, this.id, this.value, this.value1, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '')
 				if (res.code === 1) {
@@ -264,10 +272,12 @@
 					})
 				}
 			},
+			// 二级表格接口
 			async _easOutInBillDetailPage () {
 				let res = await easOutInBillDetailPage(this.pkObj.djid, this.queryParams2.pageNum + '', this.queryParams2.pageSize + '')
 				if (res.code === 1) {
 					this.checkArr2 = []
+					this.checkArrActive = false
 					res.result.map(el => {
 						this.$set(el, 'checked', false)
 					})
@@ -282,6 +292,7 @@
 					})
 				}
 			},
+			// 一级表格切换分页
 			handlePageChange1(page) {
 				this.queryParams1.pageNum = page
 				this.currentPage1 = page
@@ -289,11 +300,13 @@
 				this.pkId = ''
 				this._easOutInBillPage()
 			},
+			// 二级表格切换分页
 			handlePageChange2(page) {
 				this.queryParams2.pageNum = page
 				this.currentPage2 = page
 				this._easOutInBillDetailPage()
 			},
+			// 点击一级表格一行加载二级表格
 			toCollapse (e) {
 				this.pkId = this.pkId === e.djid ? '' : e.djid
 				this.pkObj = this.pkId === e.djid ? e : {}
@@ -307,6 +320,7 @@
 					this._easOutInBillDetailPage()
 				}
 			},
+			// 一级表格选中一行
 			toCheck1 (e) {
 				e.checked = !e.checked
 				let arr = this.dataList1.filter(el => el.checked === true)
@@ -317,6 +331,7 @@
 				// 	this.btnActive1 = false
 				// }
 			},
+			// 点击单据审核按钮
 			async toSure () {
 			  this.disabled1 = true
 			 //  if (this.checkArr1.length === 0 || this.btnActive1) {
@@ -348,10 +363,23 @@
 				this.disabled1 = false
 			  }
 			},
+			// 二级表格多选
 			toCheck2 (e) {
 				e.checked = !e.checked
 				this.checkArr2 = this.dataList2.filter(el => el.checked === true)
+				if (this.checkArr2.length === this.dataList2.length) {
+					this.checkArrActive = true
+				}
 			},
+			// 二级表格全选
+			selectAll () {
+				this.checkArrActive = !this.checkArrActive
+				this.dataList2.map(el => {
+					el.checked = this.checkArrActive
+				})
+				this.checkArr2 = this.dataList2.filter(el => el.checked === true)
+			},
+			// 点击出入库按钮
 			kuwConfirm () {
 				if (this.checkArr2.length === 0) {
 					return
@@ -381,11 +409,13 @@
 						return
 					} else {
 						this.type = '2'
-						this.show = true
-						this.kwCode = ''
+						// this.show = true
+						// this.kwCode = ''
+						this.$refs.alertDialog.open()
 					}
 				}
 			},
+			// 选择二级表格一行，点击出入库按钮，弹窗加载出入库表格
 			async _queryInventoryInfo () {
 				let res = await queryInventoryInfo(this.checkArr2)
 				if (res.code ===1) {
@@ -402,6 +432,7 @@
 					})
 				}
 			},
+			// 出入库表格输入框计算，功能暂时隐藏
 			handleBlur (ele) {
 				if (Number(ele.sysl) >= Number(ele.yqty)) {
 					ele.sysl = ele.yqty
@@ -419,6 +450,7 @@
 				this.dataList3.splice(index+1, 0, obj)
 				this.dataList3 = [...this.dataList3]
 			},
+			// 点击出入库弹窗确定按钮
 			modalConfirm () {
 				this.disabled2 = true
 				let arr = []
@@ -442,10 +474,16 @@
 				}
 				this._easOutInBillDetailUpdate(arr)
 			},
+			// 提示弹窗确定按钮
 			dialogConfirm () {
-				this._easOutInBillDetailUpdate(this.checkArr3)
+				if (this.type === '2') {
+					this._easOutInBillDetailUpdate(this.checkArr2)
+				} else {
+					this._easOutInBillDetailUpdate(this.checkArr3)
+				}
 			},
 			dialogClose () {},
+			// 出入库确定接口
 			async _easOutInBillDetailUpdate (arr) {
 			  try {
 				
@@ -474,6 +512,7 @@
 				this.disabled2 = false
 			  }
 			},
+			// 详情弹窗
 			getDetails (type,e) {
 				this.delShow = !this.delShow
 				this.detailObj = {type: type, data:e}