优化

pages/pda/jobBooking/components/oneJobBom.vue

@@ -0,0 +1,431 @@
+<template>
+	<view>
+		<view class="title_box rx-bc">
+			<view class="name">报工信息</view>
+
+
+		</view>
+
+
+		<view class="material ">
+
+
+			<view class="content_table">
+
+				<view class="item rx-sc">
+					<view class="rx">
+						<view class="lable lable150 rx-cc ">物料编码</view>
+						<view class="content rx-sc">
+							<view>tgcc001061001001</view>
+						</view>
+					</view>
+				</view>
+
+				<view class="item rx-sc">
+					<view class="rx">
+						<view class="lable lable150 rx-cc ">名称</view>
+						<view class="content rx-sc">
+							<view>X5 CC筒10#</view>
+						</view>
+					</view>
+				</view>
+
+				<view class="item rx-sc">
+					<view class="rx">
+						<view class="lable lable150 rx-cc ">型号</view>
+						<view class="content rx-sc">
+							<view>1065*1019x619</view>
+						</view>
+					</view>
+				</view>
+
+
+
+				<view class="item rx-sc">
+					<view class="rx ww50 ">
+						<view class="lable lable150 rx-cc ">物料代号</view>
+						<view class="content content_num">
+							<input class="uni-input" v-model="item.workReportInfo.formedNum"></input>
+
+						</view>
+					</view>
+
+					<view class="rx ww50">
+						<view class="lable lable150 rx-cc ">客户代号</view>
+						<view class="content content_num">
+							<input class="uni-input" v-model="item.workReportInfo.formedWeight"></input>
+						</view>
+					</view>
+
+				</view>
+
+
+				<view class="item rx-sc">
+					<view class="rx ww50 ">
+						<view class="lable lable150 rx-cc ">刻码</view>
+						<view class="content content_num content_H">
+							<input class="uni-input" v-model="item.workReportInfo.formedNum"></input>
+
+						</view>
+					</view>
+
+					<view class="rx ww50">
+						<view class="lable lable150 rx-cc ">位置</view>
+						<view class="content ">
+							<zxz-uni-data-select :localdata="positionList" v-model="item.categoryId" dataValue='id'
+								format='{name}' dataKey="code" filterable :clear='false'></zxz-uni-data-select>
+						</view>
+					</view>
+
+				</view>
+
+
+
+
+			</view>
+
+
+			<view class="content_table2">
+				<view class="head row rx-sc">
+					<view class="item ww25">物料重量Kg</view>
+					<view class="item ww25">报工重量kg</view>
+					<view class="item ww25">质检结果</view>
+					<view class="item ww25">处置</view>
+				</view>
+
+				<view class="table">
+
+					<view class="tr row rx-sc">
+						<view class="item ww25">32.67</view>
+						<view class="item ww25 content_num">
+							<input class="uni-input" v-model="item.workReportInfo.formedNum"></input>
+						</view>
+						<view class="item ww25">
+							<zxz-uni-data-select :localdata="inspectionList" v-model="item.categoryId" dataValue='id'
+								format='{name}' dataKey="code" filterable :clear='false'></zxz-uni-data-select>
+						</view>
+						<view class="item ww25">
+							<zxz-uni-data-select :localdata="inspectionList" v-model="item.categoryId" dataValue='id'
+								format='{name}' dataKey="code" filterable :clear='false'></zxz-uni-data-select>
+						</view>
+
+					</view>
+
+
+				</view>
+
+
+			</view>
+
+
+
+		</view>
+
+
+
+	</view>
+</template>
+
+<script>
+	import baTreePicker from '@/components/ba-tree-picker/ba-tree-picker.vue'
+	import {
+		treeByPid,
+		pageeLedgerMain,
+		assetPage
+	} from '@/api/pda/workOrder.js'
+	export default {
+		props: {
+			item: {
+				type: Object,
+				default: () => {}
+			},
+			notFormed: {
+				type: Array,
+				default: () => []
+			},
+
+
+
+
+		},
+
+		watch: {
+
+			notFormed: {
+				immediate: true,
+				deep: true,
+				handler(newVal) {
+					console.log(newVal)
+					this.notFormedList = newVal
+
+				}
+			}
+		},
+
+
+		data() {
+			return {
+				classificationList: [],
+				positionList: [{
+						id: '1',
+						name: '内'
+					},
+					{
+						id: '2',
+						name: '中'
+					},
+					{
+						id: '1',
+						name: '外'
+					}
+				],
+
+				inspectionList: [{
+						id: '1',
+						name: '合格'
+					},
+					{
+						id: '2',
+						name: '不合格'
+					},
+				]
+
+
+
+			}
+		},
+		created() {
+
+
+
+		},
+		methods: {
+
+
+
+
+
+
+
+
+		}
+	}
+</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_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;
+				}
+
+				.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;
+					}
+
+					.penalize {
+						width: 160rpx;
+						line-height: 60rpx;
+						background: $theme-color;
+						font-size: 24rpx;
+						text-align: center;
+						color: #fff;
+					}
+
+				}
+
+
+
+				.content_H {
+					min-height: 92rpx;
+				}
+
+				.pd4 {
+					padding: 4rpx 8rpx;
+				}
+
+
+
+				&:last-child {
+					border-bottom: none;
+				}
+			}
+
+			.ww55 {
+				width: 55%;
+			}
+
+			.ww50 {
+				width: 50%;
+			}
+
+			.ww45 {
+				width: 45%;
+			}
+		}
+	}
+
+
+
+
+	.content_table2 {
+		width: 100%;
+
+
+		.row {
+			width: 100%;
+
+
+			.item {
+
+				color: #404446;
+				font-size: 28rpx;
+				padding-left: 12rpx;
+
+			}
+
+			.color157 {
+				color: $theme-color;
+			}
+
+			.ww20 {
+				width: 20%;
+			}
+
+			.ww35 {
+				width: 35%;
+
+			}
+
+			.ww25 {
+				width: 25%;
+			}
+		}
+
+		.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: 74rpx;
+				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;
+		}
+
+
+	}
+</style>

