优化

pages/pda/sample/components/diagramLast.vue

@@ -9,26 +9,17 @@
 					<view class="lable rx-cc">工序名称</view>
 					<view class="content">
 
-						{{item.diagramLast.taskTypeName}}
+						{{item.taskNameLast}}
 					</view>
 				</view>
 
 
 
-				<view class="item rx-sc">
-					<view class="rx ww55 ">
+				<view class="item ">
 						<view class="lable  rx-cc">合格数量</view>
-						<view class="content rx-sc">
-							<view>{{ item.formedNum }}</view>
-						</view>
-					</view>
-
-					<view class="rx ww45">
-						<view class="lable rx-cc ww80">重量</view>
 						<view class="content">
-							{{ item.formedWeight}} {{item.unit}}
+							<view>{{ item.formedNum }}</view>
 						</view>
-					</view>
 
 				</view>
 

pages/pda/sample/inspection/index.vue

@@ -19,7 +19,7 @@
 							@click="scanIt(item.workOrderId)">扫一扫</u-button>
 					</view>
 
-					<diagramLast :item='item.normalQuality' v-if='item'></diagramLast>
+					<diagramLast :item='item.lastObj' v-if='item'></diagramLast>
 
 
 					<inspectionBom :inspectionList='inspectionList' :normalQuality='item.normalQuality'></inspectionBom>
@@ -47,7 +47,7 @@
 		workorderList,
 		getLastTreeByPid,
 		scanLedger,
-		
+
 	} from '@/api/pda/workOrder.js'
 	import {
 		batchSave
@@ -76,7 +76,7 @@
 				List: [],
 				inspectionList: [],
 
-		
+
 			}
 		},
 
@@ -88,7 +88,7 @@
 			this.taskId = options.taskId
 			this.getList()
 
-		
+
 			this.getLastTree()
 		},
 
@@ -133,6 +133,12 @@
 						m.normalQuality.quantity = 0
 						m.normalQuality.inspectionId = this.inspectionId
 						m.normalQuality.inspectionName = this.inspectionName
+
+						m.lastObj = {
+								formedNum: res.formedNumLast,
+								taskNameLast: res.taskNameLast
+							
+						}
 						m.feedType = 3
 
 						delete m.id
@@ -216,7 +222,7 @@
 					return false
 				}
 
-				if (this.List[0].normalQuality.formedNum - this.List[0].normalQuality.quantity  < 0) {
+				if (this.List[0].normalQuality.formedNum - this.List[0].normalQuality.quantity < 0) {
 					uni.showToast({
 						icon: 'none',
 						title: '废品数量不能大于合格数量'

pages/pda/sample/inspection/job.vue

@@ -110,15 +110,14 @@
 					this.formedNumLast = res.formedNumLast
 					this.formingNum = 0
 					res.normalQuality.forEach(f => {
-						this.formingNum = this.formedNumLast - Number(f.quantity)
+						this.formedNumLast = this.formedNumLast - Number(f.quantity)
+						this.formingNum  = this.formedNumLast
 					})
 
 
 					this.lastObj = {
 						formedNum: res.formedNumLast,
-						diagramLast: {
-							taskTypeName: res.taskNameLast
-						}
+						taskNameLast: res.taskNameLast
 					}
 
 					this.objData = res