优化

pages/pda/common.js

@@ -33,6 +33,30 @@ export const tableHeader = selectEquiType => {
 					}
 				}
 			]
+
+
+
+		case 4:
+			return [{
+					label: '规格',
+					prop: 'specification'
+				},
+
+				{
+					label: '型号',
+					prop: 'modelType'
+				},
+
+				{
+					label: '工位',
+					prop: 'workstationName'
+				},
+
+
+
+			]
+
+
 		case 5:
 			return [{
 					label: '牌号',
@@ -135,22 +159,22 @@ export const tableHeader = selectEquiType => {
 
 
 			]
-			
-			case 13:
-				return [
+
+		case 13:
+			return [
 
 				{
 					label: '规格',
 					prop: 'specification'
 				},
-			
+
 				{
 					label: '型号',
 					prop: 'modelType'
 				},
-			
-				]
-			
+
+			]
+
 
 		case 14:
 			return []

pages/pda/feeding/components/instanceBom.vue

@@ -100,7 +100,7 @@
 			}
 		},
 		created() {
-			console.log(11,this.list)
+		
 		},
 		methods: {
 			tableH(type) {

pages/pda/feeding/details.vue

@@ -15,7 +15,8 @@
 						:list='item.equipmentList' @scanIt='scanIt'></deviceBom>
 
 
-					<productsBom v-if="item.product != null && item.product != '{}'" :productsObj="item.product"></productsBom>
+					<productsBom v-if="item.product != null && item.product != '{}'" :productsObj="item.product">
+					</productsBom>
 
 					<modelBom v-if='item.modelList.length != 0' :workOrderId='item.workOrderId' :list='item.modelList'
 						@scanIt='scanIt'>
@@ -34,12 +35,12 @@
 					<packingBom v-if='item.packingList.length != 0' :list='item.packingList'></packingBom>
 
 
-                 	<view class='flex_btn'  @click="openDetails(item.workOrderId)">出库单</view>
+					<view class='flex_btn' @click="openDetails(item.workOrderId)">出库单</view>
 
 
 
 					<view class="operate_box rx-sc">
-					
+
 
 						<u-button size="small" class="u-reset-button" type="success"
 							@click="handAdd(item.workOrderId)">手动添加</u-button>
@@ -172,6 +173,17 @@
 			scrolltolower() {},
 
 			save() {
+			
+				this.List.forEach(f => {
+					f.instanceList.forEach(e => {
+						if (Object.prototype.hasOwnProperty.call(e, 'type')) {
+							e.extInfo['type'] = e.type
+						}
+						e.extInfo['isConsumable'] = e.isConsumable
+					})
+				})
+
+
 
 
 				batchSave(this.List).then(res => {
@@ -219,11 +231,11 @@
 						m.quality == '' ? m.quality = {} : ''
 
 
-                       if(!Object.prototype.hasOwnProperty.call(m, 'product')) {
-						    m.product  = '{}'
-					   }
-					   
-					   console.log(m)
+						if (!Object.prototype.hasOwnProperty.call(m, 'product')) {
+							m.product = '{}'
+						}
+
+						console.log(m)
 
 
 
@@ -283,7 +295,7 @@
 
 						this.List = _arr
 						this.$forceUpdate()
-						
+
 
 
 					})
@@ -445,9 +457,9 @@
 				})
 			},
 
-		
-			
-			
+
+
+
 			openDetails(id) {
 				const storageKey = Date.now() + "";
 				uni.setStorageSync(storageKey, this.List || []);
@@ -511,13 +523,13 @@
 			width: 160rpx;
 		}
 	}
-	
-	
-	
-	
+
+
+
+
 	.flex_btn {
 		position: fixed;
-	
+
 		right: 0;
 		bottom: 160rpx;
 		width: 140rpx;

pages/pda/feeding/single.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="content-box">
-		<uni-nav-bar fixed="true" statusBar="true" left-icon="back" title="投料单" background-color="#F7F9FA"
+		<uni-nav-bar fixed="true" statusBar="true" left-icon="back" title="出库单" background-color="#F7F9FA"
 			color="#404446" @clickLeft="back"></uni-nav-bar>
 
 		<view class="list_box">

pages/pda/jobBooking/components/oneJobBom.vue

@@ -95,11 +95,9 @@
 					<view class="item ww25">报工重量kg</view>
 					<view class="item ww25" v-if="['CVI', 'PIP' ].includes(taskTypeName)">质检结果
 					</view>
-					<view class="item ww25" v-if="['CVI', 'PIP' ].includes(taskTypeName)">处置
+					<view class="item ww25":class="[  ['CVI', 'PIP' ].includes(taskTypeName) ? 'ww25' : 'ww50' ]">处置
 					</view>
 
-					<view class="item ww50" v-if="!['CVI', 'PIP' ].includes(taskTypeName)">处置
-					</view>
 				</view>
 
 				<view class="table">
@@ -114,12 +112,13 @@
 							v-if="['CVI', 'PIP' ].includes(taskTypeName)">
 							<view class="numerate">点击计算</view>
 						</view>
-						<view class="item ww25" v-if="['CVI', 'PIP' ].includes(taskTypeName)">
+						
+						
+					<!-- 	<view class="item ww25" v-if="['CVI', 'PIP' ].includes(taskTypeName)">
 							{{it.extInfo.taskName }}
-						</view>
-
+						</view> -->
 
-						<view class="item ww50" v-if="!['CVI', 'PIP' ].includes(taskTypeName)">
+						<view class="item " :class="[  ['CVI', 'PIP' ].includes(taskTypeName) ? 'ww25' : 'ww50' ]">
 							<zxz-uni-data-select :localdata="stepsList" v-model="it.extInfo.taskId" dataValue='taskId'
 								format='{taskTypeName}' dataKey="taskId" filterable
 								:clear='false'></zxz-uni-data-select>

pages/pda/workOrder/search/index.vue

@@ -39,7 +39,7 @@
 						<view class="listBox-con">
 							<view class="listBox-top rx-bc">
 								<view> {{ item.name }}</view>
-								<view class="code">{{ item.code}}</view>
+								<view class="code">{{  item.rootCategoryLevelId == 4 ?  item.codeNumber :  item.code}} </view>
 							</view>
 
 							<view class="listBox-bottom rx">
@@ -52,10 +52,16 @@
 
 
 								<view class="items"
-									v-if='item.rootCategoryLevelId != 11 '>
+									v-if='item.rootCategoryLevelId != 11 && item.rootCategoryLevelId != 4 '>
 									<text>可用库存</text>{{ item.availableCountBase }} {{item.unit}}
 								</view>
 								
+								<view class="items"
+									v-if=' item.rootCategoryLevelId == 4 '>
+									<text>状态</text>{{ stateList[Number(item.runStatus)] }} 
+								</view>
+								
+								
 						<!-- 		<view class="items"
 									v-if='item.rootCategoryLevelId == 1 '>
 									<text>包装库存</text>{{ item.packingCountBase }} {{item.minUnit}}
@@ -76,7 +82,6 @@
 
 
 
-
 							</view>
 
 						</view>
@@ -204,6 +209,8 @@
 				warehouseList: [],
 
 				searchShow: false,
+				
+				stateList: ['启动', '空闲',  '运行' ,'故障', '检修', '停机', '待料', '占用'],
 
 
 
@@ -412,6 +419,7 @@
 
 
 					isEnd = this.list.length >= res.count
+			
 
 				})