ysy 2 лет назад
Родитель
Сommit
82d0db5196

+ 1 - 1
pages/pda/components/bottomOperate.vue

@@ -215,7 +215,7 @@
 
 
 		created() {
-
+             this.getTwoTree()
 		},
 
 		methods: {

+ 1 - 1
pages/pda/jobBooking/components/jobBom.vue

@@ -67,7 +67,7 @@
 
 
 
-				<view class="item rx-sc" v-for="(not,notIndex) in notFormedList" :key='notIndex'>
+				<view class="item rx-sc" v-for="(not,notIndex) in notFormedList"  :key='notIndex'>
 
 					<view class="rx ww55 ">
 

+ 11 - 10
pages/pda/jobBooking/components/packingBom.vue

@@ -66,7 +66,8 @@
 							<view class="item ww10 rx-cc" v-if="!it.parentId" @click="handleCheck( idx, it)">
 								<image class="check" v-if='it.check == 1' src='@/static/check.png'>
 								</image>
-								<image class="check" v-if='it.check == 0 || it.check == null ' src='@/static/check_no.png'>
+								<image class="check" v-if='it.check == 0 || it.check == null '
+									src='@/static/check_no.png'>
 								</image>
 							</view>
 
@@ -108,8 +109,8 @@
 							{{ it.code }}
 						</view>
 						<view class="item ww10 rx-cc">
-							<uni-icons custom-prefix="iconfont" type="icon-shanchu" size="20"
-								color="#fa3534" @click="handclose(it)"></uni-icons>
+							<uni-icons custom-prefix="iconfont" type="icon-shanchu" size="20" color="#fa3534"
+								@click="handclose(it)"></uni-icons>
 						</view>
 
 
@@ -366,7 +367,7 @@
 
 					return false
 				}
-				
+
 				this.$set(this.splitList[idx], 'check', it.check ? 0 : 1)
 
 				this.temporaryList = []
@@ -386,18 +387,18 @@
 
 
 			},
