55

pages/pda/components/bottomOperate.vue

@@ -568,7 +568,7 @@
 
 
 
-				// this.outsourceForm.requireDeliveryTime = '2025-03-28'
+				this.outsourceForm.requireDeliveryTime = '2025-03-28'
 				if (!this.outsourceForm.requireDeliveryTime) {
 					uni.showToast({
 						title: '请选择委外完成时间',

pages/pda/components/outsourceList.vue

@@ -178,7 +178,7 @@
 										</view>
 
 										<view class="items" v-if="item.isDemandQuantity && clientEnvironmentId != 2">
-											<text>数量</text>{{ item.count * ( checkListLen || 1 )    }}
+											<text>数量</text>{{ checkListLen == 0 ? item.demandQuantity :  item.count * ( checkListLen || 1 )    }}
 										</view>
 										<view class="items content_num" v-if="!item.isDemandQuantity && clientEnvironmentId != 2">
 											<text>数量</text> <input style="8px !important"

pages/pda/feeding/components/deviceBom.vue

@@ -11,6 +11,7 @@
 
 
 		<view class="material rx-ss" v-for="(item, index) in list" :key='index'>
+			
 			<view class="left rx-ss" @click="getDelete(index)" v-if='workOrderId'>
 				<uni-icons custom-prefix="iconfont" type="icon-shanchu" size="20" color="#fa3534"></uni-icons>
 			</view>
@@ -64,6 +65,15 @@
 						@click="handleStorage(index)">货位</view>
 
 				</view>
+ 
+				<view class="item"  v-if="Object.prototype.hasOwnProperty.call(item, 'equipmentLabelJson') && item.equipmentLabelJson.length != 0 && item.equipmentLabelJson[0].SBFL == 1">
+					<view class="lable rx-cc">是否封炉</view>
+					<view class="content"> 
+					<u-checkbox-group v-model="item.isSBFL" size="15px" >
+						<u-checkbox labelSize="15px" iconSize="10px" activeColor="#157A2C" name="true" label="是"></u-checkbox>
+					</u-checkbox-group>
+					</view>
+				</view>
 
 
 
@@ -140,7 +150,7 @@
 											<input
 												:class="['uni-input', wordItem.code == it.workOrderCode && it.quantity > 0 ? 'content_num' : '']"
 												v-model="it.feedNum" type="digit"
-												:disabled="it.quantity <= 0 || wordItem.code != it.workOrderCode "
+												:disabled="it.quantity <= 0 || wordItem.code != it.workOrderCode || isDetails"
 												@blur="Number(it.feedNum) > Number(it.quantity) ? it.feedNum = Number(it.quantity) : ''"></input>
 										</view>
 

pages/pda/jobBooking/index/index.vue

@@ -13,7 +13,7 @@
 
 					<paramBom v-if='paramDetailList.length != 0' :list='paramDetailList'></paramBom>
 
-					<deviceBom v-if='objData.equipmentList.length != 0' :list='objData.equipmentList' :ishuoWei="false">
+					<deviceBom v-if='objData.equipmentList.length != 0' :list='objData.equipmentList' :ishuoWei="false"  :wordItem='objData' :isDetails='true'>
 					</deviceBom>
 
 					<modelBom v-if='objData.modelList.length != 0' :list='objData.modelList' pattern='job'
@@ -707,7 +707,8 @@
 							// } else {
 							// 	return e.extInfo.hasOwnProperty('notType') && e.extInfo.notType
 							// }
-                            return e.extInfo.hasOwnProperty('notType') && e.extInfo.notType
+                           return e.extInfo.hasOwnProperty('taskId') && e.extInfo.taskId && e.extInfo
+                           		.reportWeight
 						}
 
 					})