优化

pages/pda/by_product_recovery/index/index.vue

@@ -513,7 +513,7 @@
 			border-right: 1rpx solid #E3E5E5;
 			border-bottom: 1rpx solid #E3E5E5;
 			box-sizing: border-box;
-
+            word-break: break-all;
 			text {
 				display: inline-block;
 				background: #F7F9FA;

pages/pda/feeding/single.vue

@@ -222,7 +222,7 @@
 				border-right: 1rpx solid #E3E5E5;
 				border-bottom: 1rpx solid #E3E5E5;
 				box-sizing: border-box;
-
+                word-break: break-all;
 				text {
 					display: inline-block;
 					background: #F7F9FA;

pages/pda/sample/components/inspectionBom.vue

@@ -21,10 +21,11 @@
 					<view class="item ww30">
 						{{ it.name }}
 					</view>
-					<view class="item ww20 content_num" >
-					
-						<input v-if='it.id != -1' class="uni-input" v-model="it.quantity" type="number" @input="onKeyInput"></input>
-					     <view v-else>{{ it.quantity || 0}}</view>
+					<view class="item ww20 content_num">
+
+						<input v-if='it.id != -1' class="uni-input" v-model="it.quantity" type="number"
+							@input="onKeyInput"></input>
+						<view v-else>{{ it.quantity || 0}}</view>
 					</view>
 					<view class="item ww40 content_num" v-if='it.id != -1'>
 						<zxz-uni-data-select :localdata="warehouseList" v-model="it.warehouseId" dataValue='id'
@@ -34,8 +35,8 @@
 
 
 					<view class="ww10 rx-ac">
-						<uni-icons custom-prefix="iconfont" v-if='it.id != -1' type="icon-shanchu" size="20" color="#fa3534"
-							@click="handleDel(idx)"></uni-icons>
+						<uni-icons custom-prefix="iconfont" v-if='it.id != -1' type="icon-shanchu" size="20"
+							color="#fa3534" @click="handleDel(idx)"></uni-icons>
 
 					</view>
 
@@ -44,10 +45,10 @@
 
 
 			</view>
-			
-			
-		
-			
+
+
+
+
 
 
 
@@ -70,7 +71,6 @@
 	import {
 
 		getWarehouseList,
-
 	} from '@/api/pda/workOrder.js'
 	export default {
 
@@ -82,7 +82,7 @@
 				type: Array,
 				default: () => []
 			},
-			
+
 			normalQuality: {
 				type: Object,
 				default: () => {}
@@ -102,6 +102,9 @@
 
 		created() {
 			this.getWarehouse()
+			setTimeout(() => {
+					this.onKeyInput()
+				}, 500)
 		},
 
 		methods: {
@@ -120,26 +123,24 @@
 
 			handleDel(idx) {
 				this.inspectionList.splice(idx, 1)
-
+	
 			},
 			onKeyInput() {
 				this.count = 0
 				this.inspectionList.map(L => {
-					if(Number(L.quantity) > 0 && Number(L.quantity) != NaN && L.id != -1) {
-							this.count = Number(this.count) + Number(L.quantity)
-							this.inspectionList[this.inspectionList.length - 1]['quantity'] = this.count
-					       
-							this.normalQuality['quantity'] = this.count
+					if (Number(L.quantity) > 0 && Number(L.quantity) != NaN && L.id != -1) {
+						this.count = Number(this.count) + Number(L.quantity)
+						this.inspectionList[this.inspectionList.length - 1]['quantity'] = this.count
+
+						this.normalQuality['quantity'] = this.count
+					
 					}
-				
-			
-				})
-			},
 
-			handleView(it) {
 
+				})
 			},
 
+
 			getWarehouse() {
 				getWarehouseList().then(res => {
 					this.warehouseList = res

pages/pda/sample/index/index.vue

@@ -20,10 +20,10 @@
 
 
 
-					<sampleBom :item='item.quality' v-if='item.quality' :isDetails='false'
-						:turnoverList='item.turnover' :paramList='paramList' @showReuseTurnover='showReuseTurnover = true'></sampleBom>
+					<sampleBom :item='item.quality' v-if='item.quality' :isDetails='false' :turnoverList='item.turnover'
+						:paramList='paramList' @showReuseTurnover='showReuseTurnover = true'></sampleBom>
+
 
-                  
 					<reuseTurnoverBom v-if='showReuseTurnover' :list='item.turnover' :wordItem='item'
 						:reuseNum='item.quality.reuseNum'>
 					</reuseTurnoverBom>
@@ -59,6 +59,7 @@
 	import {
 		batchSave
 	} from '@/api/pda/feeding.js'
+	import VConsole from 'vconsole'
 	export default {
 		components: {
 			workOrderBom,
@@ -75,10 +76,10 @@
 				count: 0,
 
 				isLastJob: true,
-				
+
 				paramList: [],
 				showReuseTurnover: false
-				
+
 			}
 		},
 
@@ -87,8 +88,8 @@
 			this.id = options.workOrderId
 			this.taskId = options.taskId
 			this.getList()
-			
-			
+
+
 
 		},
 		onShow() {
@@ -98,7 +99,8 @@
 				let turnover = [] //周转车
 				selectList.forEach(f => {
 					if (f.rootCategoryLevelId == 7) {
-						turnover = turnover.concat(f)
+						// turnover = turnover.concat(f)
+						turnover = [f]
 					}
 
 				})
@@ -112,7 +114,7 @@
 			});
 		},
 		methods: {
-	
+
 			getList() {
 				workorderList({
 					ids: [this.id],
@@ -136,8 +138,8 @@
 							m['turnover'] = []
 							this.getSampleTurnover()
 						}
-						
-							this.getParam(res[0].currentTaskDiagram.sourceTaskId)
+
+						this.getParam(res[0].currentTaskDiagram.sourceTaskId)
 
 						m.feedType = 2
 						delete m.id
@@ -146,17 +148,17 @@
 						}
 					})
 				})
-				
-			
+
+
 			},