-			
-			
+
+
 			handclose(it) {
 				this.splitList.forEach(f => {
-					if(f.computeSize == it.computeSize) {
+					if (f.computeSize == it.computeSize) {
 						f.check = 0
 					}
 				})
-				
+
 				this.temporaryList = []
-				
-				
+
+
 				this.temporaryList = this.splitList.filter(e => {
 					return e.check == 1
 				})

+ 320 - 0
pages/pda/jobBooking/components/packingBomDetails.vue

@@ -0,0 +1,320 @@
+<template>
+
+	<view>
+		<view class="title_box rx-bc">
+			<view class="name">内包装</view>
+		</view>
+
+		<view class="material ">
+
+		
+
+
+
+			<view class="content_table2" v-if='packInfo.packingReportMarginList.length > 0'>
+				<view class="head row rx-sc">
+					<view class="item ww10">序号</view>
+					<view class="item ww30">数量</view>
+					<view class="item ww50">条码</view>
+					<view class="item ww10"></view>
+				</view>
+
+				<view class="table">
+					<u-list @scrolltolower="scrolltolower" class="z_list">
+						<view class="tr row rx-sc" v-for="(it, idx) in packInfo.packingReportMarginList" :key='idx'>
+							<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;"> 
+								<!-- {{objData.unit}} -->
+								/ {{it.unit}}</view> 
+							</view>
+							<view class="item ww50">
+								{{ it.code }}
+							</view>
+							<view class="item ww10 rx-cc" v-if="!it.parentId" @click="handleCheck( idx, it)">
+								<image class="check" v-if='it.check == 1' src='@/static/check.png'>
+								</image>
+								<image class="check" v-if='it.check == 0 || it.check == null '
+									src='@/static/check_no.png'>
+								</image>
+							</view>
+
+						</view>
+
+					</u-list>
+				</view>
+			</view>
+
+
+
+		</view>
+
+
+		<view class="material ">
+
+			<view class="title_box rx-bc">
+				<view class="name">外包装</view>
+			</view>
+
+
+
+
+
+
+			<!-- 外包装  列表-->
+			<view class="content_table2" v-if='packInfo.packingReportList.length > 0'>
+				<view class="head row rx-sc">
+					<view class="item ww10">序号</view>
+					<view class="item ww30">数量</view>
+
+					<view class="item ww50">条码</view>
+					<view class="item ww10"></view>
+				</view>
+
+				<view class="table">
+					<view class="tr row rx-sc " v-for="(it, idx) in packInfo.packingReportList" :key='idx'>
+						<view class="item ww10 rx-cc ">{{ idx + 1 }}</view>
+						<view class="item ww30 content_num rx-sc">
+							{{ it.quantity}}  / {{it.unit}}
+						</view>
+
+
+
+						<view class="item ww50">
+							{{ it.code }}
+						</view>
+						<view class="item ww10 rx-cc">
+
+						</view>
+
+
+					</view>
+
+
+				</view>
+
+			</view>
+
+
+
+
+
+
+
+
+
+		</view>
+
+
+
+
+
+	</view>
+</template>
+
+<script>
+
+	export default {
+		props: {
+			packInfo: {
+				type: Object,
+				default: () => {}
+			},
+	
+		},
+		data() {
+			return {
+			
+
+
+
+
+			
+
+
+
+
+
+			}
+		},
+
+		created() {
+	
+
+	
+		},
+
+		methods: {
+
+
+
+
+
+			scrolltolower() {
+
+			},
+
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.title_box {
+		margin-top: 20rpx;
+
+		.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;
+			}
+		}
+	}
+
+
+	.material {
+		margin-top: 10rpx;
+
+
+	}
+
+
+
+
+	.content_table2 {
+		width: 100%;
+		margin-top: 16rpx;
+
+		.row {
+			width: 100%;
+
+
+			.item {
+
+				color: #404446;
+				font-size: 28rpx;
+				padding-left: 12rpx;
+
+			}
+
+			.color157 {
+				color: $theme-color;
+			}
+
+			.ww30 {
+				width: 30%;
+			}
+
+			.ww50 {
+				width: 50%;
+
+			}
+
+			.ww90 {
+				width: 90%;
+			}
+
+			.ww15 {
+				width: 15%;
+			}
+
+			.ww10 {
+				width: 10%;
+			}
+
+			.ww30 {
+				width: 30%;
+			}
+
+		}
+
+		.head {
+			height: 64rpx;
+			background: #F7F9FA;
+			border-top: 2rpx solid #E3E5E5;
+			border-left: 2rpx solid #E3E5E5;
+
+			.item {
+				height: 64rpx;
+				line-height: 64rpx;
+				border-right: 2rpx solid #E3E5E5;
+				box-sizing: border-box;
+			}
+		}
+
+
+
+		.tr {
+			border-top: 2rpx solid #E3E5E5;
+			border-left: 2rpx solid #E3E5E5;
+
+
+			.item {
+				font-size: 24rpx;
+				min-height: 64rpx;
+				display: flex;
+				align-items: center;
+				border-right: 2rpx solid #E3E5E5;
+				box-sizing: border-box;
+				white-space: normal;
+				word-break: break-all;
+
+			}
+
+			&:last-child {
+				border-bottom: 2rpx solid #E3E5E5;
+
+			}
+		}
+	}
+
+
+
+
+	.content_num {
+		display: flex;
+		align-items: center;
+		padding: 0 4rpx;
+
+		/deep/ .uni-input-input {
+			border: 2rpx solid #F0F8F2;
+			background: #F0F8F2;
+			color: $theme-color;
+		}
+
+
+	}
+
+	.penalize {
+		width: 86rpx;
+		line-height: 60rpx;
+		background: $theme-color;
+		font-size: 24rpx;
+		text-align: center;
+		color: #fff;
+	}
+
+	.check {
+		width: 30rpx;
+		height: 30rpx;
+	}
+
+	.z_list {
+		max-height: 500rpx;
+	}
+</style>

+ 1 - 1
pages/pda/jobBooking/index/index.vue

@@ -193,7 +193,7 @@
 				id: null,
 				taskId: null,
 
-				clientEnvironmentId: uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo")
+				clientEnvironmentId:   uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo")
 					.clientEnvironmentId, // *1 主环境-601环境   2 soll-索尔环境    3 tg-碳谷环境
 
 			}

+ 11 - 4
pages/pda/workOrder/index/details.vue

@@ -53,10 +53,11 @@
 
 
 
-
 					<packingTgBom
-						v-if='objData.packInfo && objData.packInfo.pickOutInList &&   objData.packInfo.pickOutInList != 0 && taskType == 4 '
+						v-if='objData.packInfo && objData.packInfo.pickOutInList &&   objData.packInfo.pickOutInList != 0 && taskType == 4 && clientEnvironmentId == 3 '
 						:list='objData.packInfo.pickOutInList'   :isWarehousing='true' :isDetails="true"></packingTgBom>
+						
+						<packingBom v-if="objData.packInfo && clientEnvironmentId == 2" :packInfo="objData.packInfo"  > </packingBom>
 
 
 
@@ -93,6 +94,7 @@
 	import palletBom from '../../feeding/components/palletBom.vue'
 	import revolvingDiskBom from '../../feeding/components/revolvingDiskBom.vue'
 	import packingTgBom from '../../jobBooking/components/packingTgBom.vue'
+	import packingBom from '../../jobBooking/components/packingBomDetails.vue'
 
 	export default {
 		components: {
@@ -110,14 +112,18 @@
 			sampleBom,
 			palletBom,
 			revolvingDiskBom,
-			packingTgBom
+			packingTgBom,
+			packingBom
 		},
 		data() {
 			return {
 				workOrderId: null,
 				taskId: null,
 				list: [],
-				taskType: 1
+				taskType: 1,
+				
+				clientEnvironmentId: 2 ||  uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo")
+					.clientEnvironmentId, // *1 主环境-601环境   2 soll-索尔环境    3 tg-碳谷环境
 			}
 		},
 		onLoad(options) {
@@ -136,6 +142,7 @@
 				}
 				listWorkReport(param).then(res => {
 					this.list = res
+					console.log(11,res)
 					
 				})
 			},