22

pages/pda/feeding/components/semiProductBom.vue

@@ -27,7 +27,10 @@
 						@click="handleCheck(idx, mate)">
 						<view class="rx ">
 							<view class="lable rx-cc">编码</view>
-							<view class="content">{{ mate.code }}</view>
+							<view class="content rx-bc">
+								<view>{{ mate.code }}</view>
+								<view class='tag_box'  v-if="mate.isCache" style="margin-right: -36rpx;" >缓</view>
+							</view>
 						</view>
 
 						<view class="rx-cc ww20" v-if="deviceList.length > 1">
@@ -529,6 +532,15 @@
 				width: 30rpx;
 				height: 30rpx;
 			}
+			
+			.tag_box {
+				padding: 2rpx 10rpx;
+				margin-right: 12rpx;
+				background: #E6A23C;
+				font-size: 22rpx;
+				color: #fff;
+				border-radius: 4rpx;
+			}
 		}
 	}
 

pages/pda/feeding/details.vue

@@ -583,7 +583,8 @@
 			getCacheFn() {
 				let parma = {
 					workOrderIds: this.idsList,
-					taskId: this.taskId
+					taskId: this.taskId,
+					type: 2
 				}
 
 				feedGetCache(parma).then(res => {

pages/pda/jobBooking/components/semiProductJobBom.vue

@@ -5,7 +5,8 @@
 		</view>
 
 
-		<view class="material " v-for="(it, idx) in list" :key="idx">
+		<view :class="['material', it.extInfo.reportWeight && it.extInfo.reportWeight && 'materialBor']"
+			v-for="(it, idx) in list" :key="idx">
 
 
 			<view class="content_table">
@@ -21,7 +22,7 @@
 						</view>
 						<view class="content rx-bc">
 							<view>{{it.code}} </view>
-							<view
+							<view class="tag_box"
 								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>
@@ -34,12 +35,14 @@
 				<view class="item rx-sc">
 					<view class="rx">
 						<view class="lable lable150 rx-cc ">名称</view>
-						<view class="content rx-sc">
+						<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>
+
+							<view class="tag_box " v-if="it.isCache" style="margin-right: -36rpx;">缓</view>
 						</view>
 					</view>
 				</view>
@@ -652,14 +655,17 @@
 	}
 
 
-	.material {
-		margin-top: 10rpx;
 
 
+	.material {
+		margin-top: 16rpx;
+		border: 1rpx solid transparent;
+
 
 		.content_table {
 			width: 100%;
 			border: 2rpx solid $border-color;
+			box-sizing: border-box;
 
 			.item {
 				display: flex;
@@ -747,17 +753,28 @@
 			.ww45 {
 				width: 45%;
 			}
+
+			.tag_box {
+				padding: 2rpx 10rpx;
+				margin-right: 12rpx;
+				background: #E6A23C;
+				font-size: 22rpx;
+				color: #fff;
+				border-radius: 4rpx;
+			}
 		}
 	}
 
 
+	.materialBor {
+		border: 1rpx solid #157A2C
+	}
 
 
 	.content_table2 {
 		width: 100%;
 
 
-
 		.row {
 			width: 100%;
 
@@ -805,8 +822,9 @@
 		.head {
 			height: 64rpx;
 			background: #F7F9FA;
-			border-top: 2rpx solid #E3E5E5;
+			// border-top: 2rpx solid #E3E5E5;
 			border-left: 2rpx solid #E3E5E5;
+			box-sizing: border-box;
 
 			.item {
 				height: 64rpx;

pages/pda/jobBooking/index/index.vue

@@ -21,7 +21,7 @@
 						ref='modelRef'>
 					</modelBom>
 
-
+            
 					<jobBom v-if='isLoad' :item='objData' ref='jobRef' :notFormed='objData.notFormedList'
 						@penalize='penalize' @modeNum='modeNum'></jobBom>
 
@@ -686,6 +686,8 @@
 
 
 
+
+
 				jobSave(this.objData).then(res => {
 
 
@@ -781,10 +783,10 @@
 
 			},
 			checkFirstTask() {
+			
 				uni.hideLoading();
 				return new Promise((resolve) => {
-					if (this.objData.formedNumLast != Number(this.objData.workReportInfo['formedNum']) + Number(
-							this.objData.notFormedList[0].notFormedNum)) {
+					if (this.objData.formedNumLast != Number(this.objData.workReportInfo['formedNum']) + Number(this.objData.notFormedList[0].notFormedNum)) {
 
 						uni.showModal({
 							title: '提示',
@@ -859,24 +861,24 @@
 			getCacheFn() {
 				let parma = {
 					workOrderId: this.id,
-					taskId: this.taskId
+					taskId: this.taskId,
+					type: 1
 				}
 
 				getCache(parma).then(res => {
-					if (!res) {
+					if (!res && res.length < 0) {
 						return false;
 					}
 
 
 					this.objData['product'] = res.extInfo.product
 					this.objData['workReportInfo'] = res.extInfo.workReportInfo
-					this.objData['notFormedList'] = res.extInfo.notFormedList
+				 	this.objData['notFormedList'] = res.extInfo.notFormedList
 					this.objData['turnover'] = res.extInfo.turnover
 					this.objData['productRecycleList'] = res.extInfo.productRecycleList
 					this.objData['semiProductList'] = res.extInfo.semiProductList
 					this.objData['modelList'] = res.extInfo.modelList
 
-			
 
 				})
 			},