联调

pages/management/DeliveryConfirm.vue

@@ -77,7 +77,7 @@
 			},
 			async _releasepoint (type) {
 			  try {
-				let res = await inOutExceptionInstConfirm(this.index1, this.val1, type) 
+				let res = await releasepoint(this.index1, this.val1, type) 
 				this.disabled1 = false
 				this.disabled2 = false
 				this.index1 = ''

pages/management/HalfFinishedInStore.vue

@@ -74,11 +74,12 @@
 			};
 		},
 		onShow () {
+			console.log(this.$store.getters.publicObj)
 			if (this.$store.getters.publicObj !== '') {
 				this.val2 = this.$store.getters.publicObj.material_code
 				this.val3 = this.$store.getters.publicObj.material_name
 				this.val4 = this.$store.getters.publicObj.material_spec
-				this.val7 = this.$store.getters.publicObj.material_id
+				this.val7 = this.$store.getters.publicObj.material_uuid
 			}
 		},
 		destroyed () {

pages/management/MaterList.vue

@@ -29,7 +29,7 @@
 					</tr>
 				</thead>
 				<tbody>
-					<tr v-for="e in dataList" :key="e.sale_code" :class="{'checked': e.checked}">
+					<tr v-for="e in dataList" :key="e.material_id" :class="{'checked': e.checked}">
 						<td>
 							<view class="iconfont icon_unchecked" :class="{'icon_checked': e.checked}" @tap="toCheck(e)">&#xe608;</view>
 						</td>
@@ -83,7 +83,7 @@
 			},
 			/** 初始化查询 */
 			async _orderSearch () {
-				let res = await orderSearch(this.val1, this.pageNum + '', this.pageSize + '')
+				let res = await orderSearch(this.pageNum + '', this.pageSize + '', this.val1)
 				this.totalCount = res.totalElements
 				if (res.totalElements > 0) {
 					res.content.map(el => {