优化

pages/pda/jobBooking/components/oneJobQualityBom.vue

@@ -137,7 +137,7 @@
 
 			<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.lastWeight ? '上道工序重量' : '物料重量'  }} {{it.extInfo.weightUnit}}</view>
 					<view class="item ww25">报工重量{{it.extInfo.weightUnit}}</view>
 					<view class="item ww25" v-if="isFirstTask == 1">质检结果
 					</view>
@@ -149,7 +149,7 @@
 				<view class="table">
 
 					<view class="tr row rx-sc">
-						<view class="item ww25">{{it.extInfo.newWeight ? it.extInfo.newWeight :  it.extInfo.weight  }}
+						<view class="item ww25">{{it.extInfo.lastWeight ? it.extInfo.lastWeight :  it.extInfo.weight  }}
 						</view>
 						<view class="item ww25 content_num">
 							<view v-if='isDetails'>{{it.extInfo.reportWeight }}</view>

pages/pda/jobBooking/index/index.vue

@@ -688,8 +688,8 @@
 							confirmText: '确认', //这块是确定按钮的文字
 							success: rr => {
 								if (rr.confirm) {
-									uni.navigateTo({
-										url: `/pages/pda/warehousing/index?workOrderId=${this.id}&taskId=-1&workReportId=${res}`
+									uni.redirectTo({
+										url: `/pages/pda/warehousing/index?workOrderId=${this.id}&taskId=-1&workReportId=${res}&delta=-2`
 									})
 								} else {
 									uni.navigateBack()

pages/pda/warehousing/index.vue

@@ -71,6 +71,7 @@
 				objData: {},
 				warehouseList: [],
 				warehouseId: null,
+				delta: -1,
 
 				List: [],
 
@@ -86,10 +87,11 @@
 		},
 
 		onLoad(options) {
-
 			this.id = options.workOrderId
 			this.taskId = options.taskId
 			this.workReportId = options.workReportId
+			this.delta = options.delta
+		
 			this.getList()
 
 			this.getWarehouseListFn()
@@ -183,20 +185,14 @@
 
 
 				jobSave(this.objData).then(res => {
-					if (this.workReportId) {
-						uni.navigateBack({
-							delta: -2
-						});
-					} else {
-						uni.navigateBack({
-							delta: -1
-						});
-					}
+					uni.navigateBack();
 
 				})
 
 			},
-		}
+
+	
+	}
 	}
 </script>
 <style lang="scss" scoped>