入库确认接口

pages/WarehouseManage/ScrapInStore.vue

@@ -29,40 +29,20 @@
 					<table>
 						<thead>
 							<tr>
-								<th>序号</th>
-								<th>选择</th>
-								<th>订单号</th>
+								<th>木箱码</th>
 								<th>子卷号</th>
-								<th>机台编号</th>
-								<th>分切组</th>
-								<th>生产顺序</th>
-								<th>生产日期</th>
-								<th>纸筒/FRP管</th>
-								<th>纸筒物料编码</th>
-								<th>纸筒物料描述</th>
-								<th>纸筒规格</th>
-								<th>FRP管物料编码</th>
-								<th>FRP管物料描述</th>
-								<th>FRP管规格</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>重量KG</th>
 							</tr>
 						</thead>
 						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.checked}">
-								<td>{{Number(i) + 1}}</td>
-								<td><span class="iconfont icon_unchecked" :class="{'icon_checked': e.checked}" @tap="toCheck(e)">&#xe66b;</span></td>
-								<td>{{e.mfg_order_name}}</td>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.package_box_SN === pkId}">
+								<td>{{e.package_box_SN}}</td>
 								<td>{{e.container_name}}</td>
-								<td>{{e.point_code}}</td>
-								<td>{{e.split_group}}</td>
-								<td>{{e.manufacture_sort}}</td>
-								<td>{{e.manufacture_date}}</td>
-								<td>{{e.paper_tube_or_FRP}}</td>
-								<td>{{e.paper_tube_material}}</td>
-								<td>{{e.paper_tube_description}}</td>
-								<td>{{e.paper_tube_model}}</td>
-								<td>{{e.FRP_material}}</td>
-								<td>{{e.FRP_description}}</td>
-								<td>{{e.FRP_model}}</td>
+								<td>{{e.product_name}}</td>
+								<td>{{e.product_description}}</td>
+								<td>{{e.net_weight}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -70,8 +50,8 @@
 			</view>
 		</view>
 		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !checkArr.length || !val2}" :disabled="disabled" @tap="_casingConfirm">报废入库</button>
-			<button class="submit-button" @tap="_queryMaterialInfo">入库确认</button>
+			<button class="submit-button" :class="{'btn-disabled': !pkId || !val2}" :disabled="disabled" @tap="_stConfirm">入库确认</button>
+			<button class="submit-button" @tap="_boxQuery">查询</button>
 		</view>
 	</view>
 </template>
@@ -79,7 +59,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryMaterialInfo2, casingConfirm} from '@/utils/getData2.js'
+	import {boxQuery, stConfirm} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -89,64 +69,50 @@
 			return {
 				val1: '',
 				val2: '',
-				qty: '',
 				dataList: [],
-				disabled: false,
-				checkArr: []
+				pkId: '',
+				pkObj: {},
+				disabled: false
 			};
 		},
 		created () {
-			// this._queryMaterialInfo()
+			this._boxQuery()
 		},
 		methods: {
 			/** 初始化查询 */
-			async _queryMaterialInfo () {
-				let res = await queryMaterialInfo2(this.val1, this.index)
-				res.data.map(el => {
-					this.$set(el, 'checked', false)
-				})
+			async _boxQuery () {
+				let res = await boxQuery(this.val1, this.val2, '1')
 				this.dataList = [...res.data]	
 			},
 			/** 确认 */
-			async _casingConfirm () {
+			async _stConfirm () {
 				this.disabled = true
-				if (!this.checkArr.length || !this.val2) {
+				if (!this.val2 || !this.pkId) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await casingConfirm(this.checkArr, this.val2)
+					let res = await stConfirm(this.pkObj, this.val2)
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
 					})
+					this.pkId = ''
+					this.pkObj = {}
 					this.disabled = false
-					this.checkArr = []
-					this._queryMaterialInfo()
+					this._boxQuery()
 					
 				} catch (e) {
 					this.disabled = false
 				}
 			},
 			toCheck (e) {
-				e.checked = !e.checked
-				this.checkArr = this.dataList.filter(i => { return i.checked === true })
+				this.pkId = this.pkId === e.package_box_SN ? '' : e.package_box_SN
+				this.pkObj = this.pkId === e.package_box_SN ? e : {}
 			}
 		}
 	}
 </script>
 
 <style lang="stylus">
-	.slide_new table td:first-child, .slide_new table th:first-child
-		width 92rpx
-	.slide_new table td:nth-child(2), .slide_new table th:nth-child(2)
-		position sticky
-		left 89rpx
-		width 92rpx
-		z-index 102
-	.slide_new table td:nth-child(3), .slide_new table th:nth-child(3)
-		position sticky
-		left 176rpx
-		z-index 103
-		box-shadow 1px 0 2px rgba(0,0,0,.12)
 </style>