22

pages/pda/feeding/bill/index.vue

@@ -12,6 +12,11 @@
 						<view class="round">{{index + 1}}</view>
 						<view class="time">投料时间:{{item.createTime}} </view>
 					</view>
+					
+					<view class="item_box rx-bc">
+						<view class="time">工序名称： {{item.taskName}}</view>
+					</view>
+					
 
 					<view v-for="(it,idx) in item.orderInfoList" :key="idx">
 						<workOrderBom :item='it' :isDetails='true'></workOrderBom>

pages/pda/feeding/components/turnoverBom.vue

@@ -38,8 +38,10 @@
 					<view class="item ww25">工单编号</view>
 					<view class="item ww25">产品编码</view>
 					<view class="item ww20">数量PCS</view>
-					<view class="item ww20">投料PCS</view>
+					<view class="item ww20" v-if='!isDetails'>投料PCS</view>
+						<view class="item ww20" v-if='isDetails'> {{wordItem.taskType ? '抽样' : '投料'}}</view>
 				</view>
+				
 
 				<view class="table">
 					<u-list @scrolltolower="scrolltolower" class="z_list">

pages/pda/feeding/details.vue

@@ -54,7 +54,7 @@
 
 					<view class='flex_btn' @click="openDetails(item.workOrderId)">出库单</view>
 
-					<view class="operate_box ">
+					<view :class="[ idsList.length == 1 ? 'operate_box' :'operate_box2'] ">
 
 						<u-button size="small" class="u-reset-button" type="success"
 							@click="handAdd(item.workOrderId)">手动添加</u-button>
@@ -293,7 +293,6 @@
 						m.revolvingDiskList = [] // 周转盘
 						m.semiProductList = [] //半成品
 
-
 						if (m.pickOutInList.length > 0) {
 							m.pickOutInList.forEach(f => {
 
@@ -330,9 +329,6 @@
 							m.product = '{}'
 						}
 
-						console.log(m)
-
-
 
 						delete m.id
 						if (this.taskId) {
@@ -566,7 +562,26 @@
 				}
 
 				feedGetCache(parma).then(res => {
-					console.log(33,res)
+					if (res.length == 0) {
+						return false
+					}
+					let objList = res[0].extInfo.objList
+					this.List.forEach(f => {
+						objList.forEach(o => {
+							if (f.workOrderId == o.workOrderId && f.taskId == o.taskId) {
+								f['instanceList'] = o.instanceList || []
+								f['equipmentList'] = o.equipmentList || []
+								f['modelList'] = o.modelList || []
+								f['aridRegionList'] = o.aridRegionList || []
+								f['packingList'] = o.packingList || []
+								f['palletList'] = o.palletList || []
+								f['instanceList'] = o.instanceList || []
+								f['revolvingDiskList'] = o.revolvingDiskList || []
+								f['semiProductList'] = o.semiProductList || []
+								this.$forceUpdate()
+							}
+						})
+					})
 				})
 			},
 
@@ -662,14 +677,15 @@
 			opacity: 0.6;
 		}
 	}
-	
-		.operate_box2 { 
-			/deep/ .u-button {
-				margin-top: 20rpx;
-				width: 150rpx;
-	
-		}
+
+	.operate_box2 {
+		display: flex;
+
+		/deep/ .u-button {
+			margin-top: 20rpx;
+			width: 150rpx;
 		}
+	}
 
 
 

pages/pda/turnover/components/qualityTurnoverBom.vue

@@ -42,7 +42,7 @@
 						<view class="item ww30">工单编号</view>
 						<view class="item ww30">产品编码</view>
 						<view class="item ww15">数量</view>
-						<view class="item ww15"></view>
+						<view class="item ww15"  style="color: #157A2C;"   @click="turnoverSelect(index)" >	{{ isAllSelect ?  '取消' : '全选' }}</view>
 					</view>
 
 					<view class="table">
@@ -134,6 +134,7 @@
 			return {
 				recycleQuantity: '',
 				newList: [],
+				isAllSelect: false,
 
 				wordInfo: {
 					workOrderCode: null,
@@ -155,6 +156,19 @@
 			},
 
 
+			turnoverSelect(index) {
+				this.newList[index].extInfo.positionList.forEach(f => {
+					if (this.isAllSelect && Number(f.quantity) > 0) {
+						f.check = false
+					} else if (!this.isAllSelect && Number(f.quantity) > 0) {
+						f.check = true
+					}
+				})
+				
+				this.isAllSelect =!this.isAllSelect
+			},
+			
+
 			handleTrade(index) {
 
 				let arr = this.newList[index].extInfo.positionList.filter(e => {

pages/pda/turnover/components/turnoverBom.vue

@@ -58,8 +58,8 @@
 								<view class="item ww30" :class="{'color157': it.categoryCode === wordItem.productCode}">
 									{{it.categoryCode}}
 								</view>
-								<view class="item ww15  ">
-									<text :class="{ 'isend': it.isend }">{{it.newQuantity}}</text>
+								<view class="item ww15 content_num ">
+										<input class="uni-input" v-model="it.newQuantity" type="digit"></input>
 								</view>
 
 								<view class="item ww15 rx-cc " v-if='!it.isend  ' @click="handleCheck(index, idx, it)">
@@ -214,7 +214,7 @@
 				this.wordInfo.categoryCode = arr[0].categoryCode
 
 
-				// this.$refs.turnoverRef.open('w0300000003431001', this.wordInfo, this.newList, this.wordItem, index)
+				// this.$refs.turnoverRef.open('w0300000003635004', this.wordInfo, this.newList, this.wordItem, index)
 				// return false
 
 

pages/pda/turnover/index/index.vue

@@ -13,7 +13,6 @@
 						:newTurnover='item.newTurnover' @handleScan='handleScan' @refreshList='getList'></turnoverBom>
 
 
-
 				</view>
 			</u-list>