优化

pages.json

@@ -1456,6 +1456,14 @@
 				"navigationStyle": "custom",
 				"navigationBarTextStyle": "white"
 			}
+		},
+		{
+			"path" : "pages/pda/workOrder/index/details",
+			"style" : 
+			{
+		"navigationStyle": "custom",
+		"navigationBarTextStyle": "white"
+			}
 		}
 
 

pages/pda/picking/bill/components/instanceBom.vue

@@ -4,7 +4,7 @@
 
 		<view class="material rx-ss" v-for="(mate, idx) in list">
 
-			<view class="content_table" >
+			<view class="content_table">
 				<view class="item">
 					<view class="lable rx-cc">编码</view>
 					<view class="content">
@@ -21,7 +21,7 @@
 				<view class="item" v-for="(itm, index) in tableH(mate.rootCategoryLevelId)" :key="index"
 					v-if="!itm.formatter">
 					<view class="lable rx-cc">{{ itm.label }}</view>
-					<view class="content"  > {{ mate[itm.prop] }}</view>
+					<view class="content"> {{ mate[itm.prop] }}</view>
 
 				</view>
 

pages/pda/picking/bill/index.vue

@@ -7,8 +7,8 @@
 		<view class="list_box">
 
 			<u-list @scrolltolower="scrolltolower" key="dataList">
-				
-	
+
+
 
 				<view class="card_box cx-sc" v-for="(item, index) in dataList" :key="index">
 
@@ -23,7 +23,7 @@
 
 					<view v-for="(it,idx) in item.orderInfoList" :key='idx'>
 						<view class="word_order ">工单编号:{{it.code}}</view>
-						
+
 						<view v-if='it.arr.length == 0' style='margin-top: 10px;'>
 							<u-empty iconSize='80' textSize='32' text='未领料'>
 							</u-empty>
@@ -95,26 +95,26 @@
 
 
 				const res = await pickDetails(this.ids)
-                 	let list = res
-					list.forEach(m => {
-						if(m.orderInfoList.length > 0) {
-							m.orderInfoList.forEach(o => {
-									let _arr = []
-									 _arr = [...o.bomDetailDTOS, ...o.instanceList]
-									_arr = _arr.sort((a, b) => a.rootCategoryLevelId - b.rootCategoryLevelId)
-									o['arr'] = _arr
-								
-							})
-						
-	
-						
-						} 
-					})
-					this.dataList = list
-					
-					
-
-		
+				let list = res
+				list.forEach(m => {
+					if (m.orderInfoList.length > 0) {
+						m.orderInfoList.forEach(o => {
+							let _arr = []
+							_arr = [...o.bomDetailDTOS, ...o.instanceList]
+							_arr = _arr.sort((a, b) => a.rootCategoryLevelId - b.rootCategoryLevelId)
+							o['arr'] = _arr
+
+						})
+
+
+
+					}
+				})
+				this.dataList = list
+
+
+
+
 
 			},
 

pages/pda/picking/components/boatBom.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view class="title_box rx-bc">
+		<view class="title_box rx-bc" v-if='newList.length'>
 			<view class="name">舟皿信息</view>
 		</view>
 

pages/pda/picking/components/modelBom.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view class="title_box rx-bc">
+		<view class="title_box rx-bc" v-if='newList.length'>
 			<view class="name">模具信息</view>
 
 
@@ -16,14 +16,14 @@
 			<view class="content_table">
 
 				<view class="item " v-for="(tab, tIdx) in tableH(5)" :key="tIdx">
-					
+
 					<view class="item " v-if="Array.isArray(tab.prop) && item.automatic == 2">
 						<view class="lable lable300 rx-sc"> {{ item[tab.prop[0]]  }}</view>
 						<view class="content">
 							{{ item[tab.prop[1]]  }}
 						</view>
 					</view>
-					
+
 					<view class="item " v-if="Array.isArray(tab.prop) && item.automatic == 1">
 						<view class="lable lable300 rx-sc"> {{ item['name']  }}</view>
 						<view class="content">
@@ -101,7 +101,7 @@
 
 			getDelete(idx) {
 				this.newList.splice(idx, 1)
-				this.$emit('hendDel', 'modelBom',  this.code, this.newList)
+				this.$emit('hendDel', 'modelBom', this.code, this.newList)
 			},
 
 

pages/pda/workOrder/extrusionMolding/index.vue

@@ -5,10 +5,12 @@
 
 
 		<view class="top-wrapper cx">
-			<stepsNav v-if='info.taskId && stepsList.length' :stepsList="stepsList" :taskId="info.taskId" @selectStep='selectStep'></stepsNav>
+			<stepsNav v-if='info.taskId && stepsList.length' :stepsList="stepsList" :taskId="info.taskId"
+				@selectStep='selectStep'></stepsNav>
 			<view class="tab_box rx-sc">
 				<view class="tab_item" :class="{active: tabType == 1}" @click="handTab(1)">基本信息</view>
 				<view class="tab_item" :class="{active: tabType == 2}" @click="handTab(2)">生产明细</view>
