55

pages/pda/feeding/components/deviceBom.vue

@@ -122,10 +122,12 @@
 										<view class="item ww10">
 											{{ it.code }}
 										</view>
-										<view class="item ww25 " :class="{'color157': it.workOrderCode === wordItem.code}">
+										<view class="item ww25 "
+											:class="{'color157': it.workOrderCode === wordItem.code}">
 											{{ it.workOrderCode }}
 										</view>
-										<view class="item ww25 " :class="{'color157': it.workOrderCode === wordItem.code}">
+										<view class="item ww25 "
+											:class="{'color157': it.workOrderCode === wordItem.code}">
 											{{ it.categoryCode }}
 										</view>
 
@@ -134,8 +136,10 @@
 										</view>
 
 										<view class="item ww20">
-											<input :class="['uni-input', wordItem.code == it.workOrderCode && it.quantity > 0 ? 'content_num' : '']"
-												v-model="it.feedNum" type="digit" :disabled="it.quantity <= 0 || wordItem.code != it.workOrderCode "
+											<input
+												:class="['uni-input', wordItem.code == it.workOrderCode && it.quantity > 0 ? 'content_num' : '']"
+												v-model="it.feedNum" type="digit"
+												:disabled="it.quantity <= 0 || wordItem.code != it.workOrderCode "
 												@blur="Number(it.feedNum) > Number(it.quantity) ? it.feedNum = Number(it.quantity) : ''"></input>
 										</view>
 
@@ -177,451 +181,449 @@
 </template>
 
 <script>
