优化

pages/center/center.vue

@@ -45,11 +45,11 @@
       <view class="options">
         <image src="../../static/sop.jpg" model="aspectFit "></image>
       </view>
-      <view class="notice" @click="goAbout">
+<!--      <view class="notice" @click="goAbout">
         <image class="icon" src="@/static/u79.svg" model="aspectFit "></image>
         <text class="text1">关于株洲硬质合金集团型材分公司</text>
         <text class="iconfont icon-youjiantou icos"></text>
-      </view>
+      </view> -->
     </view>
   </view>
 </template>

pages/pda/feeding/components/productsBom.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-	
+
 
 		<view class="title_box rx-bc"
 			v-if="productsObj.name != 'undefined' && productsObj.feedQuantity != 'undefined' ">
@@ -29,13 +29,14 @@
 
 				<view class="item">
 					<view class="lable rx-cc">数量</view>
-					<view class="content"> {{ productsObj.extInfo.sourceQuantity  || 0  }} {{ productsObj.unit }} </view>
+					<view class="content"> {{ productsObj.extInfo.sourceQuantity  || 0  }} {{ productsObj.unit }}
+					</view>
 				</view>
 
 				<view class="item">
 					<view class="lable rx-cc">投料数量</view>
 					<view class="content content_num">
-						<input class="uni-input" v-model="productsObj.feedQuantity" type="digit"></input>
+						<input class="uni-input" v-model="productsObj.feedQuantity" type="digit" @input="maxFeedQuantity()"></input>
 						{{ productsObj.unit }}
 					</view>
 				</view>
@@ -50,15 +51,28 @@
 	</view>
 </template>
 
-<script>
+
+import { method } from 'lodash';<script>
 	export default {
 		props: {
 			productsObj: {
 				type: Object,
 				default: () => {}
+			},
+
+			itemObj: {
+				type: Object,
+				default: () => {}
 			}
 
 		},
+		methods: {
+			maxFeedQuantity() {
+				if(this.productsObj.feedQuantity > this.itemObj.formingNum) {
+					this.$set(this.productsObj, 'feedQuantity', this.itemObj.formingNum)
+				}
+			}
+		}
 
 	}
 </script>

pages/pda/feeding/details.vue

@@ -16,7 +16,7 @@
 						:list='item.equipmentList' @scanIt='scanIt'></deviceBom>
 
 
-					<productsBom v-if="item.product != null && item.product != '{}'" :productsObj="item.product">
+					<productsBom v-if="item.product != null && item.product != '{}'" :itemObj="item" :productsObj="item.product">
 					</productsBom>
 
 					<modelBom v-if='item.modelList.length != 0' :workOrderId='item.workOrderId' :list='item.modelList'
@@ -659,6 +659,10 @@
 
 		},
 
+		beforeDestroy() {
+			uni.hideLoading();
+		},
+
 	}
 </script>
 

pages/pda/jobBooking/components/packingBomDetails.vue

@@ -2,7 +2,12 @@
 
 	<view>
 		<view class="title_box rx-bc">
-			<view class="name">内包装11</view>
+			<view class="name">内包装
+			
+			
+			
+			
+			</view>
 		</view>
 
 		<view class="material">

pages/pda/jobBooking/index/index.vue

@@ -21,7 +21,7 @@
 						ref='modelRef'>
 					</modelBom>
 
-            
+
 					<jobBom v-if='isLoad' :item='objData' ref='jobRef' :notFormed='objData.notFormedList'
 						@penalize='penalize' @modeNum='modeNum'></jobBom>
 
@@ -92,6 +92,7 @@
 
 
 			<view v-if="!operateBtn" @click="removeCacheFn()">清空缓存</view>
+			<view v-if="!operateBtn" @click="switchOrder = true">切换工单</view>
 
 		</view>
 
@@ -105,7 +106,6 @@
 		<SearchPopup mode="bottom" v-if='searchShow'>
 			<template v-slot:list>
 				<view class="search_list">
