优化列表

api/pda/workOrder.js

@@ -35,4 +35,18 @@ export async function workorderInfo(id) {
     return data.data;
   }
   return Promise.reject(data.message);
-}
+}
+
+
+// 根据工单ids获取工单列表
+
+export async function workorderList(params) {
+  const data = await postJ(
+   Vue.prototype.apiUrl  + `/pda/mes/workorder/list`, params, true,
+  );
+  if (data.code == 0) {
+    return data.data;
+  }
+  return Promise.reject(data.message);
+}
+

pages.json

@@ -1308,7 +1308,7 @@
 				"navigationBarTextStyle": "white"
 			}
 		},
-
+     //  ===================  PDA  =======
 
 		{
 			"path": "pages/pda/workOrder/index/index",
@@ -1338,6 +1338,14 @@
 			}
 		},
 		
+		{
+			"path": "pages/pda/picking/add",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		
 		{
 			"path": "pages/pda/material_return/index/index",
 			"style": {
@@ -1393,9 +1401,17 @@
 			"path" : "pages/pda/workOrder/extrusionMolding/index",
 			"style" : 
 			{
-	"navigationBarTitleText": "",
-	"navigationStyle": "custom",
-	"navigationBarTextStyle": "white"
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path" : "pages/pda/picking/add",
+			"style" : 
+			{
+				"navigationBarTitleText" : "",
+				"enablePullDownRefresh" : false
 			}
 		}
 	
@@ -1404,7 +1420,6 @@
 
 
 
-
 	],
 	"tabBar": {
 		"color": "#908f8f",

pages/pda/picking/add.vue

@@ -0,0 +1,35 @@
+<template>
+<view class="content-box"> 
+		<uni-nav-bar fixed="true" statusBar="true" left-icon="back" 
+			 @clickLeft="back">
+			   <block slot="right">
+				   
+				   5555
+			  </block>
+			 </uni-nav-bar>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content-box {
+		height: 100vh;
+		overflow: hidden;
+		display: flex;
+		flex-direction: column;
+
+	}
+
+</style>

pages/pda/picking/details.vue

@@ -6,7 +6,7 @@
 		<view class="list_box">
 			<u-list @scrolltolower="scrolltolower">
 
-				<view v-for="(item,index) in idsList" :key="index" class="card_box">
+				<view v-for="(item,index) in List" :key="index" class="card_box">
 					<view class="title_box rx-bc">
 						<view class="left rx-sc">
 							<view class="round">{{index + 1}}</view>
@@ -14,12 +14,12 @@
 						</view>
 
 						<view class="right_box rx-ec">
-							<view class="btn">添加物料</view>
+							<view class="btn" @click="addPicking">添加物料</view>
 						</view>
 
 					</view>
 
-					<view class="material rx-ss">
+					<view class="material rx-ss" v-for="(mate, idx) in item.bomDetailDTOS">
 
 						<view class="left rx-ss" @click="item.checked = ! item.checked">
 							<view class="zdy_check rx-cc" :class="{ check_active : item.checked  }">
@@ -30,36 +30,36 @@
 							<view class="item">
 								<view class="lable rx-cc">物料编码</view>
 								<view class="content">
-									624644626624644626624644626</view>
+									{{mate.categoryCode}}</view>
 							</view>
 
 							<view class="item">
 								<view class="lable rx-cc">名称</view>
-								<view class="content">物料名称物料名称物料</view>
+								<view class="content">{{mate.categoryName}}</view>
 							</view>
 
 							<view class="item rx-sc">
 								<view class="rx ww55 ">
 									<view class="lable rx-cc">牌号</view>
-									<view class="content ">YL10Y</view>
+									<view class="content ">{{mate.brandNum}}</view>
 								</view>
 
-								<view class="rx ww45" >
-									<view class="lable rx-cc ww80" >数量</view>
+								<view class="rx ww45">
+									<view class="lable rx-cc ww80">数量</view>
 									<view class="content content_num">
-											<input class="uni-input"   type="digit"></input>
-											<view class="unit">kg</view>
+										<input class="uni-input" v-model="mate.needNum" type="digit"></input>
+										<view class="unit">{{mate.unit}}</view>
 									</view>
 								</view>
 
 							</view>
-							
-							
+
+
 							<view class="item">
 								<view class="lable rx-cc">领料仓库</view>
 								<view class="content">
-							<zxz-uni-data-select :localdata="localdata"  v-model="value"
-								 dataValue='id' format='{name}' :clear='false'></zxz-uni-data-select>
+									<zxz-uni-data-select :localdata="localdata" v-model="value" dataValue='id'
+										format='{name}' :clear='false'></zxz-uni-data-select>
 								</view>
 							</view>
 
@@ -72,24 +72,22 @@
 
 		<view class="bottom-wrapper">
 			<view class="btn_box" @click="save">确认</view>
-			
+
 		</view>
 
 	</view>
 </template>
 
 <script>
+	import { workorderList } from  '@/api/pda/workOrder.js'
 	export default {
 		data() {
 			return {
-				idsList: [{
-					checked: false,
-					code: 55
-				}],
-				
+				idsList: [],
+				List: [],
+
 				value: 2,
-				localdata: [
-					{
+				localdata: [{
 						id: 1,
 						name: '测试'
 					},
@@ -102,10 +100,11 @@
 			}
 		},
 		onLoad(options) {
-			// let queryArray = decodeURIComponent(options.arr);
-			// this.idsList = JSON.parse(queryArray);
+			let queryArray = decodeURIComponent(options.arr);
+			this.idsList = JSON.parse(queryArray);
 
-			console.log(this.idsList)
+	
+			this.getList()
 
 		},
 
@@ -116,13 +115,21 @@
 				console.log(this.idsList)
 			},
 
-			groupChange(n) {
-				console.log('groupChange', n);
+			getList() {
+				workorderList(this.idsList).then(res => {
+					this.List = res
+				})
 			},
-			
+
 			handleUserChange(e) {
 				console.log(e)
-			}
+			},
+
+			addPicking() {
+              uni.navigateTo({
+              	url: '/pages/pda/picking/add'
+              })
+			},
 
 		},
 
@@ -150,7 +157,7 @@
 
 		.card_box {
 			padding: 16rpx 24rpx;
-			
+
 
 		}
 
@@ -253,25 +260,26 @@
 						flex-grow: 1 !important;
 
 					}
-					
-					.content_num{
+
+					.content_num {
 						display: flex;
 						align-items: center;
-						padding:0 4rpx;
-						/deep/ .uni-input-input{
+						padding: 0 4rpx;
+
+						/deep/ .uni-input-input {
 							border: 2rpx solid #F0F8F2;
-							background:#F0F8F2;
+							background: #F0F8F2;
 							color: $theme-color;
 						}
-						
-						.unit{
-							 padding: 0 4rpx;
-							 font-size: 24rpx;
-							 color: #404446;
+
+						.unit {
+							padding: 0 4rpx;
+							font-size: 24rpx;
+							color: #404446;
 						}
 					}
-					
-					
+
+
 
 					&:last-child {
 						border-bottom: none;

pages/pda/workOrder/extrusionMolding/index.vue

@@ -216,7 +216,7 @@
 				let url  
 				if(type == 'picking') {
 				url = '/pages/pda/picking/details'
-				let _arr = JSON.stringify([{id: this.info.id, code: this.info.code }])
+				let _arr = JSON.stringify([ this.info.id ])
 				url += `?arr=${encodeURIComponent(_arr)}&taskId=${this.info.taskId}`
 				uni.navigateTo({
 					url