55

pages/pda/feeding/single.js

@@ -1,6 +1,6 @@
 export const tableHeader = selectEquiType => {
 
-	// 1：物料；4：生产设备; 5：模具；6：备品备件; 7：周转车；8：舟皿；9：产品；10：消耗材料，11：干燥区，12.质检，13.包装材料，14.工装夹具 ，15.刀具 ,99.其他
+	// 1：物料； 2在制品 ；4：生产设备; 5：模具；6：备品备件; 7：周转车；8：舟皿；9：产品；10：消耗材料，11：干燥区，12.质检，13.包装材料，14.工装夹具 ，15.刀具 ,99.其他
 	switch (+selectEquiType) {
 		case 1:
 			return [{
@@ -19,6 +19,24 @@ export const tableHeader = selectEquiType => {
 
 
 			]
+			
+			case 2:
+				return [{
+						label: '型号',
+						prop: 'modelType'
+					},
+					{
+						label: '规格',
+						prop: 'specification'
+					},
+			
+					{
+						label: '牌号',
+						prop: 'brandNum'
+					},
+			
+			
+				]
 		case 5:
 			return [{
 					label: '牌号',

pages/pda/feeding/single.vue

@@ -41,16 +41,15 @@
 									class="items" v-if="!itm.formatter">
 									<text>{{ itm.label }}</text>{{ item[itm.prop] }}
 								</view>
-								
-								
+							
 								<view 
-								v-if="[1, 9].includes(item.rootCategoryLevelId)"
+								v-if="[1,2, 9].includes(item.rootCategoryLevelId)"
 									class="items">
 									<text>物料代号</text> {{item.extInfo.materielCode }}
 								</view>
 								
 								<view
-									v-if="[1, 9].includes(item.rootCategoryLevelId)"
+									v-if="[1,2, 9].includes(item.rootCategoryLevelId)"
 									class="items">
 									<text>刻码</text> {{item.extInfo.engrave }}
 								</view>

pages/pda/jobBooking/components/semiProductJobBom.vue

@@ -141,7 +141,7 @@
 				<view class="table">
 					<view class="tr row rx-sc">
 						
-						<view class="item ww25" v-if="Object.prototype.hasOwnProperty.call(it.extInfo, 'newWeight')">
+					<view class="item ww25" v-if="Object.prototype.hasOwnProperty.call(it.extInfo, 'newWeight') &&  it.extInfo.newWeight">
 					       {{ it.extInfo.newWeight }} 
 					</view>
 						

pages/pda/jobBooking/components/semiProductJobBomPL.vue

@@ -38,7 +38,6 @@
 						<view class="content rx-bc">
 
 							<view>{{it.name}} <text v-if="[2, 23,9,28].includes(Number(it.rootCategoryLevelId))">
-
 									({{it.rootCategoryLevelId == 2 ? '在制品' :  it.rootCategoryLevelId == 23 ? '半成品' :  it.rootCategoryLevelId == 9 ? '产品' :   it.rootCategoryLevelId == 28 ? '废品' : '' }})
 								</text> </view>
 
@@ -81,15 +80,14 @@
 
 				<view class="item rx-sc">
 					<view class="rx">
-						<view class="lable lable190 rx-cc ">{{ it.extInfo.newWeight ? '上道工序总重量' : '物料总重量' }}</view>
-						<view class="content rx-sc">
+						<view class="lable lable190 rx-cc ">{{ it.extInfo.newWeight ? '上道工序总重量' : '物料总重量' }}(
+							{{it.extInfo.weightUnit}})
+						</view>
+						<view class="content content_num rx-sc">
 
-							<view v-if="it.extInfo.newWeight">{{it.extInfo.newWeight }} / {{it.extInfo.weightUnit}}
+							<view v-if="it.extInfo.newWeight">{{it.extInfo.newWeight }}
 							</view>
-
-
-							<view v-else> {{ toFixedFn(it.extInfo.weight, it.feedQuantity)  }} /
-								{{it.extInfo.weightUnit }} </view>
+							<input class="uni-input" size="mini" v-model="it.extInfo.weight"></input>
 						</view>
 					</view>
 				</view>
@@ -433,7 +431,7 @@
 				}
 
 				.lable190 {
-					width: 200rpx !important;
+					width: 230rpx !important;
 					font-size: 24rpx;
 				}
 

pages/pda/jobBooking/index/index.vue

@@ -684,6 +684,11 @@
 						return false
 					}
 				}
+				
+				
+				// if(this.objData.singleReport == 0 &&  type == 2) {
+					
+				// }
 
 
 

pages/pda/workOrder/search/index.vue

@@ -59,13 +59,13 @@
 
 
 								<view class="items"
-									v-if='([1,23].includes(Number(item.rootCategoryLevelId)) && item.isConsumable == 0) '>
+									v-if='([1,9,23].includes(Number(item.rootCategoryLevelId)) && item.isConsumable == 0) '>
 									<text>刻码</text>{{item.extInfo.engrave }}
 								</view>
 
 
 								<view class="items"
-									v-if='([1,23].includes(Number(item.rootCategoryLevelId)) && item.isConsumable == 0) '>
+									v-if='([1,9,23].includes(Number(item.rootCategoryLevelId)) && item.isConsumable == 0) '>
 									<text>物料代号</text>{{item.extInfo.materielCode }}
 								</view>
 
@@ -87,13 +87,10 @@
 									<text>包装库存</text>{{ item.packingCountBase }} {{item.minUnit}}
 								</view>
 								
-								<view class="items" v-if='item.rootCategoryLevelId == 1 || item.rootCategoryLevelId == 23'>
+								<view class="items" v-if='item.rootCategoryLevelId == 1 ||  item.rootCategoryLevelId == 9 || item.rootCategoryLevelId == 23'>
 									<text>计量库存数量</text>{{ item.availableCountBase }} {{item.measuringUnit}}
 								</view>
 								
-								
-							
-								
 
 								<view class="items" v-if='item.rootCategoryLevelId == 11'>
 									<text