修改包装环境

pages/pda/feeding/components/workOrderBom.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		
+
 		<view class="title_box rx-bc">
 			<view class="name">工单信息 </view>
 
@@ -9,15 +9,15 @@
 				更换工单
 			</view>
 		</view>
-              
-           
+
+
 		<view class="material ">
 
 			<view class="content_table">
 				<view class="item">
 					<view class="lable rx-cc">工单编号</view>
 					<view class="content">
-						{{item.code}}
+						{{ item.code }}
 					</view>
 				</view>
 
@@ -41,16 +41,16 @@
 					<view class="rx ww55 ">
 						<view class="lable  rx-cc">生产数量</view>
 						<view class="content rx-sc">
-							<view>{{item.formingNum}}</view>
-							<view class="unit">{{item.unit}}</view>
+							<view>{{ item.formingNum }}</view>
+							<view class="unit">{{ item.unit }}</view>
 						</view>
 					</view>
 
 					<view class="rx ww45">
 						<view class="lable rx-cc ww80">重量</view>
 						<view class="content content_num">
-							<view>{{item.formingWeight}}</view>
-							<view class="unit">{{item.weightUnit}}</view>
+							<view>{{ item.formingWeight }}</view>
+							<view class="unit">{{ item.weightUnit }}</view>
 
 						</view>
 					</view>
@@ -65,17 +65,20 @@
 
 
 
-		<view class="title_box mt20 rx-bc" v-if="(clientEnvironmentId == 3||clientEnvironmentId == 5) && taskType == 1 && (pType == 'feed' || pType == 'job')">
-			<view class="name">{{ pType == 'feed' ? '实际投料时间' : '实际报工时间'}} </view>
+		<view class="title_box mt20 rx-bc"
+			v-if="(clientEnvironmentId == 3 || clientEnvironmentId == 5) && taskType == 1 && (pType == 'feed' || pType == 'job')">
+			<view class="name">{{ pType == 'feed' ? '实际投料时间' : '实际报工时间' }} </view>
 		</view>
 
-		<view class="material " v-if="(clientEnvironmentId == 3||clientEnvironmentId == 5) && taskType == 1  && (pType == 'feed' || pType == 'job')">
+		<view class="material "
+			v-if="(clientEnvironmentId == 3 || clientEnvironmentId == 5) && taskType == 1 && (pType == 'feed' || pType == 'job')">
 
 			<view class="content_table">
 				<view class="item">
 
 					<view class="content ">
-						<uni-datetime-picker type="datetime" v-model="item.executorTime" />
+						<uni-datetime-picker type="datetime" 
+							@change="changeTime($event, item)" />
 					</view>
 				</view>
 
@@ -87,179 +90,191 @@
 </template>
 
 <script>
