优化

api/pda/workOrder.js

@@ -75,6 +75,13 @@ export async function  pageeLedgerMain(params) {
   return Promise.reject(data.message);
 }
 
-
-
-
+// 生产明细
+export async function produceDetail(id) {
+  const data = await get(
+   Vue.prototype.apiUrl  + `/pda/mes/workorder/produceDetail/${id}`,
+  );
+  if (data.code == 0) {
+    return data.data;
+  }
+  return Promise.reject(data.message);
+}

pages.json

@@ -1337,6 +1337,15 @@
 				"navigationBarTextStyle": "white"
 			}
 		},
+		
+		{
+			"path": "pages/pda/picking/bill/index",
+			"style": {
+				"navigationBarTitleText": "领料单",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
 
 
 		{
@@ -1405,14 +1414,6 @@
 				"navigationStyle": "custom",
 				"navigationBarTextStyle": "white"
 			}
-		},
-		{
-			"path" : "pages/pda/picking/components/instanceBom",
-			"style" : 
-			{
-				"navigationBarTitleText" : "",
-				"enablePullDownRefresh" : false
-			}
 		}
 
 
@@ -1421,6 +1422,7 @@
 
 
 
+
 	],
 	"tabBar": {
 		"color": "#908f8f",

pages/pda/picking/bill/index.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/pda/picking/details.vue

@@ -147,9 +147,17 @@
 			scrolltolower() {},
 
 			save() {
-				console.log(this.List)
+				console.log()
+				let _arr = []
+				 _arr = this.List.map(m => {
+					 m.workOrderId = m.id
+					 delete m.id
+					 return {
+						 ...m
+					 }
+				 })
 				
-				batchSave(this.List).then(res => {
+				batchSave(_arr).then(res => {
 					
 					uni.navigateTo({
 						url: `/pages/pda/picking/index/index?tabType`,

pages/pda/workOrder/extrusionMolding/index.vue

@@ -89,19 +89,44 @@
 			</u-list>
 
 			<u-list @scrolltolower="scrolltolower" key="detail" v-if="tabType == 2">
-				<view v-for="(item,index) in detailList" :key="index" class="detail-list">
-					<view class="name">{{item.name}}</view>
-					<view class="list rx-bc" v-for="(it, idx) in item.list">
+			
+				<view v-for="(item,index) in produceList" :key="index" class="detail-list">
+					<view class="name">{{item.taskName}}</view>
+					<view class="list rx-bc" >
 						<view class="title rx-sc">
-							<image v-if="it.state == 1" class="icon" src="~@/static/pda/layers.svg"></image>
-							<image v-if="it.state == 2" class="icon" src="~@/static/pda/check-square.svg"></image>
-							<image v-if="it.state == 3" class="icon" src="~@/static/pda/target.svg"></image>
-
-							{{it.title}}
+							<image  class="icon" src="~@/static/pda/layers.svg"></image>
+							待投料数量
 						</view>
 
 						<view class="rx-ec">
-						{{it.num}}
+						{{item.waitFeedNum}}
+						<image  class="arrow_right2" src="~@/static/pda/arrow_right2.svg"></image>
+						</view>
+					</view>
+					
+					<view class="list rx-bc" >
+						<view class="title rx-sc">
+							<image  class="icon" src="~@/static/pda/check-square.svg"></image>
+							生产中数量
+						</view>
+					
+						<view class="rx-ec">
+						 0
+						<image  class="arrow_right2" src="~@/static/pda/arrow_right2.svg"></image>
+						</view>
+					</view>
+					
+					
+					<view class="list rx-bc" >
+						<view class="title rx-sc">
+						
+							<image  class="icon" src="~@/static/pda/target.svg"></image>
+					
+							待投料数量
+						</view>
+					
+						<view class="rx-ec">
+						{{item.waitFeedNum}}
 						<image  class="arrow_right2" src="~@/static/pda/arrow_right2.svg"></image>
 						</view>
 					</view>
@@ -121,7 +146,7 @@
 	import bottomOperate from '../../components/bottomOperate.vue'
 	import stepsNav from '../../components/stepsNav.vue'
 	
-		import { getTaskInstanceList, workorderInfo } from '@/api/pda/workOrder.js'
+		import { getTaskInstanceList, workorderInfo, produceDetail } from '@/api/pda/workOrder.js'
 	export default {
 		components: {
 			bottomOperate,
@@ -136,39 +161,8 @@
 				stepsList: [],
 				info: {},
 				taskId: null,
-
-				detailList: [{
-						name: '挤压成型',
-						list: [{
-								state: 1,
-								title: '待投料数量',
-								num: 333
-							},
-
-							{
-								state: 2,
-								title: '已报工数量',
-								num: 666
-							}
-						]
-					},
-
-					{
-						name: '自然干燥',
-						list: [{
-								state: 3,
-								title: '生产中数量',
-								num: 555
-							},
-
-							{
-								state: 2,
-								title: '已报工数量',
-								num: 666
-							}
-						]
-					}
-				]
+				
+				produceList: [],
 			}
 		},
 
@@ -180,9 +174,15 @@
 				title: '加载中'
 			});
 			
+
+
+		},
+		
+		onShow() {
 			this.getSteps()
 			this.getInfo()
-
+			
+			this.produce()
 		},
 
 		methods: {
@@ -222,6 +222,14 @@
 				}
 	
 			},
+			
+			
+			produce() {
+				produceDetail(this.id).then(res => {
+					this.produceList = res.produceDetail
+				
+				})
+			},
 		}
 	}
 </script>