优化

pages/pda/feeding/components/instanceBom.vue

@@ -9,7 +9,7 @@
 				<uni-icons custom-prefix="iconfont" type="icon-shanchu" size="20" color="#fa3534"></uni-icons>
 			</view>
 			<view class="content_table">
-
+       
 
 				<view class="item" v-for="(itm, index) in tableH(mate.rootCategoryLevelId)" :key="index">
 					<view class="lable rx-cc">{{ itm.label }}</view>

pages/pda/jobBooking/components/jobBom.vue

@@ -8,7 +8,7 @@
 
 
 		<view class="material ">
-
+        
 
 			<view class="content_table">
 

pages/pda/jobBooking/components/oneJobBom.vue

@@ -88,13 +88,18 @@
 
 			</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 class="item ww25" v-if="['CVI', 'PIP' ].includes(item.currentTaskDiagram.taskTypeName)">质检结果
+					</view>
+					<view class="item ww25" v-if="['CVI', 'PIP' ].includes(item.currentTaskDiagram.taskTypeName)">处置
+					</view>
+					
+					<view class="item ww50" v-if="!['CVI', 'PIP' ].includes(item.currentTaskDiagram.taskTypeName)">处置</view>
 				</view>
 
 				<view class="table">
@@ -105,12 +110,19 @@
 							<view v-if='isDetails'>{{it.extInfo.reportWeight }}</view>
 							<input class="uni-input" v-else v-model="it.extInfo.reportWeight"></input>
 						</view>
-						<view class="item ww25" @click="openNumerate(it, idx)">
+						<view class="item ww25" @click="openNumerate(it, idx)" v-if="['CVI', 'PIP' ].includes(item.currentTaskDiagram.taskTypeName)">
 							<view class="numerate">点击计算</view>
 						</view>
-						<view class="item ww25">
+						<view class="item ww25" v-if="['CVI', 'PIP' ].includes(item.currentTaskDiagram.taskTypeName)">
 							{{it.extInfo.taskName }}
 						</view>
+						
+						<view class="item ww50" v-if="!['CVI', 'PIP' ].includes(item.currentTaskDiagram.taskTypeName)">
+						<zxz-uni-data-select :localdata="stepsList" v-model="it.extInfo.taskId" dataValue='taskId'
+							format='{taskTypeName}' dataKey="taskId" filterable :clear='false'   
+							></zxz-uni-data-select>
+						</view>
+						
 
 					</view>
 
@@ -129,7 +141,7 @@
 
 				<view class="content_table2">
 					<view class="head row rx-sc">
-						<view class="item ww25">物料重量Kg</view>
+						<view class="item ww25">工序名称</view>
 						<view class="item ww25">坯体密度</view>
 						<view class="item ww30">产品密度系数</view>
 						<view class="item ww20">标准</view>
@@ -140,7 +152,7 @@
 						<view class="tr row rx-sc" v-for="(item, index) in rowIt" :key='index'>
 							<view class="item ww25 rx-bc">
 								<view>{{item.taskName}}</view>
-								<view style="margin-right: 12rpx;">{{item.weight}}</view>
+								
 							</view>
 							<view class="item ww25 content_num">
 								<input class="uni-input" v-model="item.billet" type="digit"
@@ -215,29 +227,8 @@
 				classificationList: [],
 
 				stepsList: [],
-				positionList: [{
-						id: '1',
-						name: '内'
-					},
-					{
-						id: '2',
-						name: '中'
-					},
-					{
-						id: '1',
-						name: '外'
-					}
-				],
-
-				inspectionList: [{
-						id: '1',
-						name: '合格'
-					},
-					{
-						id: '2',
-						name: '不合格'
-					},
-				],
+
+
 
 				show: false,
 				rowIt: [],
@@ -349,8 +340,8 @@
 							_taskId = e.taskId
 						}
 					})
