55

api/pda/tangu.js

@@ -40,14 +40,3 @@ export async function sample(params) {
 	return Promise.reject(data.message);
 }
 
-// 根据工单工序请求bom质检参数
-
-export async function bomQuality(params) {
-	const data = await postJ(
-		Vue.prototype.apiUrl + `/pda/mes/workreport/bomQuality`, params, true,
-	);
-	if (data.code == 0) {
-		return data.data;
-	}
-	return Promise.reject(data.message);
-}

pages/home/home.vue

@@ -103,7 +103,7 @@
 				this.$refs.sparePartRef && this.$refs.sparePartRef.getData()
 				this.timer = setTimeout(() => {
 					this.init()
-				}, 6000)
+				}, 12000)
 			},
 			// 相机扫码
 			HandlScanCode() {

pages/pda/components/stepsNav.vue

@@ -72,7 +72,7 @@
 <style lang="scss" scoped>
 	.nav_box {
 		width: 100%;
-		height: 130rpx;
+		height: 168rpx;
 		overflow-y: scroll;
 	}
 </style>

pages/pda/components/uni-steps.vue

@@ -28,10 +28,10 @@
 				style="margin-top:10upx;">
 				<view v-for="(item,index) in options" :key="index"
 					:class="[direction==='column'?'uni-steps__column-text':'uni-steps__row-text']">
-					<text :style="{color:index<=active?activeColor:deactiveColor}"
-						:class="[direction==='column'?'uni-steps__column-title':'uni-steps__row-title']">{{item.taskTypeName}}</text>
-					<text :style="{color:index<=active?activeColor:deactiveColor}"
-						:class="[direction==='column'?'uni-steps__column-desc':'uni-steps__row-desc']">{{item.desc}}</text>
+					<view :style="{color:index<=active?activeColor:deactiveColor}"
+						:class="[direction==='column'?'uni-steps__column-title':'uni-steps__row-title']">{{item.taskTypeName}} </view>
+					<text :style="{color:index<=active?activeColor:deactiveColor}" v-if="clientEnvironmentId == 3"
+						:class="[direction==='column'?'uni-steps__column-desc':'uni-steps__row-desc']">[投:{{item.feedExistNum || 0}}报:{{item.reportExistNum  || 0}}]</text>
 				</view>
 			</view>
 		</view>

pages/pda/feeding/components/paramBom.vue

@@ -35,9 +35,6 @@
 
 
 
-
-
-
 				</view>
 
 

pages/pda/feeding/details.vue

@@ -70,7 +70,6 @@
 						<u-button size="small" class="u-reset-button" type="success"
 							@click="handAdd(item.workOrderId)">手动添加</u-button>
 
-
 						<u-button size="small" class="u-reset-button" type="success"
 							@click="scanIt(item.workOrderId)">扫一扫</u-button>
 

pages/pda/jobBooking/components/oneJobQualityBomPL.vue

@@ -1,7 +1,8 @@
 <template>
 	<view>
+	
 		<view class="title_box rx-bc">
-			<view class="name">取样信息</view>
+			<view class="name">产品信息</view>
 		</view>
 
 
@@ -42,26 +43,6 @@
 
 
 
-				<view class="item rx-sc">
-					<view class="rx ww50 ">
-						<view class="lable lable150 rx-cc ">物料代号</view>
-						<view class="content content_num">
-							<view v-if='isDetails'>{{ it.extInfo.materielCode }}</view>
-							<input class="uni-input" v-else v-model="it.extInfo.materielCode"></input>
-
-						</view>
-					</view>
-
-					<view class="rx ww50">
-						<view class="lable lable150 rx-cc ">客户代号</view>
-						<view class="content content_num">
-							<view v-if='isDetails'>{{ it.extInfo.clientCode }}</view>
-							<input class="uni-input" v-else v-model="it.extInfo.clientCode"></input>
-						</view>
-					</view>
-
-				</view>
-
 
 				<view class="item rx-sc">
 					<view class="rx ww50 ">
@@ -121,7 +102,6 @@
 
 
 
-
 			</view>
 
 
@@ -177,18 +157,20 @@
 			</view>
 
 
-			<view class="button_box" v-if="!isDetails">
-				<u-button size="small" class="u-reset-button" type="success" @click="handSample(idx)">取样</u-button>
-			</view>
 
 
+		</view>
+
 
+		<view class="button_box" v-if="!isDetails">
+			<u-button size="small" class="u-reset-button" type="success" @click="handSample()">取样</u-button>
 		</view>
 
 
 
+
 		<view class="title_box rx-bc">
-			<view class="name">报工信息</view>
+			<view class="name">抽样列表</view>
 		</view>
 
 
@@ -230,25 +212,6 @@
 
 
 
-				<view class="item rx-sc">
-					<view class="rx ww50 ">
-						<view class="lable lable150 rx-cc ">物料代号</view>
-						<view class="content content_num">
-							<view v-if='isDetails'>{{it.extInfo.materielCode }}</view>
-							<input class="uni-input" v-else v-model="it.extInfo.materielCode"></input>
-
-						</view>
-					</view>
-
-					<view class="rx ww50">
-						<view class="lable lable150 rx-cc ">客户代号</view>
-						<view class="content content_num">
-							<view v-if='isDetails'>{{it.extInfo.clientCode }}</view>
-							<input class="uni-input" v-else v-model="it.extInfo.clientCode"></input>
-						</view>
-					</view>
-
-				</view>
 
 
 				<view class="item rx-sc">
@@ -341,8 +304,8 @@
 						</view>
 					</view>
 				</view>
-				
-				
+
+
 
 
 
@@ -434,9 +397,9 @@
 							</view>
 
 							<view class="item ww30 content_num">
-									<view v-if="isDetails" >{{ quaItem.remark }}</view>
+								<view v-if="isDetails">{{ quaItem.remark }}</view>
 								<input v-else class="uni-input" v-model="quaItem.remark"></input>
-							
+
 							</view>
 
 
@@ -460,6 +423,7 @@
 
 
 
+
 	</view>
 </template>
 
@@ -561,27 +525,19 @@
 
 
 
-			handSample(idx) {
+			handSample() {
 
-				let _arr = this.list[idx].extInfo.batchReportInfo.map(m => {
-					return {
-						quantity: m.sample,
-						disposeTaskId: m.taskId,
-						source: this.list[idx],
 
-					}
-				})
 
 				let param = {
 					taskId: this.item.currentTaskDiagram.taskId,
-					workOrderId: this.list[idx].workOrderId,
-					dispose: _arr,
-
+					workOrderId: this.list[0].workOrderId,
+					dispose: this.list,
 
 				}
 
 				sample(param).then(res => {
-					this.$set(this.item, 'sampleQuality', res || [])
+					this.item.sampleQuality = res || []
 					this.$forceUpdate()
 				})
 

pages/pda/jobBooking/index/index.vue

@@ -51,11 +51,11 @@
 					<oneJobQualityBom
 						v-if='objData.semiProductList && objData.semiProductList.length != 0 && taskType == 6 && clientEnvironmentId == 3 && objData.singleReport == 1'
 						:item='objData' :list='objData.semiProductList'></oneJobQualityBom>
-						
+
 					<oneJobQualityBomPL
 						v-if='objData.semiProductList && objData.semiProductList.length != 0 && taskType == 6 && clientEnvironmentId == 3 && objData.singleReport == 0'
 						:item='objData' :list='objData.semiProductList'></oneJobQualityBomPL>
-						
+
 
 					<byProductBom v-if='objData.productRecycleList.length != 0' :list='objData.productRecycleList'
 						@penalize='penalize'>
@@ -74,7 +74,7 @@
 
 					<packingTgBom
 						v-if='objData.pickOutInList && objData.pickOutInList.length != 0 && taskType == 4 && clientEnvironmentId == 3'
-						:list='objData.pickOutInList' :item='objData' ></packingTgBom>
+						:list='objData.pickOutInList' :item='objData'></packingTgBom>
 
 
 
@@ -216,7 +216,7 @@
 
 	import oneJobQualityBom from '../components/oneJobQualityBom.vue'
 	import oneJobQualityBomPL from '../components/oneJobQualityBomPL.vue'
-	
+
 
 
 	export default {
@@ -462,7 +462,7 @@
 				getByIdReport(this.id, this.taskId).then(res => {
 
 					this.objData = res
-					console.log(22,res)
+					console.log(22, res)
 
 
 					if (!this.objData.hasOwnProperty('turnover')) {
@@ -522,13 +522,18 @@
 					}
 
 
-					if (this.clientEnvironmentId == 3 && this.objData.singleReport == 0 && this.taskType != 6 ) {
-						 this.objData.semiProductList.map(a => {
-							 a.extInfo.batchReportInfo = [ { allFeedQuantity: '', allReportWeight: '', taskId: '', taskName: '' }]
-							 return {
-								a 
-							 }
-						 })
+					if (this.clientEnvironmentId == 3 && this.objData.singleReport == 0 && this.taskType != 6) {
+						this.objData.semiProductList.map(a => {
+							a.extInfo.batchReportInfo = [{
+								allFeedQuantity: '',
+								allReportWeight: '',
+								taskId: '',
+								taskName: ''
+							}]
+							return {
+								a
+							}
+						})
 						this.objData.semiProductList = this.objData.semiProductList
 					}
 
@@ -650,7 +655,7 @@
 				uni.showLoading({
 					title: '加载中'
 				});
-				
+
 				console.log(this.objData)
 
 				if (!this.objData.workReportInfo['formedNum'] && this.objData.workReportInfo['formedNum'] != 0) {
@@ -668,7 +673,8 @@
 
 
 				// 预制体
-				if (this.objData.semiProductList.length > 0 && this.taskType != 4 && this.objData.singleReport == 1 && type == 2) {
+				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) => {
@@ -692,11 +698,9 @@
 						return false
 					}
 				}
-				
-				
-				// if(this.objData.singleReport == 0 &&  type == 2) {
-					
-				// }
+
+
+
 
 
 
@@ -725,7 +729,7 @@
 
 
 
-				if (this.objData.currentTaskDiagram.isFirstTask == 0 ) { // isFirstTask  1是  判断是否首工序
+				if (this.objData.currentTaskDiagram.isFirstTask == 0) { // isFirstTask  1是  判断是否首工序
 
 					const isFirstTask = await this.checkFirstTask()
 					if (!isFirstTask) {
@@ -744,7 +748,9 @@
 				}
 
 
-
+				if (this.clientEnvironmentId == 3 && type == 2 && this.taskType == 6 && this.objData.singleReport ==0) {
+					this.objData.semiProductList = []
+				}
 
 
 				jobSave(this.objData).then(res => {
@@ -937,7 +943,7 @@
 					this.objData['turnover'] = res.extInfo.turnover
 					this.objData['productRecycleList'] = res.extInfo.productRecycleList
 					this.objData['semiProductList'] = res.extInfo.semiProductList
-				
+
 					this.objData['modelList'] = res.extInfo.modelList
 
 

pages/pda/picking/bill/index.vue

@@ -18,7 +18,7 @@
 							<view class="content rx-bc" style="color:#157A2C;">
 								{{ item.code }}
 								
-								<text>{{ item.status == 0 ? '未领料' : item.status == 1 ? '已领料' : item.status == 2 ? '已出库' : ''}}</text>
+								<text>{{ ['未领料', '领料中', '已出库', '已驳回'][item.status]}}</text>
 							</view>
 							
 							

pages/pda/workOrder/extrusionMolding/index.vue

@@ -153,7 +153,6 @@
 				<view style="margin-top: 15px;">
 					<button class="search_btn" @click="handleFeedDetails">投料详情</button>
 				</view>
-				
 			</u-list>
 
 		</view>

pages/pda/workOrder/index/details.vue

@@ -53,7 +53,8 @@
 					<oneJobQualityBom v-if='objData.semiProductList &&  objData.semiProductList.length != 0 & taskType == 6 && clientEnvironmentId == 3 && objData.singleReport == 1'
 						:list='objData.semiProductList' :item='objData' :isDetails='true'></oneJobQualityBom>
 						
-					<oneJobQualityBomPL v-if='objData.semiProductList &&  objData.semiProductList.length != 0 & taskType == 6  && clientEnvironmentId == 3 && objData.singleReport == 0'
+
+					<oneJobQualityBomPL v-if='taskType == 6  && clientEnvironmentId == 3 && objData.singleReport == 0'
 							:list='objData.semiProductList' :item='objData' :isDetails='true'></oneJobQualityBomPL>