ysy пре 1 година
родитељ
комит
4fce5b3d8f

+ 18 - 0
pages/pda/feeding/single.js

@@ -63,6 +63,24 @@ export const tableHeader = selectEquiType => {
 					}
 				}
 			]
+			
+			case 9:
+				return [{
+						label: '型号',
+						prop: 'modelType'
+					},
+					{
+						label: '规格',
+						prop: 'specification'
+					},
+			
+					{
+						label: '牌号',
+						prop: 'brandNum'
+					},
+			
+			
+				]
 
 
 		case 8: //'舟皿'

+ 62 - 3
pages/pda/feeding/single.vue

@@ -2,6 +2,22 @@
 	<view class="content-box">
 		<uni-nav-bar fixed="true" statusBar="true" left-icon="back" title="出库单" background-color="#F7F9FA"
 			color="#404446" @clickLeft="back"></uni-nav-bar>
+			
+			
+			<view class="top-wrapper">
+				<view class="searchBox rx-bc">
+					<input v-model="keyWord" placeholder="请输入关键字搜索" class="searchInput" />
+			
+					<view class="rx-sc">
+					
+						<u-button @click="doSearch" type="success" size="small" class="u-reset-button" text="搜索">
+						</u-button>
+					</view>
+			
+				</view>
+			</view>
+			
+			
 
 		<view class="list_box">
 			<u-list @scrolltolower="scrolltolower">
@@ -25,6 +41,20 @@
 									class="items" v-if="!itm.formatter">
 									<text>{{ itm.label }}</text>{{ item[itm.prop] }}
 								</view>
+								
+								
+								<view 
+								v-if="[1, 9].includes(item.rootCategoryLevelId)"
+									class="items">
+									<text>物料代号</text> {{item.extInfo.materielCode }}
+								</view>
+								
+								<view
+									v-if="[1, 9].includes(item.rootCategoryLevelId)"
+									class="items">
+									<text>刻码</text> {{item.extInfo.engrave }}
+								</view>
+								
 
 							</view>
 
@@ -69,6 +99,8 @@
 				memoList: [],
 
 				storageKey: null,
+				
+				keyWord: ''
 			}
 		},
 
@@ -88,7 +120,8 @@
 
 				let _arr = (this.storageKey && uni.getStorageSync(this.storageKey)) || []
 				this.memoList = [..._arr[0].modelList, ..._arr[0].equipmentList, ..._arr[0].instanceList, ..._arr[0]
-					.aridRegionList, ..._arr[0].turnover, ..._arr[0].palletList, ..._arr[0].revolvingDiskList, ..._arr[0].semiProductList
+					.aridRegionList, ..._arr[0].turnover, ..._arr[0].palletList, ..._arr[0].revolvingDiskList, ..._arr[
+						0].semiProductList
 				]
 
 
@@ -107,7 +140,7 @@
 
 
 		methods: {
-			
+
 			scrolltolower() {},
 			getList() {
 				let param = {
@@ -129,6 +162,10 @@
 					)
 				})
 			},
+			
+			doSearch() {
+				 console.log(this.list)
+			},
 
 			tableH(type) {
 				return tableHeader(type)
@@ -169,6 +206,27 @@
 		flex-direction: column;
 		background-color: $page-bg;
 	}
+	
+	.searchBox {
+		background-color: #dedede;
+		height: 90rpx;
+		padding: 0 20rpx;
+	
+		.menu_icon {
+			width: 60rpx;
+			height: 60rpx;
+			margin-right: 20rpx;
+		}
+	
+		input {
+			height: 70rpx;
+			width: 480rpx;
+			background: #f9f9f9 !important;
+			padding-left: 10rpx;
+			border-radius: 5rpx;
+		}
+	
+	}
 
 
 	.list_box {
@@ -222,7 +280,8 @@
 				border-right: 1rpx solid #E3E5E5;
 				border-bottom: 1rpx solid #E3E5E5;
 				box-sizing: border-box;
-                word-break: break-all;
+				word-break: break-all;
+
 				text {
 					display: inline-block;
 					background: #F7F9FA;

+ 20 - 4
pages/pda/jobBooking/components/semiProductJobBomPL.vue

@@ -79,8 +79,21 @@
 				</view>
 
 
+				<view class="item rx-sc">
+					<view class="rx">
+						<view class="lable lable190 rx-cc ">{{ it.extInfo.newWeight ? '上道工序总重量' : '物料总重量' }}</view>
+						<view class="content rx-sc">
+
+							<view v-if="it.extInfo.newWeight">{{it.extInfo.newWeight }} / {{it.extInfo.weightUnit}}
+							</view>
 
 
+							<view v-else> {{ toFixedFn(it.extInfo.weight, it.feedQuantity)  }} /
+								{{it.extInfo.weightUnit }} </view>
+						</view>
+					</view>
+				</view>
+
 				<view class="item rx-sc">
 
 
@@ -117,8 +130,8 @@
 
 					<view class="item ww40 rx-bc">
 						<text>处置</text>
-						<image v-if='!isDetails' class="icon" @click="handAddListPL(it, idx)" src="~@/static/pda/add.svg"
-							style="width: 46rpx;height: 46rpx;margin-right: 12rpx;"></image>
+						<image v-if='!isDetails' class="icon" @click="handAddListPL(it, idx)"
+							src="~@/static/pda/add.svg" style="width: 46rpx;height: 46rpx;margin-right: 12rpx;"></image>
 
 					</view>
 					<view class="item ww10 ">
@@ -134,7 +147,7 @@
 								@input="blurNum($event,idx, yyIdx)" type='number'></input>
 						</view>
 						<view class="item ww25 content_num">
-							<view v-if='isDetails'>{{it.extInfo.allReportWeight }}</view>
+							<view v-if='isDetails'>{{yy.allReportWeight }}</view>
 							<input class="uni-input" v-else v-model="yy.allReportWeight" type='digit'></input>
 						</view>
 
@@ -329,7 +342,10 @@
 				})
 			},
 
-
+			toFixedFn(weight, num) {
+				let total = Number(weight) * Number(num)
+				return total.toFixed(2)
+			}
 
 		}
 	}

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

@@ -660,7 +660,7 @@
 
 
 				// 预制体
-				if (this.objData.semiProductList.length > 0 && this.taskType != 4 && this.objData.singleReport == 1) {
+				if (this.objData.semiProductList.length > 0 && this.taskType != 4 && this.objData.singleReport == 1 && type == 2) {
 					let bol
 					let _i
 					bol = this.objData.semiProductList.every((e, i) => {