22

pages/pda/common.js

@@ -132,23 +132,17 @@ export const tableHeader = selectEquiType => {
 					label: '型号',
 					prop: 'modelType'
 				},
+				
 				{
 					label: '槽数',
-					prop: 'slotNum'
-				},
-
-
-				{
-					label: '长宽高',
 					prop: '',
 					formatter(row) {
-						if (!row?.extInfo) return ''
-						const extendField = row.extInfo
-						return `${extendField.palletLen || '-'}*${extendField.wilde || '-'}*${
-              extendField.hight || '-'
-            }`
+						return row.extInfo.slotNum
 					}
 				},
+				
+			
+
 
 			]
 		case 10:

pages/pda/feeding/components/palletBom.vue

@@ -12,7 +12,7 @@
 
 			<view class='content_table' v-for="(item,index) in palletList" :key='index'>
 				<view class="item">
-					<view class="lable rx-cc">code</view>
+					<view class="lable rx-cc">编码</view>
 					<view class="content ">
 					 {{item.code}}
 					</view>
@@ -35,7 +35,7 @@
 					</view>
 				</view>
 				
-				<view class="item">
+				<view class="item" v-if="isDetails">
 					<view class="lable rx-cc">仓库</view>
 					<view class="content">
 					{{item.pathName || item.positionVO && item.positionVO[0].pathName}}
@@ -45,7 +45,7 @@
 				<view class="item">
 					<view class="lable rx-cc">数量</view>
 					<view class="content content_num">
-						<input class="uni-input" v-model="item.feedQuantity || 1" type='digit' :disabled="isDetails"></input>
+						<input class="uni-input" v-model="item.extInfo.formedNum" type='digit' :disabled="isDetails"></input>
 					</view>
 				</view>
 
@@ -92,8 +92,6 @@
 	
 			
 			
-			
-			
 	
 			
 			

pages/pda/feeding/components/revolvingDiskBom.vue

@@ -14,7 +14,7 @@
 
 			<view class='content_table'>
 				<view class="item">
-					<view class="lable rx-cc">code</view>
+					<view class="lable rx-cc">编码</view>
 					<view class="content ">
 						{{item.code}}
 					</view>
@@ -36,8 +36,9 @@
 						{{item.modelType}}
 					</view>
 				</view>
-
-				<view class="item">
+     
+		
+        		<view class="item" v-if="pattern != 'job'">
 					<view class="lable rx-cc">仓库</view>
 					<view class="content">
 						{{item.pathName || item.positionVO && item.positionVO[0].pathName}}
@@ -47,8 +48,8 @@
 				<view class="item">
 					<view class="lable rx-cc">数量</view>
 					<view class="content content_num">
-						<!-- <input class="uni-input" v-model="item.feedQuantity" type='digit' ></input> -->
-						{{ item.feedQuantity || 1}}
+						<input class="uni-input" v-model="item.extInfo.formedNum" type='digit' ></input>
+					
 					</view>
 				</view>
 
@@ -67,6 +68,11 @@
 			revolvingDiskList: {
 				type: Array,
 				default: () => []
+			},
+			
+			pattern: {
+				type: String,
+				default: ''
 			}
 		},
 

pages/pda/jobBooking/components/palletBom.vue

@@ -10,16 +10,19 @@
 		<view class="material ">
 
 			<view class='content_table' v-for="(item,index) in palletList" :key='index'>
+				<view class="item">
+					<view class="lable rx-cc">编码</view>
+					<view class="content ">
+						{{item.code}}
 
+					</view>
+				</view>
 
 				<view class="item">
 					<view class="lable rx-cc">舟皿名称</view>
 					<view class="content ">
-						<zxz-uni-data-select :localdata="boatList" v-model="item.categoryId" dataValue='id'
-							format='{name}-{code}' dataKey="code" filterable :clear='false'
-							@change='inputChange'></zxz-uni-data-select>
+						{{item.name}}
 
-						<view v-if="isDetails">{{item.code }} </view>
 					</view>
 				</view>
 
@@ -31,19 +34,15 @@
 				</view>
 
 				<view class="item">
-					<view class="lable rx-cc">舟皿数量</view>
+					<view class="lable rx-cc">数量</view>
 					<view class="content content_num">
-						<input class="uni-input" v-model="item.quantity " type='digit' :disabled="isDetails"></input>
+						<input class="uni-input" v-model="item.extInfo.formedNum " type='digit'
+							:disabled="isDetails"></input>
 					</view>
 				</view>
 
 
-				<view class="item" v-if="item.hideKc">
-					<view class="lable rx-cc">库存</view>
-					<view class="content content_num">
-						{{ packingCountBase }} {{item.unit}}
-					</view>
-				</view>
+
 
 
 			</view>
