优化

pages.json

@@ -1503,6 +1503,14 @@
 				"navigationStyle" : "custom",
 				"navigationBarTextStyle" : "white"
 			}
+		},
+		{
+			"path" : "pages/pda/warehousing/index",
+			"style" : 
+			{
+				"navigationBarTitleText" : "",
+				"enablePullDownRefresh" : false
+			}
 		}
 
 

pages/pda/feeding/components/deviceBom.vue

@@ -13,24 +13,24 @@
 		<view class="material ">
 
 			<view class="content_table" v-for="(item,index) in list" :key='index'>
-				
+
 				<view class="item">
 					<view class="lable rx-cc">工位名称</view>
 					<view class="content">
-						
+						{{item.workstationName}}
 					</view>
 				</view>
-				
+
 				<view class="item">
 					<view class="lable rx-cc">设备编码</view>
 					<view class="content">
-						{{  item.code  }}
+						{{ item.code  }}
 					</view>
 				</view>
 
 				<view class="item">
 					<view class="lable rx-cc">设备名称</view>
-					<view class="content">{{  item.name  }}</view>
+					<view class="content">{{ item.name  }}</view>
 				</view>
 
 				<view class="item">
@@ -38,7 +38,7 @@
 					<view class="content">{{ item.fixCode }}</view>
 				</view>
 
-	
+
 
 
 