-					
-					
+
+
 
 					if (_taskId == null) {
 						uni.showToast({
@@ -546,6 +537,9 @@
 				width: 30%;
 
 			}
+			.ww50{
+				width: 50%;
+			}
 
 		}
 

pages/pda/jobBooking/index/index.vue

@@ -19,8 +19,8 @@
 					</modelBom>
 
 
-
-					<jobBom :item='objData' :palletList='objData.palletList' :notFormed='objData.notFormedList'
+                      
+					<jobBom  v-if='isLoad'  :item='objData' :palletList='objData.palletList' :notFormed='objData.notFormedList'
 						@penalize='penalize' @modeNum='modeNum'></jobBom>
 
 					<oneJobBom v-if='objData.instanceList &&  objData.instanceList.length != 0' :item='objData'
@@ -142,6 +142,7 @@
 			return {
 				title: '',
 				taskType: 1,
+				isLoad: true,
 
 				objData: {
 					equipmentList: [],
@@ -150,7 +151,9 @@
 					productRecycleList: [],
 					aridRegionList: [],
 					palletList: [],
-					workReportInfo: {},
+					workReportInfo: {
+
+					},
 
 					notFormedList: [], // 报工-不合格
 
@@ -345,7 +348,9 @@
 
 
 			getList() {
+				this.isLoad = false
 				getByIdReport(this.id, this.taskId).then(res => {
+			
 					this.objData = res
 					if (!this.objData.hasOwnProperty('turnover')) {
 						this.objData['turnover'] = []
@@ -359,8 +364,7 @@
 					}
 
 
-					this.taskType = res.currentTaskDiagram.type
-					
+					// this.taskType = res.currentTaskDiagram.type
 
 
 
@@ -420,6 +424,8 @@
 
 
 
+				}).finally(() => {
+					this.isLoad = true
 				})
 			},
 
@@ -562,11 +568,21 @@
 
 					if (packInfo.formedNumLast != Number(this.objData.workReportInfo['formedNum']) + Number(this.objData
 							.notFormedList[0].notFormedNum)) {
-						uni.showToast({
-							title: `合格品数量加不合格品数量不等于包装总数`,
-							icon: 'none'
+						uni.hideLoading();
+						uni.showModal({
+							title: '提示',
+							content: '合格品数量加不合格品数量不等于包装总数！',
+							confirmText: '确认', //这块是确定按钮的文字
+							success: function(res) {
+								if (res.confirm) {
+									// 执行确认后的操作
+								} else {
+									return false
+								}
+							}
 						})
-						return false
+
+
 					}
 
 
@@ -575,19 +591,31 @@
 
 
 				if (this.objData.currentTaskDiagram.isFirstTask == 0) { // isFirstTask 判断是否首工序
+					uni.hideLoading();
 					if (this.objData.formedNumLast != Number(this.objData.workReportInfo['formedNum']) + Number(this
 							.objData.notFormedList[0].notFormedNum)) {
-						uni.showToast({
-							title: `合格品数量加不合格品数量不等于上道工序数量`,
-							icon: 'none'
+
+
+						uni.showModal({
+							title: '提示',
+							content: '合格品数量加不合格品数量不等于上道工序数量！',
+							confirmText: '确认', //这块是确定按钮的文字
+							success: function(res) {
+								if (res.confirm) {
+									// 执行确认后的操作
+								} else {
+									return false
+								}
+							}
 						})
+
 						return false
 					}
 				}
 
 
 
-		
+
 
 				jobSave(this.objData).then(res => {
 					uni.hideLoading();

pages/pda/workOrder/search/index.vue

@@ -309,7 +309,7 @@
 				if (this.isType == 'feed') {
 					params.ids = [1, 4, 5, 8, 10, 11,13, 14]
 				} else if (this.isType == 'pick') {
-					params.ids = [1, 5, 8, 10, 13, 14]
+					params.ids = [1, 5, 7, 8, 10, 13, 14]
 				} else if (this.isType == 'job') {
 					params['ids'] = [4, 7]
 				}