优化

pages/pda/common.js

@@ -12,7 +12,7 @@ export const tableHeader = selectEquiType => {
 					prop: 'specification'
 				},
 				{
-					label: '包装库存数量',
+					label: '包装库存',
 					prop: '',
 					formatter(row) {
 						return `${row.availableCountBase || '0'}/${row.minUnit || ''}`

pages/pda/feeding/components/instanceBom.vue

@@ -17,7 +17,7 @@
 				</view>
 				
 				<view class="item"  >
-					<view class="lable rx-cc">包装库存数量</view>
+					<view class="lable rx-cc">包装库存</view>
 					<view class="content">{{ mate.availableCountBase }}/ {{ mate.minUnit}}</view>
 				</view>
 

pages/pda/feeding/details.vue

@@ -430,7 +430,7 @@
 				const storageKey = Date.now() + "";
 				uni.setStorageSync(storageKey, this.List || []);
 				uni.navigateTo({
-					url: `/pages/pda/workOrder/search/index?id=${id}&storageKey=${storageKey}&isType=feed`
+					url: `/pages/pda/workOrder/search/index?id=${id}&storageKey=${storageKey}&isType=feed&taskId=${this.taskId}`
 				})
 			},
 

pages/pda/jobBooking/index/index.vue

@@ -397,7 +397,7 @@
 				const storageKey = Date.now() + "";
 				uni.setStorageSync(storageKey, this.objData || {});
 				uni.navigateTo({
-					url: `/pages/pda/workOrder/search/index?storageKey=${storageKey}&isType=job`
+					url: `/pages/pda/workOrder/search/index?storageKey=${storageKey}&isType=job&taskId=${this.taskId}`
 				})
 			},
 

pages/pda/workOrder/search/index.vue

@@ -156,6 +156,7 @@
 				memoList: [],
 
 				isType: null,
+				taskId: null,
 
 				pid: null, // 上个页面id
 				storageKey: null,
@@ -175,6 +176,7 @@
 		onLoad(option) {
 			this.pid = option.id
 			this.isType = option.isType
+			this.taskId = option.taskId
 			if (option.storageKey) {
 				this.storageKey = option.storageKey
 
@@ -293,6 +295,7 @@
 					keyWord: this.keyWord,
 					pageNum: this.page,
 					size: 100,
+					taskId: this.taskId
 
 				}
 
@@ -326,7 +329,6 @@
 										rootCategoryLevelId: e.rootCategoryLevelId,
 										...i,
 										instanceId: i.id,
-
 									}
 									this.list.push(obj)