@@ -58,7 +57,7 @@
 <script>
 	import {
 
-		realTimeInventory,
+
 	} from '@/api/pda/workOrder.js'
 
 	export default {
@@ -83,54 +82,17 @@
 		},
 
 		created() {
-			this.getInventoryList()
+
 		},
 
 		methods: {
-			getInventoryList() {
-				let param = {
-					categoryLevelId: 8,
-					dimension: 1,
-					pageNum: 1,
-					size: -1,
-				}
-				realTimeInventory(param).then(res => {
-					this.boatList = res.list
-				})
-			},
 
 
 
 
 
-			inputChange(e) {
-				this.$set(this.palletList[0], 'categoryId', e.id)
-				this.$set(this.palletList[0], 'code', e.code)
-				this.$set(this.palletList[0], 'name', e.name)
-				this.$set(this.palletList[0], 'specification', e.specification)
-				this.$set(this.palletList[0], 'categoryId', e.id)
-				this.$set(this.palletList[0], 'brandNum', e.brandNum)
-				this.$set(this.palletList[0], 'modelType', e.modelType)
-				this.$set(this.palletList[0], 'quantity', e.quantity)
-				this.$set(this.palletList[0], 'unit', e.unit)
 
 
-				if (Object.prototype.hasOwnProperty.call(e, 'packingCountBase')) {
-					this.packingCountBase = e.packingCountBase
-					this.$set(this.palletList[0], 'hideKc', true)
-
-				}
-
-
-
-
-
-				this.$forceUpdate()
-
-
-
-			},
-
 
 
 

pages/pda/jobBooking/index/index.vue

@@ -27,7 +27,7 @@
 
 					<palletBom v-if="objData.palletList.length != 0" :palletList='objData.palletList'></palletBom>
 
-					<revolvingDiskBom v-if="isLoad && objData.revolvingDiskList.length > 0"
+					<revolvingDiskBom v-if="isLoad && objData.revolvingDiskList.length > 0" pattern='job'
 						:revolvingDiskList="objData.revolvingDiskList"></revolvingDiskBom>
 
 					<!-- 	<oneJobBom
@@ -829,6 +829,9 @@
 				}
 
 				getCache(parma).then(res => {
+					if(!res) {
+						return false;
+					}
 					this.objData['product'] = res.extInfo.product
 					this.objData['workReportInfo'] = res.extInfo.workReportInfo
 					this.objData['notFormedList'] = res.extInfo.notFormedList

pages/pda/workOrder/index/details.vue

@@ -14,6 +14,11 @@
 					</view>
 
 					<workOrderBom :item='objData' v-if='objData' :isDetails='true'></workOrderBom>
+					
+					
+					<jobBom :item='objData' v-if="objData.notFormedList" :palletList='objData.palletList'
+						:notFormed='objData.notFormedList' :isDetails='true'></jobBom>
+						
 
 					<deviceBom v-if='objData.equipmentList.length != 0' :list='objData.equipmentList'></deviceBom>
 
@@ -25,13 +30,11 @@
 					<sampleBom :item='objData.quality' v-if='objData.quality && taskType == 2'
 						:workReportInfo='objData.workReportInfo' :isDetails='true'></sampleBom>
 
-					<jobBom :item='objData' v-if="objData.notFormedList" :palletList='objData.palletList'
-						:notFormed='objData.notFormedList' :isDetails='true'></jobBom>
 
 					<palletBom v-if="objData.palletList.length != 0" :palletList='objData.palletList' :isDetails='true'>
 					</palletBom>
 
-					<revolvingDiskBom v-if="objData.revolvingDiskList.length > 0"
+					<revolvingDiskBom v-if="objData.revolvingDiskList.length > 0"  pattern='job'
 						:revolvingDiskList="objData.revolvingDiskList"></revolvingDiskBom>
 
 					<oneJobBom v-if='objData.instanceList &&  objData.instanceList.length != 0 & taskType != 6'
@@ -125,6 +128,7 @@
 	import qualityStat from '../../sample/components/qualityStat.vue'
 	import sampleBom from '../../sample/components/sampleBom.vue'
 	import palletBom from '../../feeding/components/palletBom.vue'
+	
 	import revolvingDiskBom from '../../feeding/components/revolvingDiskBom.vue'
 	import packingTgBom from '../../jobBooking/components/packingTgBom.vue'
 	import packingBom from '../../jobBooking/components/packingBomDetails.vue'

pages/pda/workOrder/search/index.vue

@@ -83,7 +83,7 @@
 								</view>
 
 
-								<view class="items" v-if='item.rootCategoryLevelId == 1 || item.rootCategoryLevelId == 23'>
+								<view class="items" v-if='[1, 23, 8].includes(Number(item.rootCategoryLevelId))'>
 									<text>包装库存</text>{{ item.packingCountBase }} {{item.minUnit}}
 								</view>
 								
@@ -192,7 +192,6 @@
 
 
 
-
 					</u-form>
 
 				</view>