-			
-			
+
+
 			getParam(sourceTaskId) {
 				paramByTaskId(sourceTaskId).then(res => {
 					this.paramList = res
 				})
 			},
-			
+
 
 			getSampleTurnover() {
 				let param = {
@@ -214,8 +216,29 @@
 			},
 
 			save() {
-
-
+				
+				
+				let _arr = []
+				_arr =JSON.parse(JSON.stringify(this.List))
+	
+				_arr.forEach(f => {
+					f.turnover.forEach(o => {
+						o.extInfo.positionList.forEach(r => {
+							r.sampleNum = 0
+							r.reuseNum = 0
+						})
+					})
+					f.reuseTurnover.forEach(o => {
+						o.extInfo.positionList.forEach(r => {
+							r.sampleNum = 0
+							r.reuseNum = 0
+						})
+					})
+					
+					
+					
+				})
+	
 				if (!this.isLastJob) {
 					uni.showToast({
 						icon: 'none',
@@ -226,15 +249,7 @@
 				}
 
 
-				this.count = 0;
-				this.List[0].quality.sampleList.forEach(e => {
-					if (Number(e.num) > 0 && Number(e.num) != NaN) {
-						this.count += Number(e.num);
-					}
-
-				})
-
-				if (this.List[0].quality.sampleNum != this.count) {
+				if (this.List[0].quality.sampleNum != this.List[0].quality.sampleList.length) {
 					uni.showToast({
 						icon: 'none',
 						title: '处置数量和取样数量对应不上'
@@ -244,7 +259,7 @@
 				}
 
 
-
+		
 				batchSave(this.List).then(res => {
 					uni.navigateBack()
 
@@ -288,7 +303,7 @@
 		}
 
 		.card_box {
-		padding: 16rpx;
+			padding: 16rpx;
 		}
 
 

pages/pda/sample/index/jobBooking.vue

@@ -103,6 +103,7 @@
 						let jianCount = 0
 
 						this.objData.quality.sampleList.forEach(e => {
+						
 
 							if (e.selectType == 2) {
 								jianCount = jianCount + Number(e.num)

pages/pda/warehousing/index.vue

@@ -163,6 +163,7 @@ export default {
 		scrolltolower() { },
 
 		save() {
+
 			if (!this.warehouseId) {
 				uni.showToast({
 					icon: 'none',
@@ -182,7 +183,16 @@ export default {
 
 
 			jobSave(this.objData).then(res => {
-				uni.navigateBack()
+				if(	this.workReportId ) {
+				uni.navigateBack({
+				     delta: -2
+				   });	
+				} else {
+					uni.navigateBack({
+					     delta: -1
+					   });
+				}
+				
 			})
 
 		},

pages/pda/workOrder/search/index.vue

@@ -735,7 +735,7 @@
 				border-right: 1rpx solid #E3E5E5;
 				border-bottom: 1rpx solid #E3E5E5;
 				box-sizing: border-box;
-
+                 word-break: break-all;
 				text {
 					display: inline-block;
 					background: #F7F9FA;