pages/pda/jobBooking/index/index.vue

@@ -21,6 +21,8 @@
 
 					<jobBom :item='objData' :palletList='objData.palletList' :notFormed='objData.notFormedList'
 						@penalize='penalize'></jobBom>
+						
+						<oneJobBom :item='objData' :palletList='objData.palletList' :notFormed='objData.notFormedList'></oneJobBom>
 
 					<byProductBom v-if='objData.productRecycleList.length != 0 ' :list='objData.productRecycleList'
 						@penalize='penalize'>
@@ -106,12 +108,14 @@
 	import deviceBom from '../../feeding/components/deviceBom.vue'
 	import modelBom from '../../feeding/components/modelBom.vue'
 	import jobBom from '../components/jobBom.vue'
+	import oneJobBom  from '../components/oneJobBom.vue'
 	import byProductBom from '../components/byProductBom'
 	import turnoverBom from '../components/turnoverBom.vue'
 	import aridRegion from '../../feeding/components/aridRegion.vue'
 	import paramBom from '../../feeding/components/paramBom.vue'
 	import SearchPopup from '../../components/searchPopup.vue'
 
+
 	export default {
 
 		components: {
@@ -119,6 +123,7 @@
 			deviceBom,
 			modelBom,
 			jobBom,
+			oneJobBom,
 			byProductBom,
 			turnoverBom,
 			aridRegion,

pages/pda/picking/components/modelBom.vue

@@ -30,6 +30,8 @@
 							{{ item['code']  }}
 						</view>
 					</view>
+					
+	
 
 
 					<view class="item" v-if="!Array.isArray(tab.prop)">
@@ -42,6 +44,8 @@
 							{{tab.extInfo ?  item.extInfo[tab.prop] : item[tab.prop]}}
 						</view>
 					</view>
+					
+