优化

pages/pda/feeding/bill/index.vue

@@ -24,9 +24,9 @@
 						<modelBom v-if='it.modelList.length != 0' :list='it.modelList'>
 						</modelBom>
 
-						<instanceBom v-if='it.instanceList.length != 0' :list='it.instanceList' :currentTaskDiagram='currentTaskDiagram' :equipmentList='it.equipmentList'></instanceBom>
+						<instanceBom v-if='it.instanceList.length != 0'  :isDetails='true' :list='it.instanceList' :currentTaskDiagram='currentTaskDiagram' :equipmentList='it.equipmentList'></instanceBom>
 						
-						<semiProductBom v-if='it.semiProductList.length != 0' :list='it.semiProductList' :currentTaskDiagram='currentTaskDiagram' ></semiProductBom>
+						<semiProductBom v-if='it.semiProductList.length != 0'  :isDetails='true' :list='it.semiProductList' :currentTaskDiagram='currentTaskDiagram' :equipmentList="it.equipmentList"></semiProductBom>
 						
 
 						<packingBom v-if='it.packingList.length != 0' :list='it.packingList'></packingBom>

pages/pda/feeding/components/instanceBom.vue

@@ -81,14 +81,15 @@
 						<view class="content">{{mate.extInfo.clientCode}}</view>
 					</view>
 
-                
+
 					<view class="item" v-if='mate.isConsumable == 0 && deviceList.length > 0'>
 						<view class="rx ww70">
 							<view class="lable rx-cc">设备</view>
 							<view class="content content_num">
-								<zxz-uni-data-select :localdata="deviceList" v-model="mate.deviceId" dataValue='id'
-									format='{name}-{codeNumber}' @change="e => selectVal(e, mate, idx)" dataKey="id"
-									filterable :clear='false'></zxz-uni-data-select>
+								<zxz-uni-data-select v-if="!isDetails" :localdata="deviceList" v-model="mate.deviceId"
+									dataValue='id' format='{name}-{codeNumber}' @change="e => selectVal(e, mate, idx)"
+									dataKey="id" filterable :clear='false'></zxz-uni-data-select>
+								<span v-if="isDetails">{{mate.deviceName}}</span>
 							</view>
 						</view>
 						<view class="rx ww30">
@@ -114,7 +115,8 @@
 						<view class="rx ww50">
 							<view class="lable rx-cc ww80">数量</view>
 							<view class="content content_num   ">
-								<input class="uni-input" v-model="mate.feedQuantity" type="digit"></input>
+								<input class="uni-input" style="width: 160rpx;" v-model="mate.feedQuantity"
+									type="digit"></input>
 								<view class="unit ">/{{mate.unit}}</view>
 							</view>
 						</view>
@@ -208,6 +210,10 @@
 				type: Object,
 				default: () => {}
 			},
+			isDetails: {
+				type: Boolean,
+				default: false
+			}
 		},
 
 		watch: {
@@ -258,11 +264,11 @@
 				this.$set(this.list[idx], 'deviceName', e.name + '-' + e.codeNumber)
 				this.$set(this.list[idx]['extInfo'], 'heatNumber', e.extInfo.heatNumber)
 			},