@@ -51,7 +51,7 @@
 
 <script>
 	export default {
-		
+
 		props: {
 			workOrderId: {
 				type: String,
@@ -61,8 +61,8 @@
 				type: Array,
 				default: () => []
 			},
-			
-			
+
+
 		},
 		data() {
 			return {
@@ -80,6 +80,7 @@
 <style lang="scss" scoped>
 	.title_box {
 		margin-top: 20rpx;
+
 		.name {
 			font-size: 28rpx;
 			font-style: normal;
@@ -135,7 +136,8 @@
 		.content_table {
 			width: 100%;
 			border: 2rpx solid $border-color;
-            margin-bottom: 10rpx;
+			margin-bottom: 10rpx;
+
 			.item {
 				display: flex;
 				border-bottom: 2rpx solid $border-color;

pages/pda/feeding/components/productsBom.vue

@@ -8,26 +8,26 @@
 		<view class="material rx-ss">
 
 			<view class="content_table">
-             
+
 				<view class="item">
 					<view class="lable rx-cc">名称</view>
-					<view class="content"> {{  productsObj.taskNameLast  + '-在制品' }} </view>
+					<view class="content"> {{ productsObj.name  + '-在制品' }} </view>
 				</view>
-				
+
 				<view class="item">
 					<view class="lable rx-cc">牌号</view>
-					<view class="content"> {{  productsObj.brandNum }} </view>
+					<view class="content"> {{ productsObj.brandNum }} </view>
 				</view>
-				
+
 				<view class="item">
 					<view class="lable rx-cc">型号</view>
-					<view class="content"> {{  productsObj.modelType }} </view>
+					<view class="content"> {{ productsObj.modelType }} </view>
 				</view>
-				
-				
+
+
 				<view class="item">
 					<view class="lable rx-cc">数量</view>
-					<view class="content"> {{  productsObj.feedQuantity  || 0  }} {{ productsObj.unit }} </view>
+					<view class="content"> {{ productsObj.feedQuantity  || 0  }} {{ productsObj.unit }} </view>
 				</view>
 			</view>
 
@@ -83,41 +83,41 @@
 
 
 	}
-	
-	
+
+
 	.material {
 		margin-top: 10rpx;
-	
+
 		.left {
 			width: 40rpx;
 		}
-	
+
 		.zdy_check {
 			width: 30rpx;
 			height: 30rpx;
 			border: 2rpx solid #c8c9cc;
 			border-radius: 4rpx;
-	
+
 		}
-	
+
 		.check_active {
 			background: $theme-color;
 			border: 2rpx solid $theme-color;
-	
+
 			/deep/ .u-icon__icon {
 				color: #fff !important;
 			}
 		}
-	
+
 		.content_table {
 			width: 722rpx;
 			border: 2rpx solid $border-color;
-	
+
 			.item {
 				display: flex;
 				border-bottom: 2rpx solid $border-color;
-	
-	
+
+
 				.lable {
 					width: 132rpx;
 					text-align: center;
@@ -126,11 +126,11 @@
 					border-right: 2rpx solid $border-color;
 					flex-shrink: 0;
 				}
-	
+
 				.ww80 {
 					width: 80rpx;
 				}
-	
+
 				.content {
 					width: 518rpx;
 					min-height: 64rpx;
@@ -142,50 +142,50 @@
 					box-sizing: border-box;
 					word-wrap: break-word;
 					flex-grow: 1 !important;
-	
+
 				}
-	
+
 				.content_num {
-	
+
 					display: flex;
 					align-items: center;
 					padding: 0 4rpx;
-	
+
 					/deep/ .uni-input-input {
 						width: 200rpx;
 						border: 2rpx solid #F0F8F2;
 						background: #F0F8F2;
 						color: $theme-color;
 					}
-	
+
 					.unit {
 						padding: 0 4rpx;
 						font-size: 24rpx;
 						color: #404446;
 					}
 				}
-	
+
 				.ww400 {
 					/deep/ .uni-input-input {
 						width: 400rpx;
 					}
 				}
-	
+
 				.pd4 {
 					padding: 4rpx 8rpx;
 				}
-	
-	
-	
+
+
+
 				&:last-child {
 					border-bottom: none;
 				}
 			}
-	
+
 			.ww55 {
 				width: 55%;
 			}
-	
+
 			.ww45 {
 				width: 45%;
 			}

pages/pda/feeding/details.vue

@@ -9,15 +9,13 @@
 					<workOrderBom :item='item' @handleScan='handleScan'></workOrderBom>
 
 
-
-
 					<paramBom v-if='item.paramDetailList.length != 0' :list='item.paramDetailList'></paramBom>
 
 					<deviceBom v-if='item.equipmentList.length != 0' :workOrderId='item.workOrderId'
 						:list='item.equipmentList' @scanIt='scanIt'></deviceBom>
 
 
-					<productsBom v-if="item.product != '{}'" :productsObj="item.product"></productsBom>
+					<productsBom v-if="item.product != null && item.product != '{}'" :productsObj="item.product"></productsBom>
 
 					<modelBom v-if='item.modelList.length != 0' :workOrderId='item.workOrderId' :list='item.modelList'
 						@scanIt='scanIt'>
@@ -219,20 +217,11 @@
 						m.quality == '' ? m.quality = {} : ''
 
 
-						if (m.taskNameLast) {
-							m.product = {
-								taskNameLast: m.taskNameLast,
-								formedWeightLast: m.formedWeightLast,
-								feedQuantity: m.formedNumLast,
-								categoryId: m.categoryId,
-								brandNum: m.brandNo,
-								modelType: m.model,
-								unit: m.unit
-
-							}
-						} else {
-							m.product = {}
-						}
+                       if(!Object.prototype.hasOwnProperty.call(m, 'product')) {
+						    m.product  = '{}'
+					   }
+					   
+					   console.log(m)
 
 
 
@@ -292,6 +281,7 @@
 
 						this.List = _arr
 						this.$forceUpdate()
+						
 
 
 					})

pages/pda/jobBooking/components/jobBom.vue

@@ -298,11 +298,11 @@
 
 					this.$set(this.notFormedList[0], 'notFormedNum', this.item.formedNumLast - Number(this.item
 						.workReportInfo.formedNum))
-						this.notForme()
-						
+					this.notForme()
+
 				}
-				
-				
+
+
 				let weight = Number(this.item.workReportInfo.formedNum) * Number(this.item.singleWeight) * Number(this
 					.item.weightMultiple)
 				weight = parseFloat(weight.toFixed(2))
@@ -319,15 +319,22 @@
 					.item.weightMultiple)
 				weight = parseFloat(weight.toFixed(2))
 				this.$set(this.notFormedList[0], 'notFormedWeight', weight)
-				
-				
-					if (this.item.formedNumLast > 0 && Number(this.notFormedList[0].notFormedNum)) {
-						this.$set(this.item.workReportInfo, 'formedNum', this.item.formedNumLast - Number(this.notFormedList[0].notFormedNum))
-							this.blurNum()
-						}
-				
-	
-					
+
+
+				if (this.item.formedNumLast > 0 && Number(this.notFormedList[0].notFormedNum)) {
+					this.$set(this.item.workReportInfo, 'formedNum', this.item.formedNumLast - Number(this.notFormedList[0]
+						.notFormedNum))
+						
+						
+						let weight = Number(this.item.workReportInfo.formedNum) * Number(this.item.singleWeight) * Number(this
+							.item.weightMultiple)
+						weight = parseFloat(weight.toFixed(2))
+						this.$set(this.item.workReportInfo, 'formedWeight', weight)
+
+				}
+
+
+
 				this.$forceUpdate()
 
 			},

pages/pda/jobBooking/index/index.vue

@@ -581,11 +581,28 @@
 				}
 
 
-	
-
 				jobSave(this.objData).then(res => {
 					uni.hideLoading();
-					uni.navigateBack()
+
+					if (this.taskType == 4) {
+						uni.showModal({
+							title: '提示',
+							content: '打包完成是否去打包！',
+							confirmText: '确认', //这块是确定按钮的文字
+							success: function(res) {
+								if (res.confirm) {
+									uni.navigateTo({
+										url: '/pages/pda/warehousing/index'
+									})
+								} else {
+									uni.navigateBack()
+								}
+							}
+						})
+					} else {
+						uni.navigateBack()
+					}
+
 
 				}).finally(() => {
 
@@ -625,7 +642,7 @@
 
 
 					} else {
-							resolve(true)
+						resolve(true)
 					}
 
 				})
@@ -654,7 +671,7 @@
 						})
 
 					} else {
-							resolve(true)
+						resolve(true)
 					}
 
 				})