+				<view class="tab_item" :class="{active: tabType == 3}" @click="handTab(3)">详情</view>
 			</view>
 		</view>
 
@@ -131,10 +133,16 @@
 				</view>
 			</u-list>
 
+			<u-list @scrolltolower="scrolltolower" key="btnDeatils" v-if="tabType == 3">
+				<view style="margin-top: 15px;">
+					<button class="search_btn" @click="handleDetails">报工详情</button>
+				</view>
+			</u-list>
+
 		</view>
 
 		<view class="bottom-wrapper">
-			<bottomOperate state='1' @operate='operate' ></bottomOperate>
+			<bottomOperate state='1' @operate='operate'></bottomOperate>
 		</view>
 
 	</view>
@@ -171,11 +179,11 @@
 				produceList: [],
 
 				feedAllow: true,
-				
+
 				currentTaskId: null,
 				currentTaskName: null,
-				
-			
+
+
 			}
 		},
 
@@ -212,16 +220,16 @@
 
 			getSteps() {
 				getTaskInstanceList(this.id).then(res => {
-					
-				// for(let i = 0; i < res.length; i++) {
-				// 	if(res[i].taskTypeName == '自然干燥' ||res[i].taskTypeName == '升温干燥') {
-				// 		res[i - 1].btns = [ { name: '更换周转车', type: 'turnover'}]
-				// 	}
-				// }
+
+					// for(let i = 0; i < res.length; i++) {
+					// 	if(res[i].taskTypeName == '自然干燥' ||res[i].taskTypeName == '升温干燥') {
+					// 		res[i - 1].btns = [ { name: '更换周转车', type: 'turnover'}]
+					// 	}
+					// }
 					this.stepsList = res
-					
-				
-					
+
+
+
 				})
 			},
 
@@ -229,7 +237,7 @@
 				workorderInfo(this.id).then(res => {
 					this.info = res
 					this.taskId = res.taskId
-					
+
 					this.feedStatus()
 					uni.hideLoading();
 				}).catch(() => {
@@ -239,16 +247,16 @@
 
 
 			feedStatus() {
-                 let taskId = this.currentTaskId || this.taskId
+				let taskId = this.currentTaskId || this.taskId
 				checkStatus(this.id, taskId).then(res => {
 					this.feedAllow = res
 				})
 			},
-			
+
 			selectStep(item) {
 				this.currentTaskId = item.taskId
-				this.currentTaskName  = item.taskTypeName
-				
+				this.currentTaskName = item.taskTypeName
+
 				this.feedStatus()
 			},
 
@@ -291,15 +299,15 @@
 							icon: "none",
 						})
 					}
-			
+
 				} else if (type == 'turnover') {
 					url = '/pages/pda/turnover/index/index'
 					url += `?workOrderId=${this.info.id}&taskId=${taskId }&taskName=${taskName}`
 					uni.navigateTo({
 						url
 					})
-			
-			
+
+
 				}
 
 			},
@@ -310,6 +318,17 @@
 					this.produceList = res.produceDetail
 				})
 			},
+
+			handleDetails() {
+				let taskId = this.currentTaskId || this.taskId
+				let taskName = this.currentTaskName || this.info.taskName
+				let url = '/pages/pda/workOrder/index/details'
+				url += `?id=${this.info.id}&taskId=${taskId }&taskName=${taskName}`
+				uni.navigateTo({
+					url
+				})
+
+			},
 		}
 	}
 </script>
@@ -424,4 +443,16 @@
 
 
 	.bottom-wrapper {}
+
+	.search_btn {
+		width: 240rpx;
+		height: 70rpx;
+		line-height: 70rpx;
+		padding: 0 24rpx;
+		background: $theme-color;
+		font-size: 32rpx;
+		color: #fff;
+		margin: 0;
+		margin-left: 26rpx;
+	}
 </style>

pages/pda/workOrder/index/details.vue

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

pages/pda/workOrder/search/index.vue

@@ -51,8 +51,6 @@
 
 
 
-
-
 								<view class="items"
 									v-if='item.rootCategoryLevelId != 11 && item.rootCategoryLevelId != 1'>
 									可用库存：{{ item.packingCountBase }} {{item.unit}}
@@ -66,7 +64,6 @@
 
 
 
-
 								<view class="items" v-if='item.rootCategoryLevelId == 11'>
 									位置：{{ item.region }}
 								</view>
@@ -307,7 +304,7 @@
 				if (this.isType == 'feed') {
 					params.ids = [1, 4, 5, 8, 10, 11, 14]
 				} else if (this.isType == 'pick') {
-					params.ids = [1, 5,  8, 10, 14]
+					params.ids = [1, 5, 8, 10, 14]
 				} else if (this.isType == 'job') {
 					params['ids'] = [4, 7]
 				}