-			
+
 			changeHeatNumber() {
 				this.deviceList.forEach(f => {
 					this.list.forEach(o => {
-						if(o.deviceId && f.id == o.deviceId) {
+						if (o.deviceId && f.id == o.deviceId) {
 							o.extInfo.heatNumber = f.extInfo.heatNumber
 						}
 					})
@@ -393,7 +399,7 @@
 		}
 
 		.content_table {
-			width: 680rpx;
+			width: 670rpx;
 			border: 2rpx solid $border-color;
 
 			.item {

pages/pda/feeding/components/semiProductBom.vue

@@ -97,10 +97,12 @@
 					<view class="item" v-if='mate.isConsumable == 0 && deviceList.length > 0'>
 						<view class="rx ww70">
 							<view class="lable rx-cc">设备</view>
-							<view class="content content_num">
-								<zxz-uni-data-select :localdata="deviceList" v-model="mate.deviceId" dataValue='id'
+							<view class="content content_num" >
+								
+								<zxz-uni-data-select v-if="!isDetails" :localdata="deviceList" v-model="mate.deviceId" dataValue='id'
 									format='{name}-{codeNumber}' @change="e => selectVal(e, mate, idx)" dataKey="id"
 									filterable :clear='false'></zxz-uni-data-select>
+								<span v-if="isDetails">{{mate.deviceName}}</span>
 							</view>
 						</view>
 						<view class="rx ww30">
@@ -126,7 +128,7 @@
 						<view class="rx ww50">
 							<view class="lable rx-cc ww80">数量</view>
 							<view class="content content_num   ">
-								<input class="uni-input" v-model="mate.feedQuantity" type="digit"></input>
+								<input class="uni-input" style="width: 160rpx;" v-model="mate.feedQuantity" type="digit"></input>
 								<view class="unit ">/{{mate.unit}}</view>
 							</view>
 						</view>
@@ -220,6 +222,10 @@
 				type: Object,
 				default: () => {}
 			},
+			isDetails: {
+				type: Boolean,
+				default: false
+			}
 		},
 
 		watch: {
@@ -405,7 +411,7 @@
 		}
 
 		.content_table {
-			width: 680rpx;
+			width: 670rpx;
 			border: 2rpx solid $border-color;
 
 			.item {
@@ -428,7 +434,7 @@
 				}
 
 				.content {
-					width: 518rpx;
+					width: 500rpx;
 					min-height: 64rpx;
 					font-size: 28rpx;
 					line-height: 28rpx;

pages/pda/jobBooking/components/oneJobQualityBom.vue

@@ -83,6 +83,23 @@
 
 				</view>
 				
+				<view class="item rx-sc">
+					<view class="rx ww50">
+						<view class="lable lable150 rx-cc ">设备</view>
+						<view class="content ">
+							<view>{{it.extInfo.deviceName }}</view>
+						</view>
+					</view>
+				
+					<view class="rx ww50">
+						<view class="lable lable150  rx-cc ">炉次号</view>
+						<view class="content ">
+							<view>{{it.extInfo.heatNumber }}</view>
+						</view>
+					</view>
+				
+				</view>
+				
 				
 				<view class="item rx-sc">
 					<view class="rx ww50 ">

pages/pda/jobBooking/components/semiProductJobBom.vue

@@ -18,7 +18,10 @@
 						</view>
 						<view class="content rx-bc">
 							<view>{{it.code}} </view>
-							<view v-if="Object.prototype.hasOwnProperty.call(it, 'extInfo')  && Object.prototype.hasOwnProperty.call(it.extInfo, 'productionTimes') &&  Object.prototype.hasOwnProperty.call(it.extInfo.productionTimes,item.currentTaskDiagram.taskId) ">{{ it.extInfo.productionTimes[item.currentTaskDiagram.taskId]}}</view>
+							<view
+								v-if="Object.prototype.hasOwnProperty.call(it, 'extInfo')  && Object.prototype.hasOwnProperty.call(it.extInfo, 'productionTimes') &&  Object.prototype.hasOwnProperty.call(it.extInfo.productionTimes,item.currentTaskDiagram.taskId) ">
+								{{ it.extInfo.productionTimes[item.currentTaskDiagram.taskId]}}
+							</view>
 						</view>
 					</view>
 				</view>
@@ -28,7 +31,9 @@
 						<view class="lable lable150 rx-cc ">名称</view>
 						<view class="content rx-sc">
 
-							<view>{{it.name}}  <text v-if="[2, 23].includes(Number(it.rootCategoryLevelId))">  ({{it.rootCategoryLevelId == 2 ? '在制品' :  it.rootCategoryLevelId == 23 ? '半成品' : '' }}) </text>  </view>
+							<view>{{it.name}} <text v-if="[2, 23].includes(Number(it.rootCategoryLevelId))">
+									({{it.rootCategoryLevelId == 2 ? '在制品' :  it.rootCategoryLevelId == 23 ? '半成品' : '' }})
+								</text> </view>
 						</view>
 					</view>
 				</view>
@@ -87,13 +92,33 @@
 
 
 
+				<view class="item rx-sc">
+					<view class="rx ww50">
+						<view class="lable lable150 rx-cc ">设备</view>
+						<view class="content ">
+							<view>{{it.extInfo.deviceName }}</view>
+						</view>
+					</view>
+
+					<view class="rx ww50">
+						<view class="lable lable150  rx-cc ">炉次号</view>
+						<view class="content ">
+							<view>{{it.extInfo.heatNumber }}</view>
+						</view>
+					</view>
+
+				</view>
+
+
+
 			</view>
 
 
 
 			<view class="content_table2">
 				<view class="head row rx-sc">
-					<view class="item ww25">{{it.extInfo.newWeight ? '工序重量' : '物料重量'  }} {{it.extInfo.weightUnit}}</view>
+					<view class="item ww25">{{it.extInfo.newWeight ? '工序重量' : '物料重量'  }} {{it.extInfo.weightUnit}}
+					</view>
 					<view class="item ww25">报工重量{{it.extInfo.weightUnit}}</view>
 					<view class="item ww25" v-if="isFirstTask == 1">质检结果
 					</view>
@@ -122,7 +147,8 @@
 
 						<view class="item " v-else :class="[ isFirstTask == 1 ? 'ww25' : 'ww50' ]">
 							<zxz-uni-data-select :localdata="stepsList" v-model="it.extInfo.taskId" dataValue='taskId'
-								format='{taskTypeName}' dataKey="taskId" filterable   @change=" e => it.extInfo.taskName = e.taskTypeName" 
+								format='{taskTypeName}' dataKey="taskId" filterable
+								@change=" e => it.extInfo.taskName = e.taskTypeName"
 								:clear='false'></zxz-uni-data-select>
 						</view>
 
@@ -706,6 +732,7 @@
 				width: 50%;
 			}
 
+
 			.ww10 {
 				width: 10%;
 			}