55

pages/pda/feeding/bill/index.vue

@@ -21,7 +21,7 @@
 					<view v-for="(it,idx) in item.orderInfoList" :key="idx">
 						<workOrderBom :item='it' :isDetails='true'></workOrderBom>
 
-						<deviceBom v-if='it.equipmentList.length != 0' :list='it.equipmentList' :ishuoWei="false"></deviceBom>
+						<deviceBom v-if='it.equipmentList.length != 0' :list='it.equipmentList' :ishuoWei="false" :wordItem='it' :isDetails='true'></deviceBom>
 						
 						
 						<productsBom  v-if="Object.prototype.hasOwnProperty.call(it, 'inProductList') && it.inProductList[0]" :productsObj="it.inProductList[0]"></productsBom>

pages/pda/feeding/components/deviceBom.vue

@@ -78,11 +78,11 @@
 					<view class="tab_item" :style="tabAct == idxx ? 'color: #E6A23C' : ''"
 						v-for="(idItem, idxx) in turnoverList" :key="idxx" @click="handTab(idxx)">
 						{{ idItem.name }}{{ idxx + 1 }}
-						<uni-icons style="margin-left: 10rpx;" custom-prefix="iconfont" @click.native="handDel(idxx)"
+						<uni-icons style="margin-left: 10rpx;" custom-prefix="iconfont" @click.native="handDel(idxx)" v-if="!isDetails"
 							type="icon-shanchu" size="16" color="#fa3534"></uni-icons>
 					</view>
 
-					<view class="tab_add" @click="handTabAdd()">新增</view>
+					<view class="tab_add" @click="handTabAdd()" v-if="!isDetails">新增</view>
 				</view>
 
 				<view v-for="(idItem, idxx) in turnoverList" :key="idxx" v-show="tabAct == idxx">
@@ -93,11 +93,12 @@
 					<view class="search_list">
 						<u-form labelPosition="left" :model="idItem" labelWidth="160" labelAlign="left"
 							class="baseForm">
-
+      
 							<u-form-item label="周转车:" class="required-form" borderBottom prop="">
 								<zxz-uni-data-select :localdata="turnover" v-model="idItem.turnoverId" dataValue='id'
 									format='{name}-{code}' dataKey="id" filterable :clear='false'
-									@change="e => changeTurnover(e, idxx)"></zxz-uni-data-select>
+									@change="e => changeTurnover(e, idxx)" v-if="!isDetails"></zxz-uni-data-select>
+									<text v-else>{{ idItem.turnoverName}} </text>
 							</u-form-item>
 							<view class="rx-bs" style="margin-top: 6rpx;" v-if="ishuoWei">
 
@@ -120,7 +121,7 @@
 								<view class="tr row rx-sc" v-for="(it, idx) in idItem.positionList" :key='idx'>
 									<view class="tr row rx-sc">
 										<view class="item ww10">
-											{{ it.code }}
+											 {{ it.code }}
 										</view>
 										<view class="item ww25 "
 											:class="{'color157': it.workOrderCode === wordItem.code}">
@@ -208,6 +209,11 @@
 			turnover: {
 				type: Array,
 				default: () => []
+			},
+
+			isDetails: {
+				type: Boolean,
+				default: false
 			}
 
 
@@ -216,7 +222,7 @@
 		data() {
 			return {
 				popupShow: false,
-			
+
 				listIndex: null,
 				clientEnvironmentId: uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo").clientEnvironmentId,
 
@@ -236,6 +242,7 @@
 		},
 		created() {
 
+
 		},
 		methods: {
 			handleScan(id) {
@@ -248,6 +255,10 @@
 
 			handleStorage(idx) {
 				this.listIndex = idx || 0
+
+				if (this.isDetails) {
+					this.turnoverList = JSON.parse(JSON.stringify(this.list[0].extInfo.turnoverList))
+				}
 				this.popupShow = true
 
 

pages/pda/feeding/details.vue

@@ -284,7 +284,7 @@
 			 } 
 			   
                 console.log('投料', this.List)
-				 return false
+			
 				batchSave(this.List).then(res => {
 
 					uni.redirectTo({