-	export default {
-		props: {
-			item: {
-				type: Object,
-				default: () => {}
-			},
-			isDetails: {
-				type: Boolean,
-				default: false
-			},
-
-			pType: {
-				type: '',
-				default: ''
-			},
-			
-			taskType: {
-				type: '',
-				default: ''
-			}
+export default {
+	props: {
+		item: {
+			type: Object,
+			default: () => { }
+		},
+		isDetails: {
+			type: Boolean,
+			default: false
+		},
 
+		pType: {
+			type: '',
+			default: ''
 		},
-		data() {
-			return {
-				clientEnvironmentId: uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo").clientEnvironmentId
+
+		taskType: {
+			type: '',
+			default: ''
+		}
+
+	},
+	data() {
+		return {
+			clientEnvironmentId: uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo").clientEnvironmentId
+		}
+	},
+	methods: {
+		changeTime(e, val) {
+
+			let a = e.split(' ');
+			console.log(a);
+			if (a[1] !== "") {
+				this.item.executorTime = e
+			} else {
+				this.item.executorTime = `${e}00:00:00`
+				
 			}
 		},
-		methods: {
-			handleScan(id) {
-				this.$emit('handleScan', id, 'wordOrder')
-			},
-		}
+
+		handleScan(id) {
+			this.$emit('handleScan', id, 'wordOrder')
+		},
 	}
+}
 </script>
 
 <style lang="scss" scoped>
-	.title_box {
-		.name {
-			font-size: 28rpx;
-			font-style: normal;
-			font-weight: 400;
-			color: $theme-color;
-			padding-left: 20rpx;
-
-			position: relative;
-
-			&:before {
-				position: absolute;
-				content: '';
-				left: 0rpx;
-				top: 0rpx;
-				bottom: 0rpx;
-				width: 4rpx;
-				height: 28rpx;
-				background: $theme-color;
-				margin: auto;
-			}
-
-
+.title_box {
+	.name {
+		font-size: 28rpx;
+		font-style: normal;
+		font-weight: 400;
+		color: $theme-color;
+		padding-left: 20rpx;
+
+		position: relative;
+
+		&:before {
+			position: absolute;
+			content: '';
+			left: 0rpx;
+			top: 0rpx;
+			bottom: 0rpx;
+			width: 4rpx;
+			height: 28rpx;
+			background: $theme-color;
+			margin: auto;
 		}
 
-		.btn_box {
-			padding: 0 18rpx;
-			height: 60rpx;
-			background: $theme-color;
-			font-size: 26rpx;
-			font-style: normal;
-			font-weight: 400;
-			font-size: 24rpx;
-			color: #fff;
-			border-radius: 4rpx;
-
-			.scan {
-				width: 34rpx;
-				height: 34rpx;
-				margin-right: 12rpx;
 
-			}
+	}
+
+	.btn_box {
+		padding: 0 18rpx;
+		height: 60rpx;
+		background: $theme-color;
+		font-size: 26rpx;
+		font-style: normal;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #fff;
+		border-radius: 4rpx;
+
+		.scan {
+			width: 34rpx;
+			height: 34rpx;
+			margin-right: 12rpx;
 
 		}
 
 	}
 
+}
 
-	.material {
-		margin-top: 10rpx;
 
+.material {
+	margin-top: 10rpx;
 
 
-		.content_table {
-			width: 100%;
-			border: 2rpx solid $border-color;
 
-			.item {
-				display: flex;
-				border-bottom: 2rpx solid $border-color;
+	.content_table {
+		width: 100%;
+		border: 2rpx solid $border-color;
 
+		.item {
+			display: flex;
+			border-bottom: 2rpx solid $border-color;
 
-				.lable {
-					width: 132rpx;
-					text-align: center;
-					background-color: #F7F9FA;
-					font-size: 26rpx;
-					border-right: 2rpx solid $border-color;
-					flex-shrink: 0;
-				}
 
-				.lable150 {
-					width: 156rpx !important;
-					font-size: 24rpx;
-				}
+			.lable {
+				width: 132rpx;
+				text-align: center;
+				background-color: #F7F9FA;
+				font-size: 26rpx;
+				border-right: 2rpx solid $border-color;
+				flex-shrink: 0;
+			}
 
-				.ww80 {
-					width: 80rpx;
-				}
+			.lable150 {
+				width: 156rpx !important;
+				font-size: 24rpx;
+			}
+
+			.ww80 {
+				width: 80rpx;
+			}
 
-				.content {
-					width: 518rpx;
-					min-height: 64rpx;
-					font-size: 28rpx;
-					line-height: 28rpx;
-					font-style: normal;
-					font-weight: 400;
-					padding: 18rpx 8rpx;
-					box-sizing: border-box;
-					word-wrap: break-word;
-					flex-grow: 1 !important;
-
-
-					.unit {
-						padding: 0 4rpx;
-						font-size: 24rpx;
-						color: #404446;
-					}
+			.content {
+				width: 518rpx;
+				min-height: 64rpx;
+				font-size: 28rpx;
+				line-height: 28rpx;
+				font-style: normal;
+				font-weight: 400;
+				padding: 18rpx 8rpx;
+				box-sizing: border-box;
+				word-wrap: break-word;
+				flex-grow: 1 !important;
 
-				}
 
-				.content_num {
-					display: flex;
-					align-items: center;
+				.unit {
 					padding: 0 4rpx;
+					font-size: 24rpx;
+					color: #404446;
+				}
 
-					/deep/ .uni-input-input {
-						border: 2rpx solid #F0F8F2;
-						background: #F0F8F2;
-						color: $theme-color;
-					}
-
+			}
 
-				}
+			.content_num {
+				display: flex;
+				align-items: center;
+				padding: 0 4rpx;
 
-				.pd4 {
-					padding: 4rpx 8rpx;
+				/deep/ .uni-input-input {
+					border: 2rpx solid #F0F8F2;
+					background: #F0F8F2;
+					color: $theme-color;
 				}
 
 
-
-				&:last-child {
-					border-bottom: none;
-				}
 			}
 
-			.ww55 {
-				width: 55%;
+			.pd4 {
+				padding: 4rpx 8rpx;
 			}
 
-			.ww45 {
-				width: 45%;
+
+
+			&:last-child {
+				border-bottom: none;
 			}
 		}
-	}
 
-	.mt20 {
-		margin-top: 20rpx;
+		.ww55 {
+			width: 55%;
+		}
+
+		.ww45 {
+			width: 45%;
+		}
 	}
+}
+
+.mt20 {
+	margin-top: 20rpx;
+}
 </style>

pages/pda/feeding/details.vue

@@ -7,6 +7,7 @@
 			<u-list @scrolltolower="scrolltolower">
 				<view v-for="(item, index) in List" :key="index" class="card_box">
 					<!-- 工单信息 -->
+					
 					<workOrderBom :item='item' pType="feed" :taskType="item.currentTaskDiagram.type"
 						@handleScan='handleScan'></workOrderBom>
 

pages/pda/jobBooking/components/jobBom.vue

@@ -112,11 +112,12 @@
 								 type="text"></input>
 						</view>
 					</view>
-					<view class="rx ww45 ">
+					<!-- v-if="clientEnvironmentId==2" -->
+					<view class="rx ww45 " >
 						<view class="lable ww80 rx-cc ">批次号</view>
 						<view class="content content_num" style="width: 100%;">
 							{{ item.batchNo }}
-							<input class="uni-input" v-model="item.workReportInfo.remark" :disabled="isDetails"
+							<input class="uni-input" v-model="batchNo" @input="batchNoNew" :disabled="isDetails"
 								 type="text"></input>
 						</view>
 					</view>
@@ -167,6 +168,7 @@ export default {
 
 	data() {
 		return {
+			batchNo:'',
 			notFormedList: [],
 			clientEnvironmentId: uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo")
 				.clientEnvironmentId, // *1 主环境-601环境   2 soll-索尔环境    3 tg-碳谷环境
@@ -191,7 +193,11 @@ export default {
 
 	},
 	methods: {
+		batchNoNew(e){
+
+			this.item.workReportInfo.batchNo = this.item.batchNo+e.target.value;
 
+		},
 
 		setFormedNum(num) {
 			this.item.workReportInfo.formedNum = num

pages/pda/jobBooking/components/packingBom.vue

@@ -73,8 +73,8 @@
 								<view class="item ww10 rx-cc ">{{ it.computeSize }}</view>
 								<view class="item ww30 content_num rx-sc">
 									<input class="uni-input" v-model="it.quantity" type="digit"></input>
-									<view style="width: 260rpx; font-size: 22rpx;"> {{ it.packageUnit }}/{{
-										item.conversionUnit }}
+									<view style="width: 260rpx; font-size: 22rpx;"> {{ it.unit }}/{{
+										it.packageUnit }}
 									</view>
 								</view>
 								<view class="item ww20 rx-cc ">{{ it.totalQuantity }}</view>
@@ -196,7 +196,7 @@ export default {
 			value : '',
 			minimumPackage: [],// 最小包装
 			withinPackage: [],// 内包装
-
+			minimumUnit:'',
 			outsidePackage: [], //外包装
 			newCategoryId: '',
 
@@ -211,7 +211,6 @@ export default {
 	watch: {
 		categoryId: {
 			handler(newVal) {
-				console.log(newVal, 'newVal');
 				this.newCategoryId = newVal;
 			},
 			deep: true,
@@ -219,10 +218,13 @@ export default {
 		},
 		objData: {
 			handler(newVal) {
-				console.log(newVal, 'newVal');
+	
 				if (newVal.product && newVal.product.length) {
-					this.formedNumLast = newVal.product[0].feedQuantity;
+					this.formedNumLast =newVal.formedNumLast||newVal.product[0].feedQuantity;
+				}else{
+					this.formedNumLast = 0;
 				}
+				this.packageDispositionFn();
 				// 
 			},
 			deep: true,
@@ -234,7 +236,7 @@ export default {
 
 		this.byCode();
 
-		this.packageDispositionFn();
+		
 		// this.getPackingDetails()
 		// this.getPackingDetailsTwo()
 	},
@@ -271,6 +273,8 @@ export default {
 		},
 
 		async packageDispositionFn() {
+
+			console.log(this.newCategoryId,'555555555555');
 			let that = this;
 			const res = await packageDisposition(this.newCategoryId);
 
@@ -310,11 +314,12 @@ export default {
 
 			if (v.length) {
 				this.withinQuantity = v[1].packageCell;//内包装数量
-				this.withinUnit = v[1].packageUnit;//内包装单位
+				this.withinUnit = v[1].conversionUnit;//内包装单位
 				this.outsideQuantity = v[2].packageCell;//外包装数量
-				this.outsideUnit = v[2].packageUnit;//外包装单位
+				this.outsideUnit = v[2].conversionUnit;//外包装单位
+				this.minimumUnit = v[0].conversionUnit;
 			};
-			console.log('几次');
+			console.log('几次',v);
 			this.handleSplit(v[0]);
 		},
 
@@ -465,6 +470,7 @@ export default {
 				totalQuantity: this.formedNumLast,//总数量
 				quantity: v.packageCell,//数量
 				unit: v.packageUnit,//单位
+				minimumUnit:this.minimumUnit,//最小包装单位
 
 				withinQuantity: this.withinQuantity,//内包装数量
 				withinUnit: this.withinUnit,//内包装单位
@@ -593,8 +599,13 @@ export default {
 			_packingReportMarginList = this.splitList.filter(e => {
 				return !e.parentId
 			})
+
+			console.log(this.DispositionList);
+
 			let packInfo = {
 				// this.DispositionList[0]
+
+
 				specText : this.text,
 				specValue : this.value,
 				minimumPackage:  this.minimumPackage,// 最小包装
@@ -618,6 +629,8 @@ export default {
 				outsideConversionUnit: this.DispositionList[2].conversionUnit,// 最小包装单位
 				outsideFormedNumLast : this.DispositionList[2].formedNumLast,// 总包装数量
 			}
+
+
 			return packInfo
 		},
 

pages/pda/jobBooking/components/packingBomDetails.vue

@@ -60,7 +60,8 @@
 							<view class="tr row rx-sc" v-for="(it, idx) in item.splitList" :key='idx'>
 								<view class="item ww10 rx-cc ">{{ it.computeSize }}</view>
 								<view class="item ww30 content_num rx-sc">
-									{{ it.quantity }}/ {{ it.unit }}
+									{{ it.quantity }} {{ it.unit }}/{{
+										it.packageUnit }}
 
 								</view>
 								<view class="item ww50">

pages/pda/jobBooking/index/index.vue

@@ -73,6 +73,7 @@
 
 					<!-- //包装扫码 -->
 					<view v-if="clientEnvironmentId != 2">
+
 						<packingBom :taskId='taskId' :workOrderId='id' :objData='objData' ref="packRef"
 							v-if='taskType == 4 && clientEnvironmentId != 3 && objData' :categoryId="categoryId"></packingBom>
 					</view>
@@ -254,6 +255,8 @@ export default {
 			isLoad: true,
 			categoryId:'',
 			objData: {
+				formedNumLast: 0,
+				product:[],
 				equipmentList: [],
 				modelList: [],
 				turnover: [],

pages/pda/warehousing/components/jobBom.vue

@@ -51,7 +51,7 @@
 						<view class="lable lable150 rx-cc ">合格品数量</view>
 						<view class="content content_num">
 							<input class="uni-input" v-model="item.workReportInfo.formedNum" :disabled="true"
-								 type="digit"></input>
+								type="digit"></input>
 							<view class="unit">{{ item.unit }}</view>
 						</view>
 					</view>
@@ -76,14 +76,11 @@
 						<view class="lable lable150 rx-cc ">不合格数量</view>
 						<view class="content content_num">
 							<!-- //详情 -->
-							<input class="uni-input" v-model="item.workReportInfo.notFormedNum" type="digit" :disabled="isDetails"
-						
-								@input="changeNum"></input>
-								
-							<input class="uni-input" v-model="not.notFormedNum" type="number" 
-						
-								></input>	
-								<!-- @input="changeNum(not)" -->
+							<input class="uni-input" v-model="item.workReportInfo.notFormedNum" type="digit"
+								:disabled="isDetails" @input="changeNum"></input>
+
+							<input class="uni-input" v-model="not.notFormedNum" type="number"></input>
+							<!-- @input="changeNum(not)" -->
 							<view class="unit">{{ item.unit }}</view>
 						</view>
 					</view>
@@ -92,9 +89,9 @@
 						<view class="lable rx-cc ww80">重量</view>
 						<view class="content content_num">
 							<input class="uni-input" v-model="item.workReportInfo.notFormedWeight" type="digit"
-								:disabled="isDetails" ></input>
+								:disabled="isDetails"></input>
 							<input class="uni-input" v-model="not.notFormedWeight" type="digit"
-								:disabled="isDetails" ></input>	
+								:disabled="isDetails"></input>
 							<view class="unit">{{ item.weightUnit }}</view>
 
 							<!-- <view class="penalize" v-if='!isDetails'
@@ -110,15 +107,17 @@
 						<view class="lable lable150 rx-cc ">报工备注</view>
 						<view class="content content_num" style="width: 100%;">
 							<input class="uni-input" v-model="item.workReportInfo.remark" :disabled="isDetails"
-								 type="text"></input>
+								type="text"></input>
 						</view>
 					</view>
-					<view class="rx ww45 ">
+					<!-- -->
+
+					<view class="rx ww45 " v-if="clientEnvironmentId==2" >
 						<view class="lable ww80 rx-cc ">批次号</view>
 						<view class="content content_num" style="width: 100%;">
 							{{ item.batchNo }}
-							<input class="uni-input" v-model="item.workReportInfo.remark" :disabled="isDetails"
-								 type="text"></input>
+							<input class="uni-input" v-model="batchNo" @input="batchNoNew" :disabled="isDetails"
+								type="text"></input>
 						</view>
 					</view>
 				</view>
@@ -168,6 +167,7 @@ export default {
 
 	data() {
 		return {
+			batchNo:'',
 			notFormedList: [],
 			clientEnvironmentId: uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo")
 				.clientEnvironmentId, // *1 主环境-601环境   2 soll-索尔环境    3 tg-碳谷环境
@@ -193,9 +193,13 @@ export default {
 	},
 	methods: {
 
+		batchNoNew(e) {
+
+			this.item.workReportInfo.batchNo = this.item.batchNo + e.target.value;
 
+		},
 		setFormedNum(num) {
-			
+
 
 			this.item.workReportInfo.formedNum = num
 
@@ -229,26 +233,26 @@ export default {
 		},
 
 		blurNum(value) {
-			console.log(num,'6666666666666');
+			console.log(num, '6666666666666');
 
 			let total = 0;
 			//匹配非数字
-			let val=value.formedNum;
-			let reg = new RegExp("([^0-9]*)","g");
+			let val = value.formedNum;
+			let reg = new RegExp("([^0-9]*)", "g");
 			let ma = val.match(reg);
 			//如果有非数字，替换成""
-			if(ma.length>0){
-				for(let k in ma){
-					if(ma[k]!=""){
-						val = val.replace(ma[k],0);
+			if (ma.length > 0) {
+				for (let k in ma) {
+					if (ma[k] != "") {
+						val = val.replace(ma[k], 0);
 					}
 				}
 			}
 			//可以为0，但不能以0开头
-			if(val.startsWith("0")&&val.length>1){
-				val = val.substring(1,val.length);
+			if (val.startsWith("0") && val.length > 1) {
+				val = val.substring(1, val.length);
 			}
-			value.formedNum=val;
+			value.formedNum = val;
 
 			if (this.item.currentTaskDiagram.isFirstTask) {
 
@@ -275,7 +279,7 @@ export default {
 							title: '合格品数量不能大于投料数量'
 						})
 					}
-					
+
 				}
 			}
 
@@ -319,8 +323,8 @@ export default {
 			this.$refs.modelRef.setNum(num)
 		},
 		notForme() {
-			console.log(num,'77777777777777');
-			let weight = Number(this.notFormedList[0].notFormedNum||0) * Number(this.item.singleWeight) * Number(this
+			console.log(num, '77777777777777');
+			let weight = Number(this.notFormedList[0].notFormedNum || 0) * Number(this.item.singleWeight) * Number(this
 				.item.weightMultiple)
 			if (this.item.singleWeightUnit == 'G' || this.item.singleWeightUnit == 'g' || this.item.singleWeightUnit ==
 				'克') {
@@ -338,7 +342,7 @@ export default {
 					.notFormedNum))
 
 
-				let weight = Number(this.item.workReportInfo?.formedNum||0) * Number(this.item.singleWeight) * Number(this
+				let weight = Number(this.item.workReportInfo?.formedNum || 0) * Number(this.item.singleWeight) * Number(this
 					.item.weightMultiple)
 				if (this.item.singleWeightUnit == 'G' || this.item.singleWeightUnit == 'g' || this.item
 					.singleWeightUnit == '克') {
@@ -357,23 +361,23 @@ export default {
 		},
 
 		changeNum(value) {
-	
+
 			// 不合格数量
 			let val = value.notFormedNum;
 			//匹配非数字
-			let reg = new RegExp("([^0-9]*)","g");
+			let reg = new RegExp("([^0-9]*)", "g");
 			let ma = val.match(reg);
 			//如果有非数字，替换成""
-			if(ma.length>0){
-				for(let k in ma){
-					if(ma[k]!=""){
-						val = val.replace(ma[k],"0");
+			if (ma.length > 0) {
+				for (let k in ma) {
+					if (ma[k] != "") {
+						val = val.replace(ma[k], "0");
 					}
 				}
 			}
 			//可以为0，但不能以0开头
-			if(val.startsWith("0")&&val.length>1){
-				val = val.substring(1,val.length);
+			if (val.startsWith("0") && val.length > 1) {
+				val = val.substring(1, val.length);
 			}
 
 			// this.$set(this.item.workReportInfo, 'formedNum', val)
@@ -384,7 +388,7 @@ export default {
 
 			let total = Number(this.item.workReportInfo.formedNum) + Number(this.notFormedList[0].notFormedNum)
 
-			
+
 			console.log(total);
 
 			this.$emit('modeNum', total)

pages/pda/warehousing/components/packingBom.vue

@@ -61,7 +61,8 @@
 							<view class="tr row rx-sc" v-for="(it, idx) in item.splitList" :key='idx'>
 								<view class="item ww10 rx-cc ">{{ it.computeSize }}</view>
 								<view class="item ww30 content_num rx-sc">
-									{{ it.quantity }}/ {{ it.unit }}
+									{{ it.quantity }} {{ it.unit }}/{{
+										it.packageUnit }}
 
 								</view>
 								<view class="item ww50">
@@ -101,37 +102,52 @@ export default {
 	watch: {
 		objData: {
 			handler(val) {
-				console.log(val, '5555555555555');
-
 				this.specText = val.specText || '';
 
-				let minimumObj = {
-					title: '最小包装',
-					splitList: val.minimumPackage,
-					packageCell: val.minimumPackageCell,
-					packageUnit: val.minimumPackageUnit,
-					conversionUnit: val.minimumConversionUnit,
-					formedNumLast: val.minimumFormedNumLast
-				}
-				let withinObj = {
-					title: '内包装',
-					splitList: val.withinPackage,
-					packageCell: val.withinPackageCell,
-					packageUnit: val.withinPackageUnit,
-					conversionUnit: val.withinConversionUnit,
-					formedNumLast: val.withinFormedNumLast
-				}
-				let outsideObj = {
-					title: '外包装',
-					splitList: val.outsidePackage,
-					packageCell: val.outsidePackageCell,
-					packageUnit: val.outsidePackageUnit,
-					conversionUnit: val.outsideConversionUnit,
-					formedNumLast: val.outsideFormedNumLast
-				}
-				let arr = [minimumObj, withinObj, outsideObj];
-
-				this.list = arr;
+				const createPackageObj = (title, prefix) => ({
+					title,
+					splitList: val[`${prefix}Package`],
+					packageCell: val[`${prefix}PackageCell`],
+					packageUnit: val[`${prefix}PackageUnit`],
+					conversionUnit: val[`${prefix}ConversionUnit`],
+					formedNumLast: val[`${prefix}FormedNumLast`]
+				});
+
+				this.list = [
+					createPackageObj('最小包装', 'minimum'),
+					createPackageObj('内包装', 'within'),
+					createPackageObj('外包装', 'outside')
+				];
+
+				// this.specText = val.specText || '';
+
+				// let minimumObj = {
+				// 	title: '最小包装',
+				// 	splitList: val.minimumPackage,
+				// 	packageCell: val.minimumPackageCell,
+				// 	packageUnit: val.minimumPackageUnit,
+				// 	conversionUnit: val.minimumConversionUnit,
+				// 	formedNumLast: val.minimumFormedNumLast
+				// }
+				// let withinObj = {
+				// 	title: '内包装',
+				// 	splitList: val.withinPackage,
+				// 	packageCell: val.withinPackageCell,
+				// 	packageUnit: val.withinPackageUnit,
+				// 	conversionUnit: val.withinConversionUnit,
+				// 	formedNumLast: val.withinFormedNumLast
+				// }
+				// let outsideObj = {
+				// 	title: '外包装',
+				// 	splitList: val.outsidePackage,
+				// 	packageCell: val.outsidePackageCell,
+				// 	packageUnit: val.outsidePackageUnit,
+				// 	conversionUnit: val.outsideConversionUnit,
+				// 	formedNumLast: val.outsideFormedNumLast
+				// }
+				// let arr = [minimumObj, withinObj, outsideObj];
+
+				// this.list = arr;
 
 				console.log(this.list);
 			},
@@ -240,79 +256,80 @@ export default {
 }
 
 .content_table {
-		width: 100%;
-		border: 2rpx solid $border-color;
-
-		.item {
-			display: flex;
-			border-bottom: 2rpx solid $border-color;
+	width: 100%;
+	border: 2rpx solid $border-color;
 
+	.item {
+		display: flex;
+		border-bottom: 2rpx solid $border-color;
 
-			.lable {
-				width: 132rpx;
-				text-align: center;
-				background-color: #F7F9FA;
-				font-size: 26rpx;
-				border-right: 2rpx solid $border-color;
-				flex-shrink: 0;
-			}
 
-			.lable220 {
-				width: 220rpx !important;
-				font-size: 24rpx;
-			}
-
-			.lable150 {
-				width: 156rpx !important;
-				font-size: 24rpx;
-			}
-
-			.ww80 {
-				width: 80rpx;
-			}
+		.lable {
+			width: 132rpx;
+			text-align: center;
+			background-color: #F7F9FA;
+			font-size: 26rpx;
+			border-right: 2rpx solid $border-color;
+			flex-shrink: 0;
+		}
 
-			.content {
-				width: 518rpx;
-				min-height: 64rpx;
-				font-size: 28rpx;
-				line-height: 28rpx;
-				font-style: normal;
-				font-weight: 400;
-				// padding: 18rpx 8rpx;
-				box-sizing: border-box;
-				word-wrap: break-word;
-				flex-grow: 1 !important;
+		.lable220 {
+			width: 220rpx !important;
+			font-size: 24rpx;
+		}
 
+		.lable150 {
+			width: 156rpx !important;
+			font-size: 24rpx;
+		}
 
-				.unit {
-					padding: 0 4rpx;
-					font-size: 24rpx;
-					color: #404446;
-				}
+		.ww80 {
+			width: 80rpx;
+		}
 
+		.content {
+			width: 518rpx;
+			min-height: 64rpx;
+			font-size: 28rpx;
+			line-height: 28rpx;
+			font-style: normal;
+			font-weight: 400;
+			// padding: 18rpx 8rpx;
+			box-sizing: border-box;
+			word-wrap: break-word;
+			flex-grow: 1 !important;
 
 
+			.unit {
+				padding: 0 4rpx;
+				font-size: 24rpx;
+				color: #404446;
 			}
 
 
 
-			&:last-child {
-				border-bottom: none;
-			}
 		}
 
 
 
-		.ww55 {
-			width: 55%;
+		&:last-child {
+			border-bottom: none;
 		}
+	}
 
-		.ww45 {
-			width: 45%;
-		}
 
 
+	.ww55 {
+		width: 55%;
+	}
+
+	.ww45 {
+		width: 45%;
 	}
+
+
+}
+
 .material {
 	margin-top: 10rpx;
 

pages/pda/warehousing/index.vue

@@ -239,7 +239,7 @@ export default {
 			
 
 			let storageInfo = {
-				inWarehouseSpecType: this.clientEnvironmentId == 3||this.clientEnvironmentId == 2 ?Number(this.inWarehouseSpecType):'',
+				inWarehouseSpecType: this.clientEnvironmentId !== 3||this.clientEnvironmentId !== 2 ?Number(this.inWarehouseSpecType):'',
 				warehouseId: this.warehouseId,
 				inWarehouseType: this.inWarehouseType,
 			    toWarehouseList: this.clientEnvironmentId == 3 ? this.tgList : this.List,