pages/pda/sample/components/sampleBom.vue

@@ -90,6 +90,8 @@
 							<zxz-uni-data-select :localdata="warehouseList" :disabled="isDetails"
 								v-if='item.selectType != 1' v-model="item.warehouseId" dataValue='id' dataKey="name"
 								filterable format='{name}'></zxz-uni-data-select>
+
+							<view v-if="item.selectType == 1"  @click="scanTurnover(item,index)" class="turnover_btn"> 扫周转车</view>
 						</view>
 						<view class="item ww15">
 							<view class="left rx-ss" @click="getDelete(index)">
@@ -182,34 +184,34 @@
 
 
 		},
-		
-		
+
+
 		watch: {
-		
+
 			turnoverList: {
 				immediate: true,
 				deep: true,
 				handler(newVal) {
-				console.log(newVal)
-				this.turnoverCount = 0
-				
-				newVal.forEach(f => {
-					if(f.extInfo && f.extInfo.positionList && f.extInfo.positionList.length > 0) {
-						f.extInfo.positionList.forEach(o => {
-						if (Object.prototype.hasOwnProperty.call(o, 'sampleNum')) { 
-								this.turnoverCount =  this.turnoverCount + Number(o.sampleNum)
-								this.$set(this.item, 'sampleNum', this.turnoverCount)
-							}
-							
-						})
-					}
-				})
-				 
-		
+					console.log(newVal)
+					this.turnoverCount = 0
+
+					newVal.forEach(f => {
+						if (f.extInfo && f.extInfo.positionList && f.extInfo.positionList.length > 0) {
+							f.extInfo.positionList.forEach(o => {
+								if (Object.prototype.hasOwnProperty.call(o, 'sampleNum')) {
+									this.turnoverCount = this.turnoverCount + Number(o.sampleNum)
+									this.$set(this.item, 'sampleNum', this.turnoverCount)
+								}
+
+							})
+						}
+					})
+
+
 				}
 			}
 		},
-		
+
 		data() {
 			return {
 				warehouseList: [],
@@ -225,7 +227,7 @@
 						text: "入库"
 					}
 				],
-				
+
 				turnoverCount: 0
 			}
 		},
@@ -283,6 +285,19 @@
 			getDelete(idx) {
 				this.item.sampleList.splice(idx, 1)
 			},
+			
+			
+			scanTurnover(item, index) {
+				console.log(item)
+				if(item.num) {
+					
+				} else {
+				uni.showToast({
+					icon: 'none',
+					title: ''
+				})	
+				}
+			},
 
 		}
 	}
@@ -463,6 +478,12 @@
 				.ww15 {
 					width: 15%;
 				}
+				
+				.turnover_btn{
+				color: $theme-color;
+				font-size: 24rpx;
+				padding-left: 12rpx;
+				}
 			}
 
 			.head {

pages/pda/sample/index/index.vue

@@ -151,8 +151,6 @@
 			HandlScanCode() {
 
 
-				this.scanItAllData('w0300000003574001')
-				return false
 
 				let _this = this
 				uni.scanCode({

pages/pda/warehousing/index.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>