生产发料

pages/productionIssuance/oddNumList.vue

@@ -3,7 +3,7 @@
 		<StickyNavBar>
 			<NavBar title="生产发料单号"></NavBar>
 		</StickyNavBar>
-		<ContentLoadingMore class="cardbox" :loadmore='true' :status="status">
+		<ContentLoadingMore class="cardbox" :loadmore='true' :status="status" :list='goodsList'>
 			<view class="cardContent" v-for="(item, index) in goodsList">
 				<view class="listItemTitle" @click="handleClick(item)">
 					<view>
@@ -11,7 +11,8 @@
 						<view class="item">申请单号：{{ item.applyNo }}</view>
 						<view class="item">物料编号：{{ item.itemCode }}</view>
 						<view class="item">物料描述：{{ item.itemName }}</view>
-						<view class="item">工作中心：{{ item.workstationName }}</view>
+						<view class="item">作业单元：{{ item.workunitName }}</view>
+						<view class="item">作业类型：{{ item.materialType ? '补料': '领料' }}</view>
 						<view class="item">备料状态：{{ item.grantNum? '配货中' : '未配货' }}</view>
 						<view class="item">计划时间：{{ item.startTime }}</view>
 					</view>
@@ -103,7 +104,7 @@ export default {
 		},
 		handleClick(item){
 			uni.navigateTo({
-				url: `/pages/productionIssuance/productionIssuanceList?order=${JSON.stringify([item])}`
+				url: `/pages/productionIssuance/productionIssuanceList?order=${item.applyNo}`
 			});
 		},
 		getBtnHandle(row) {

pages/productionIssuance/productionIssuance.vue

@@ -107,9 +107,18 @@ export default {
 				.then((res) => {
 					console.log(res,'-=')
 					if (res.code - 200 === 0) {
+						if(res.rows.length){
 							uni.navigateTo({
 								url: `/pages/productionIssuance/productionIssuanceList?order=${applyNo}`
 							});
+						}else{
+							setTimeout(() => {
+								this.isFocus = true;
+								this.isDisabled = false;
+								this.wxparams = ''
+								this.$u.toast('未查询到数据');
+							}, 1000);
+						}
 						// const data = res.rows
 						// data.forEach((ele,index) => {
 						// 	ele.sonItemCode = []

pages/productionIssuance/scanningList.vue

@@ -28,7 +28,7 @@
 			<view v-if="!show" class="bottomBox">
 				<view class="bottomItem" v-for="(ele, idx) in list" :key="ele.workorderCode+idx" v-if="ele.itemCode === item.itemCode">
 					<view class="items">生产单号：{{ ele.applyNo }}</view>
-					<view class="items">物料批次：{{ ele.charg }}</view>
+					<view class="items">物料批次：{{ ele.CHARG }}</view>
 					<!-- <view class="items">库位：{{ item.MATNR }}</view> -->
 					<!-- <view class="items">{{ item.MATNR }}</view> -->
 					<view class="items inputItem">