优化

pages.json

@@ -1441,7 +1441,7 @@
 				"enablePullDownRefresh" : false
 			}
 		}
-
+		
 
 
 

pages/pda/feeding/components/workOrderBom.vue

@@ -0,0 +1,79 @@
+<template>
+	<view>
+		<view class="title_box rx-bc">
+			<view class="name">工单信息</view>
+
+			<view class="btn_box rx-bc">
+				<image class="scan" src="@/static/pda/ScanIt.svg"></image>
+				更换工单
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			item: {
+				type: Object,
+				default: () => {}
+			},
+		},
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</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;
+			}
+
+
+		}
+
+		.btn_box {
+			padding: 0 18rpx;
+			height: 40rpx;
+			background: $theme-color;
+			font-size: 24rpx;
+			font-style: normal;
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #fff;
+			border-radius: 4rpx;
+			.scan{
+				width: 28rpx;
+				height: 28rpx;
+				margin-right: 12rpx;
+				
+			}
+
+		}
+	}
+</style>

pages/pda/feeding/details.vue

@@ -6,83 +6,15 @@
 		<view class="list_box">
 			<u-list @scrolltolower="scrolltolower">
 
-
 				<view v-for="(item,index) in List" :key="index" class="card_box">
-					<view class="title_box rx-bc">
-						<view class="left rx-sc">
-							<view class="round">{{index + 1}}</view>
-							<view class="code">工单编号:{{item.code}}</view>
-						</view>
-
-						<view class="right_box rx-ec">
-
-							<u-button type="success" size="small" class="u-reset-button"
-								@click="addPicking(item.workOrderId, item.instanceList)" text="添加物料"></u-button>
-
-						</view>
-
-					</view>
-
-					<view class="material rx-ss" v-for="(mate, idx) in item.bomDetailDTOS">
-						<view class="left rx-ss" @click="mate.checked = ! mate.checked">
-							<view class="zdy_check rx-cc" :class="{ check_active : mate.checked   }">
-								<u-icon size="28" v-if='mate.checked' name='checkbox-mark'></u-icon>
-							</view>
-						</view>
-						<view class="content_table">
-							<view class="item">
-								<view class="lable rx-cc">物料编码</view>
-								<view class="content">
-									{{mate.categoryCode}}
-								</view>
-							</view>
-
-							<view class="item">
-								<view class="lable rx-cc">名称</view>
-								<view class="content">{{mate.categoryName}}</view>
-							</view>
-
-							<view class="item rx-sc">
-								<view class="rx ww55 ">
-									<view class="lable rx-cc">牌号</view>
-									<view class="content ">{{mate.brandNum}}</view>
-								</view>
-
-								<view class="rx ww45">
-									<view class="lable rx-cc ww80">数量</view>
-									<view class="content content_num">
-										<input class="uni-input" v-model="mate.demandQuantity" type="digit"></input>
-										<view class="unit">{{mate.unit}}</view>
-
-									</view>
-								</view>
-
-							</view>
-
-
-							<view class="item">
-
-								<view class="lable rx-cc">领料仓库</view>
-								<view class="content pd4">
-									<zxz-uni-data-select :localdata="mate.warehouseList" v-model="mate.warehouseId"
-										dataValue='id' format='{name}' :clear='false'></zxz-uni-data-select>
-								</view>
-							</view>
-
-						</view>
-					</view>
-
-					<view>
-						<instanceBom :list='item.instanceList'></instanceBom>
-					</view>
-
+		            <workOrderBom :item='item'></workOrderBom>
 				</view>
 			</u-list>
 
 		</view>
 
 		<view class="bottom-wrapper">
-			<view class="btn_box" @click="save">提交</view>
+			<view class="btn_box" @click="save">一键报工</view>
 
 		</view>
 
@@ -92,7 +24,7 @@
 </template>
 
 <script>
-	import instanceBom from './components/instanceBom.vue'
+	import workOrderBom from './components/workOrderBom.vue'
 	import {
 		workorderList
 	} from '@/api/pda/workOrder.js'
@@ -103,7 +35,7 @@
 
 	export default {
 		components: {
-			instanceBom
+			workOrderBom
 		},
 		data() {
 			return {
@@ -111,9 +43,9 @@
 				idsList: [],
 				List: [],
 
-				classificationList: [], //分类数据
 
-				taskId: null
+
+
 
 
 			}
@@ -123,7 +55,6 @@
 			let queryArray = decodeURIComponent(options.arr);
 			this.idsList = JSON.parse(queryArray);
 
-			this.taskId = options.taskId
 
 
 
@@ -182,9 +113,7 @@
 				})
 			},
 
-			handleUserChange(e) {
-				console.log(e)
-			},
+	
 
 			addPicking(id, list) {
 				const storageKey = Date.now() + "";
@@ -220,135 +149,12 @@
 
 		.card_box {
 			padding: 16rpx 24rpx;
-
-		}
-
-
-		.title_box {
-			.round {
-				width: 32rpx;
-				height: 32rpx;
-				line-height: 32rpx;
-				border-radius: 50%;
-				background: $theme-color;
-				color: #fff;
-				text-align: center;
-				font-size: 20rpx;
-			}
-
-			.code {
-				margin-left: 16rpx;
-				font-family: PingFang SC;
-				font-size: 28rpx;
-				font-style: normal;
-				font-weight: 400;
-				color: $theme-color;
-			}
 		}
 
-		.right_box {}
-
-
-		.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: 652rpx;
-				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;
-					}
-
-					.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;
-
-					}
-
-					.content_num {
-						display: flex;
-						align-items: center;
-						padding: 0 4rpx;
-
-						/deep/ .uni-input-input {
-							border: 2rpx solid #F0F8F2;
-							background: #F0F8F2;
-							color: $theme-color;
-						}
-
-						.unit {
-							padding: 0 4rpx;
-							font-size: 24rpx;
-							color: #404446;
-						}
-					}
-
-					.pd4 {
-						padding: 4rpx 8rpx;
-					}
-
-
-
-					&:last-child {
-						border-bottom: none;
-					}
-				}
-
-				.ww55 {
-					width: 55%;
-				}
-
-				.ww45 {
-					width: 45%;
-				}
-			}
-		}
-
 
 	}
 

pages/pda/picking/bill/components/common.js

@@ -1,7 +1,7 @@
 export const tableHeader = selectEquiType => {
-	
+
 	// model => model    specifications =>  specificationss
-	
+
 
 	// 1：物料；4：生产设备; 5：模具；6：备品备件; 7：周转车；8：舟皿；9：产品；10：消耗材料，11：干燥区，12.质检，13.包装材料，14.工装夹具 ，15.刀具 ,99.其他
 	switch (+selectEquiType) {