ysy hace 2 años
padre
commit
b2327aba1d

+ 10 - 1
api/pda/picking.js

@@ -15,7 +15,6 @@ export async function batchSave(params) {
 
 
 // 统计领料数量
-
 export async function pickStatistics() {
   const data = await postJ(
    Vue.prototype.apiUrl  + `/pda/mes/workorder/pickStatistics`, {}, true,
@@ -27,4 +26,14 @@ export async function pickStatistics() {
 }
 
 
+// 领料单详细信息
+export async function pickDetails(params) {
+  const data = await postJ(
+   Vue.prototype.apiUrl  + `/pda/mes/pickorder/list`, params, true,
+  );
+  if (data.code == 0) {
+    return data.data;
+  }
+  return Promise.reject(data.message);
+}
 

+ 26 - 31
pages/pda/picking/bill/index.vue

@@ -71,7 +71,6 @@
 
 		<view class="bottom-wrapper">
 			<view class="btn_box" @click="save">一键报工</view>
-
 		</view>
 
 
@@ -85,6 +84,10 @@
 	import {
 		workorderPage
 	} from '@/api/pda/workOrder.js'
+
+	import {
+		pickDetails
+	} from '@/api/pda/picking.js'
 	let [isEnd] = [false]
 	export default {
 		components: {
@@ -94,26 +97,26 @@
 			return {
 				page: 1,
 				size: 5,
+				ids: [],
 				dataList: [],
 
-
-
 			}
 		},
-		onShow() {
+
+
+		onLoad(option) {
+			this.ids = [option.id]
 			this.getList()
 		},
+
+
+
 		methods: {
 			async getList() {
-				let params = {
-					pageNum: this.page,
-					size: this.size,
-					status: [4, 5, 6, 7],
-					...this.searchFrom
-				}
+		
 
 				isEnd = false
-				const res = await workorderPage(params)
+				const res = await pickDetails(this.ids)
 				console.log(res)
 
 				if (params.page === 1) {
@@ -136,15 +139,6 @@
 
 
 
-			handleDetail(item) {
-				let url = '/pages/pda/workOrder/extrusionMolding/index'
-				url += `?id=${item.id}&title=${item.taskName}`
-				console.log(url)
-				uni.navigateTo({
-					url
-				})
-
-			},
 
 			tableH(type) {
 				return tableHeader(type)
@@ -201,7 +195,8 @@
 
 
 		.title_box {
-				width: 702rpx;
+			width: 702rpx;
+
 			.round {
 				width: 32rpx;
 				height: 32rpx;
@@ -222,16 +217,16 @@
 				color: $theme-color;
 			}
 		}
-		
-		
-		.word_order{
-		  height: 64rpx;
-		  width: 750rpx;
-		  background:  $theme-color;
-		  font-size: 28rpx;
-		  color: #fff;
-		  line-height: 64rpx;
-		  padding-left: 40rpx;
+
+
+		.word_order {
+			height: 64rpx;
+			width: 750rpx;
+			background: $theme-color;
+			font-size: 28rpx;
+			color: #fff;
+			line-height: 64rpx;
+			padding-left: 40rpx;
 		}
 
 		.content_table {

+ 2 - 0
pages/pda/picking/index/index.vue

@@ -92,6 +92,8 @@
 		},
 
 		onShow() {
+			this.page = 1
+				this.dataList = []
 			this.getList()
 			this.getpickTics()
 		},

+ 1 - 1
pages/pda/workOrder/extrusionMolding/index.vue

@@ -5,7 +5,7 @@
 
 
 		<view class="top-wrapper cx">
-			<stepsNav  :stepsList="stepsList" :taskId="info.taskId"></stepsNav>
+			<stepsNav  v-if='info.taskId && stepsList.length' :stepsList="stepsList" :taskId="info.taskId"></stepsNav>
 
 			<view class="tab_box rx-sc">
 				<view class="tab_item" :class="{active: tabType == 1}" @click="handTab(1)">基本信息</view>