-import SearchPopup from '../../components/searchPopup.vue'
-export default {
-	components: {
-		SearchPopup
-	},
-	props: {
-		workOrderId: {
-			type: String,
-			default: ''
-		},
-		list: {
-			type: Array,
-			default: () => []
-		},
-
-		ishuoWei: {
-			type: Boolean,
-			default: true
-		},
-		wordItem: {
-			type: Object,
-			default: () => { }
+	import SearchPopup from '../../components/searchPopup.vue'
+	export default {
+		components: {
+			SearchPopup
 		},
+		props: {
+			workOrderId: {
+				type: String,
+				default: ''
+			},
+			list: {
+				type: Array,
+				default: () => []
+			},
 
-		turnover: {
-			type: Array,
-			default: () => []
-		}
+			ishuoWei: {
+				type: Boolean,
+				default: true
+			},
+			wordItem: {
+				type: Object,
+				default: () => {}
+			},
 
+			turnover: {
+				type: Array,
+				default: () => []
+			}
 
 
-	},
-	data() {
-		return {
-			popupShow: false,
-			formData: {
-				turnoverId: null
-			},
-			listIndex: null,
-			clientEnvironmentId: uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo").clientEnvironmentId,
 
-			turnoverList: [{
-				name: '周转车',
-				turnoverId: '',
-				turnoverName: '',
-				positionList: []
-			}],
+		},
+		data() {
+			return {
+				popupShow: false,
+			
+				listIndex: null,
+				clientEnvironmentId: uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo").clientEnvironmentId,
 
-			tabAct: 0
+				turnoverList: [{
+					name: '周转车',
+					turnoverId: '',
+					turnoverName: '',
+					positionList: []
+				}],
 
+				tabAct: 0
 
 
 
-		}
-	},
-	created() {
 
-	},
-	methods: {
-		handleScan(id) {
-			this.$emit('scanIt', id,)
+			}
 		},
+		created() {
 
-		getDelete(idx) {
-			this.list.splice(idx, 1)
 		},
+		methods: {
+			handleScan(id) {
+				this.$emit('scanIt', id, )
+			},
 
-		handleStorage(idx) {
-			this.listIndex = idx || 0
-			this.popupShow = true
+			getDelete(idx) {
+				this.list.splice(idx, 1)
+			},
 
+			handleStorage(idx) {
+				this.listIndex = idx || 0
+				this.popupShow = true
 
-		},
 
+			},
 
 
 
 
-		handleClose() {
-			this.list[this.listIndex].extInfo.turnoverList = []
-			this.popupShow = false
-			this.listIndex = 0
 
+			handleClose() {
+				this.list[this.listIndex].extInfo.turnoverList = []
+				this.popupShow = false
+				this.listIndex = 0
 
 
-		},
 
-		handleOk() {
-			this.listIndex = 0
-			this.$set(this.list[this.listIndex].extInfo, 'turnoverList', this.turnoverList)
-			this.popupShow = false
-		},
+			},
+
+			handleOk() {
+				this.listIndex = 0
+				this.$set(this.list[this.listIndex].extInfo, 'turnoverList', this.turnoverList)
+				this.popupShow = false
+			},
 
 
-		scrolltolower() { },
+			scrolltolower() {},
 
 
-		changeTurnover(e, idxx) {
+			changeTurnover(e, idxx) {
 
 
 
-			let _arr = e.extInfo.positionList || []
-			console.log(_arr)
+				let _arr = e.extInfo.positionList || []
+				console.log(_arr)
 
-			let isFalse = _arr.some(it => {
-				return it.workOrderCode == this.wordItem.code && it.categoryCode == this.wordItem
-					.productCode && it.quantity > 0
-			})
-			if (!isFalse) {
-				uni.showToast({
-					title: "该周转车没有此工单",
-					icon: "none",
+				let isFalse = _arr.some(it => {
+					return it.workOrderCode == this.wordItem.code && it.categoryCode == this.wordItem
+						.productCode && it.quantity > 0
 				})
-				this.$set(this.turnoverList[idxx], 'turnoverId', '')
-				this.$set(this.turnoverList[idxx], 'turnoverName', '')
-				this.$set(this.turnoverList[idxx], 'positionList', [])
+				if (!isFalse) {
+					uni.showToast({
+						title: "该周转车没有此工单",
+						icon: "none",
+					})
+					this.$set(this.turnoverList[idxx], 'turnoverId', '')
+					this.$set(this.turnoverList[idxx], 'turnoverName', '')
+					this.$set(this.turnoverList[idxx], 'positionList', [])
+
+					return false
+				}
 
-				return false
-			}
+				this.$set(this.turnoverList[idxx], 'turnoverName', e.name + '-' + e.code)
+				this.$set(this.turnoverList[idxx], 'positionList', JSON.parse(JSON.stringify(e.extInfo.positionList)))
+				this.$forceUpdate()
 
-			this.$set(this.turnoverList[idxx], 'turnoverName', e.name + '-' + e.code)
-			this.$set(this.turnoverList[idxx], 'positionList', e.extInfo.positionList)
-			this.$forceUpdate()
+			},
 
-		},
+			handTabAdd() {
+				if (this.turnover.length <= this.turnoverList.length) {
+					uni.showToast({
+						title: "超过最大周转车数",
+						icon: "none",
+					})
+					return false
+				}
 
-		handTabAdd() {
-			if (this.turnover.length <= this.turnoverList.length) {
-				uni.showToast({
-					title: "超过最大周转车数",
-					icon: "none",
+				this.turnoverList.push({
+					name: '周转车',
+					turnoverId: '',
+					turnoverName: '',
+					positionList: []
 				})
-				return false
-			}
-
-			this.turnoverList.push({
-				name: '周转车',
-				turnoverId: '',
-				turnoverName: '',
-				positionList: []
-			})
 
-			console.log(this.list[this.listIndex].extInfo)
-			this.$forceUpdate()
+				console.log(this.list[this.listIndex].extInfo)
+				this.$forceUpdate()
 
-		},
+			},
 
-		handTab(idxx) {
-			this.tabAct = idxx
-		},
+			handTab(idxx) {
+				this.tabAct = idxx
+			},
 
-		handDel(idx) {
-			if(this.turnoverList.length <= 1) {
-				uni.showToast({
-					title: "最少需要一个周转车",
-					icon: "none",
-				})
-				return
+			handDel(idx) {
+				if (this.turnoverList.length <= 1) {
+					uni.showToast({
+						title: "最少需要一个周转车",
+						icon: "none",
+					})
+					return
+				}
+				this.turnoverList.splice(idx, 1)
 			}
-			this.turnoverList.splice(idx, 1)
 		}
 	}
-}
 </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;
+	.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;
+			}
+
+
 		}
 
+		.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: 680rpx;
+			border: 2rpx solid $border-color;
+			margin-bottom: 10rpx;
 
-	.content_table {
-		width: 680rpx;
-		border: 2rpx solid $border-color;
-		margin-bottom: 10rpx;
+			.item {
+				display: flex;
+				border-bottom: 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;
+				}
 
-			.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;
+				}
 
-			.lable150 {
-				width: 156rpx !important;
-				font-size: 24rpx;
-			}
+				.ww80 {
+					width: 80rpx;
+				}
 
-			.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;
+				}
 
 
-				.unit {
-					padding: 0 4rpx;
-					font-size: 24rpx;
-					color: #404446;
+				.pd4 {
+					padding: 4rpx 8rpx;
 				}
 
-			}
 
 
-			.pd4 {
-				padding: 4rpx 8rpx;
+				&:last-child {
+					border-bottom: none;
+				}
 			}
 
+			.ww50 {
+				width: 50%;
 
-
-			&:last-child {
-				border-bottom: none;
 			}
-		}
 
-		.ww50 {
-			width: 50%;
-
-		}
-
-		.ww55 {
-			width: 55%;
-		}
+			.ww55 {
+				width: 55%;
+			}
 
-		.ww45 {
-			width: 45%;
+			.ww45 {
+				width: 45%;
+			}
 		}
 	}
-}
 
 
 
-.search_list {
-	min-height: 100rpx;
-	width: 96vw;
-	padding: 0 8rpx;
-
-	/deep/ .u-form-item__body {
-		padding: 6rpx 0rpx !important;
-	}
+	.search_list {
+		min-height: 100rpx;
+		width: 96vw;
+		padding: 0 8rpx;
 
-}
+		/deep/ .u-form-item__body {
+			padding: 6rpx 0rpx !important;
+		}
 
+	}
 
 
 
-.content_table2 {
-	width: 100%;
-	margin-top: 6rpx;
 
-	.row {
+	.content_table2 {
 		width: 100%;
+		margin-top: 6rpx;
 
+		.row {
+			width: 100%;
 
-		.item {
 
-			color: #404446;
-			font-size: 28rpx;
-			padding-left: 12rpx;
-			padding-right: 6rpx;
+			.item {
 
-		}
+				color: #404446;
+				font-size: 28rpx;
+				padding-left: 12rpx;
+				padding-right: 6rpx;
 
-		.color157 {
-			color: $theme-color;
-		}
+			}
 
+			.color157 {
+				color: $theme-color;
+			}
 
-		.ww20 {
-			width: 20%;
-		}
 
-		.ww25 {
-			width: 25%;
-		}
+			.ww20 {
+				width: 20%;
+			}
 
+			.ww25 {
+				width: 25%;
+			}
 
 
-		.ww35 {
-			width: 35%;
 
-		}
+			.ww35 {
+				width: 35%;
 
-		.ww10 {
-			width: 10%;
-		}
+			}
 
+			.ww10 {
+				width: 10%;
+			}
 
 
-	}
 
-	.head {
-		height: 64rpx;
-		background: #F7F9FA;
-		border-top: 2rpx solid #E3E5E5;
-		border-left: 2rpx solid #E3E5E5;
-		box-sizing: border-box;
+		}
 
-		.item {
+		.head {
 			height: 64rpx;
-			line-height: 64rpx;
-			border-right: 2rpx solid #E3E5E5;
+			background: #F7F9FA;
+			border-top: 2rpx solid #E3E5E5;
+			border-left: 2rpx solid #E3E5E5;
 			box-sizing: border-box;
-			font-size: 24rpx;
-		}
-	}
 
+			.item {
+				height: 64rpx;
+				line-height: 64rpx;
+				border-right: 2rpx solid #E3E5E5;
+				box-sizing: border-box;
+				font-size: 24rpx;
+			}
+		}
 
 
-	.tr {
-		border-top: 2rpx solid #E3E5E5;
-		border-left: 2rpx solid #E3E5E5;
-		box-sizing: border-box;
 
-		.item {
-			font-size: 24rpx;
-			min-height: 64rpx;
-			display: flex;
-			align-items: center;
-			border-right: 2rpx solid #E3E5E5;
+		.tr {
+			border-top: 2rpx solid #E3E5E5;
+			border-left: 2rpx solid #E3E5E5;
 			box-sizing: border-box;
-			white-space: normal;
-			word-break: break-all;
 
-		}
+			.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;
+			&:last-child {
+				border-bottom: 2rpx solid #E3E5E5;
 
+			}
 		}
 	}
-}
-
-
-.z_list {
-	max-height: 500rpx;
-}
 
-.content_num {
-	display: flex;
-	align-items: center;
-	padding: 0 4rpx;
 
-	/deep/ .uni-input-input {
-		border: 2rpx solid #F0F8F2;
-		background: #F0F8F2;
-		color: $theme-color;
+	.z_list {
+		max-height: 500rpx;
 	}
 
+	.content_num {
+		display: flex;
+		align-items: center;
+		padding: 0 4rpx;
 
-}
+		/deep/ .uni-input-input {
+			border: 2rpx solid #F0F8F2;
+			background: #F0F8F2;
+			color: $theme-color;
+		}
 
 
-.tab_box {
-	margin-top: 14rpx;
-	margin-left: 8rpx;
-	display: flex;
-	align-items: center;
+	}
 
-	.tab_item {
+
+	.tab_box {
+		margin-top: 14rpx;
+		margin-left: 8rpx;
 		display: flex;
-		padding: 0 6rpx;
-		height: 48rpx;
-		line-height: 48rpx;
-		width: 128rpx;
-		text-align: center;
-		background: #157A2C;
-		font-style: normal;
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #fff;
-		border-radius: 4rpx;
-		margin-right: 8rpx;
-	}
+		align-items: center;
 
-	.tab_add {
-		color: #157A2C;
-		font-size: 34rpx;
+		.tab_item {
+			display: flex;
+			padding: 0 6rpx;
+			height: 48rpx;
+			line-height: 48rpx;
+			width: 128rpx;
+			text-align: center;
+			background: #157A2C;
+			font-style: normal;
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #fff;
+			border-radius: 4rpx;
+			margin-right: 8rpx;
+		}
+
+		.tab_add {
+			color: #157A2C;
+			font-size: 34rpx;
+		}
 	}
-}
 </style>

pages/pda/feeding/details.vue

@@ -284,6 +284,7 @@
 			 } 
 			   
                 console.log('投料', this.List)
+				 return false
 				batchSave(this.List).then(res => {
 
 					uni.redirectTo({