55

pages/pda/feeding/components/instanceBom.vue

@@ -50,8 +50,8 @@
 					<view class="item rx-sc" v-if='mate.isConsumable == 0 && workInfo.singleReport != 0'>
 						<view class="rx ww50">
 							<view class="lable  rx-cc">{{ currentTaskDiagram.isFirstTask == 1 ? '物料重量': '上道重量' }}</view>
-							<view class="content" v-if="currentTaskDiagram.isFirstTask == 1">
-								{{mate.extInfo.weight || 0}} {{ mate.extInfo.weightUnit}}
+							<view class="content content_num"  v-if="currentTaskDiagram.isFirstTask == 1">
+						  {{mate.extInfo.weight}}{{ mate.extInfo.weightUnit}}
 							</view>
 							<view class="content" v-if="currentTaskDiagram.isFirstTask == 0">
 								{{mate.extInfo.newWeight || 0}} {{ mate.extInfo.weightUnit}}

pages/pda/jobBooking/components/semiProductJobBom.vue

@@ -140,8 +140,16 @@
 
 				<view class="table">
 					<view class="tr row rx-sc">
-						<view class="item ww25">{{it.extInfo.newWeight ? it.extInfo.newWeight :  it.extInfo.weight  }}
-						</view>
+						
+						<view class="item ww25" v-if="Object.prototype.hasOwnProperty.call(it.extInfo, 'newWeight')">
+					       {{ it.extInfo.newWeight }} 
+					</view>
+						
+					<view class="item ww25 content_num" v-if="!Object.prototype.hasOwnProperty.call(it.extInfo, 'newWeight')">
+				        <input class="uni-input " v-model="it.extInfo.weight" type='digit'></input>
+					</view>
+						
+						
 						<view class="item ww25 content_num">
 							<view v-if='isDetails'>{{it.extInfo.reportWeight }}</view>
 							<input class="uni-input" v-else v-model="it.extInfo.reportWeight" type='digit'></input>