优化

pages/pda/common.js

@@ -18,7 +18,7 @@ export const tableHeader = selectEquiType => {
 						return `${row.availableCountBase || '0'}/${row.minUnit || ''}`
 					}
 				},
-				
+
 				{
 					label: '计量库存数量',
 					prop: '',
@@ -44,13 +44,28 @@ export const tableHeader = selectEquiType => {
 				{
 					label: '芯棒直径',
 					prop: 'mandrelDiameter',
-					
+
 				},
 				{
 					label: '收缩系数',
 					prop: 'shrinkEffictive',
 
 				},
+				{
+					label: '冲压次数',
+					prop: '',
+					formatter(row) {
+						return row.extInfo.startCyTimes || 0
+					}
+				},
+				
+				{
+					label: '最大冲压次数',
+					prop: '',
+					formatter(row) {
+						return row.extInfo.maxCyTimes
+					}
+				}
 			]
 
 
@@ -104,7 +119,8 @@ export const tableHeader = selectEquiType => {
               extendField.hight || '-'
             }`
 					}
-				}
+				},
+				
 			]
 		case 10:
 			return []

pages/pda/feeding/components/feedBom.js

@@ -37,11 +37,19 @@ export const tableHeader = selectEquiType => {
 				},
 
 				{
-					label: '冲压次数',
+					label: '本次冲压数',
 					prop: 'cyTimes',
 					write: false,
 					extInfo: true
 				},
+				{
+					label: '冲压次数',
+					prop: 'startCyTimes',
+					write: false,
+					extInfo: true
+				},
+				
+				
 
 				{
 					label: '最大冲压次数',

pages/pda/picking/details.vue

@@ -75,6 +75,8 @@
 					<view>
 						<instanceBom :list='item.instanceList'></instanceBom>
 
+
+
 						<modelBom v-if='item.modelList.length != 0' :workOrderId='item.workOrderId'
 							:list='item.modelList'>
 						</modelBom>
@@ -220,7 +222,7 @@
 				let arr = [...item.instanceList, ...item.modelList]
 				uni.setStorageSync(storageKey, arr);
 				uni.navigateTo({
-					url: `/pages/pda/workOrder/search/index?id=${id}&storageKey=${storageKey}&isType=pick`
+					url: `/pages/pda/workOrder/search/index?id=${id}&storageKey=${storageKey}&isType=pick&taskId=${this.taskId}`
 				})
 			},