优化

pages/pda/components/bottomOperate.vue

@@ -329,7 +329,7 @@
 
 					this.outsourceForm = {
 						...res,
-						requireDeliveryTime: '2024-05-30'
+						// requireDeliveryTime: '2024-05-30'
 					}
 					this.outsourceForm.name = this.taskObj.currentTaskName + '委外'
 

pages/pda/feeding/components/deviceBom.vue

@@ -10,9 +10,11 @@
 		</view>
 
 
-		<view class="material ">
-
-			<view class="content_table" v-for="(item,index) in list" :key='index'>
+		<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>
+			<view class="content_table">
 				<view class="item">
 					<view class="lable rx-cc">工位名称</view>
 					<view class="content">
@@ -93,6 +95,10 @@
 			handleScan(id) {
 				this.$emit('scanIt', id, )
 			},
+			
+			getDelete(idx) {
+				this.list.splice(idx, 1)
+			},
 		}
 	}
 </script>
@@ -154,7 +160,7 @@
 
 
 		.content_table {
-			width: 100%;
+			width: 680rpx;
 			border: 2rpx solid $border-color;
 			margin-bottom: 10rpx;
 

pages/pda/feeding/details.vue

@@ -226,7 +226,7 @@
 
 				if (this.clientEnvironmentId == 3) {
 					this.List.forEach(e => {
-						if (e.equipmentList.length == 1) {
+						if (e.equipmentList.length == 1 && e.instanceList.length > 0) {
 							e.instanceList.forEach(o => {
 								if (o.rootCategoryLevelId == 1 && o.isConsumable == 0) {
 									o['deviceName'] = e.equipmentList[0].name
@@ -234,6 +234,16 @@
 								}
 							})
 						}
+						
+						if (e.equipmentList.length == 1 && e.semiProductList.length > 0) {
+							e.semiProductList.forEach(o => {
+								if (o.rootCategoryLevelId == 23 && o.isConsumable == 0) {
+									o['deviceName'] = e.equipmentList[0].name
+									o['deviceId'] = e.equipmentList[0].id
+								}
+							})
+						}
+						
 					})
 
 				}

pages/pda/jobBooking/components/semiProductJobBom.vue

@@ -47,7 +47,7 @@
 				<view class="item rx-sc">
 					<view class="rx ww50 ">
 						<view class="lable lable150 rx-cc ">物料代号</view>
-						<view class="content content_num">-
+						<view class="content content_num">
 							<view v-if='isDetails'>{{it.extInfo.materielCode }}</view>
 							<input class="uni-input" v-else v-model="it.extInfo.materielCode"></input>
 

pages/pda/jobBooking/index/index.vue

@@ -134,7 +134,6 @@
 	import {
 		scanLedger,
 		getWarehouseList,
-
 	} from '@/api/pda/workOrder.js'