-
 					<u-form labelPosition="left" :model="formData" labelWidth="180" labelAlign="left" class="baseForm">
 						<u-form-item label="仓库:" class="required-form" borderBottom prop="warehouseId">
 							<zxz-uni-data-select :localdata="warehouseList" v-model="formData.warehouseId"
@@ -132,6 +132,37 @@
 			</template>
 
 
+		</SearchPopup>
+
+
+		<SearchPopup mode="center" v-if='switchOrder'>
+			<template v-slot:list>
+				<view class="search_list2">
+					<u-form labelPosition="left" :model="formData" labelWidth="180" labelAlign="left" class="baseForm">
+						<u-form-item label="工单:" class="required-form" borderBottom prop="warehouseId">
+							<zxz-uni-data-select :localdata="warehouseList" v-model="formData.warehouseId"
+								dataValue='id' dataKey="name" filterable format='{name}'></zxz-uni-data-select>
+						</u-form-item>
+
+
+					</u-form>
+
+				</view>
+			</template>
+
+			<template v-slot:operate>
+				<view class="operate_box rx-bc">
+					<u-button size="small" class="u-reset-button" @click="switchOrder = false ">
+						取消
+					</u-button>
+
+					<u-button type="success" size="small" class="u-reset-button">
+						确定
+					</u-button>
+
+				</view>
+			</template>
+
 
 		</SearchPopup>
 
@@ -217,6 +248,8 @@
 
 
 				searchShow: false,
+				switchOrder: false,
+
 
 				warehouseList: [],
 				formData: {
@@ -413,7 +446,7 @@
 				getByIdReport(this.id, this.taskId).then(res => {
 
 					this.objData = res
-
+                  console.log(res)
 
 
 					if (!this.objData.hasOwnProperty('turnover')) {
@@ -662,9 +695,6 @@
 
 
 
-
-
-
 				if (this.objData.currentTaskDiagram.isFirstTask == 0) { // isFirstTask  1是  判断是否首工序
 
 					const isFirstTask = await this.checkFirstTask()
@@ -783,10 +813,11 @@
 
 			},
 			checkFirstTask() {
-			
+
 				uni.hideLoading();
 				return new Promise((resolve) => {
-					if (this.objData.formedNumLast != Number(this.objData.workReportInfo['formedNum']) + Number(this.objData.notFormedList[0].notFormedNum)) {
+					if (this.objData.formedNumLast != Number(this.objData.workReportInfo['formedNum']) + Number(
+							this.objData.notFormedList[0].notFormedNum)) {
 
 						uni.showModal({
 							title: '提示',
@@ -841,7 +872,7 @@
 					success: rr => {
 						if (rr.confirm) {
 							let parma = {
-								workOrderIds:[ this.id],
+								workOrderIds: [this.id],
 								taskId: this.taskId,
 								type: 1
 							}
@@ -873,7 +904,7 @@
 
 					this.objData['product'] = res.extInfo.product
 					this.objData['workReportInfo'] = res.extInfo.workReportInfo
-				 	this.objData['notFormedList'] = res.extInfo.notFormedList
+					this.objData['notFormedList'] = res.extInfo.notFormedList
 					this.objData['turnover'] = res.extInfo.turnover
 					this.objData['productRecycleList'] = res.extInfo.productRecycleList
 					this.objData['semiProductList'] = res.extInfo.semiProductList
@@ -884,7 +915,11 @@
 			},
 
 
-		}
+		},
+
+		beforeDestroy() {
+			uni.hideLoading();
+		},
 
 	}
 </script>
@@ -953,6 +988,11 @@
 		padding: 0 32rpx;
 	}
 
+	.search_list2 {
+		min-height: 120rpx;
+		padding: 0 32rpx;
+	}
+
 
 
 
@@ -960,6 +1000,15 @@
 		position: fixed;
 		right: 0;
 		bottom: 160rpx;
+		
+		
+		
+		
+		
+		
+		
+		
+		
 		width: 40rpx;
 		height: 50rpx;
 		line-height: 66rpx;

pages/pda/picking/details.vue

@@ -382,6 +382,10 @@
 			},
 
 		},
+		
+			beforeDestroy() {
+					uni.hideLoading();
+			},
 
 	}
 </script>