55

pages/pda/jobBooking/components/turnoverBom.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="title_box rx-bc">
-			<view class="name">周转车22</view>
+			<view class="name">周转车</view>
 		</view>
 
 		<view v-for="(item, index) in newList" :key='index'>
@@ -199,7 +199,6 @@
 			
 			handContract() {
 				this.isContract = !this.isContract
-			
 			}
 		}
 	}

pages/pda/sample/components/turnoverBom.vue

@@ -6,8 +6,9 @@
 
 		<view v-for="(item, index) in newList" :key='index'>
 			<view class="title_box rx-bc">
-				<view class="left rx-ss" @click="getDelete(index)">
-					<uni-icons custom-prefix="iconfont" type="icon-shanchu" size="20" color="#fa3534"></uni-icons>
+				<view class="left rx-ss" >
+					<uni-icons custom-prefix="iconfont"  @click="getDelete(index)" type="icon-shanchu" size="20" color="#fa3534"></uni-icons>
+					<view class="des" @click="handContract()">{{ isContract ? '收缩'  :  '展开'}}</view>
 				</view>
 
 			</view>
@@ -43,24 +44,26 @@
 
 				<view class="table">
 					<u-list @scrolltolower="scrolltolower" class="z_list">
-						<view class="tr row rx-sc" v-for="(it, idx) in item.extInfo.positionList" :key='idx'>
-							<view class="item ww10">{{it.code}}</view>
-							<view class="item ww25" :class="{'color157': it.workOrderCode === wordItem.code}">
-								{{ it.workOrderCode }}
-							</view>
-							<view class="item ww25" :class="{'color157': it.categoryCode === wordItem.productCode}">
-								{{it.categoryCode}}
-							</view>
-
-							<view class="item ww20  ">
-								<text>{{it.quantity }}</text>
-							</view>
-
-							<view class="item ww20">
-							<input class="uni-input content_num" 
-								v-model="it.sampleNum" type="digit"  :disabled="it.quantity <= 0"  @blur="Number(it.sampleNum) > Number(it.quantity) ? it.sampleNum = Number(it.quantity) : ''"></input>
-							</view>
-						</view>
+					  <view  v-for="(it, idx) in item.extInfo.positionList" :key='idx'>
+						  <view class="tr row rx-sc"  v-if=" isContract || ( it.workOrderCode != '' &&  it.workOrderCode != null)">
+						  	<view class="item ww10">{{it.code}}</view>
+						  	<view class="item ww25" :class="{'color157': it.workOrderCode === wordItem.code}">
+						  		{{ it.workOrderCode }}
+						  	</view>
+						  	<view class="item ww25" :class="{'color157': it.categoryCode === wordItem.productCode}">
+						  		{{it.categoryCode}}
+						  	</view>
+						  
+						  	<view class="item ww20  ">
+						  		<text>{{it.quantity }}</text>
+						  	</view>
+						  
+						  	<view class="item ww20">
+						  	<input class="uni-input content_num" 
+						  		v-model="it.sampleNum" type="digit"  :disabled="it.quantity <= 0"  @blur="Number(it.sampleNum) > Number(it.quantity) ? it.sampleNum = Number(it.quantity) : ''"></input>
+						  	</view>
+						  </view>
+					  </view>
 					</u-list>
 
 				</view>
@@ -105,7 +108,8 @@
 		data() {
 			return {
 				recycleQuantity: '',
-				newList: []
+				newList: [],
+				isContract: false
 			}
 		},
 
@@ -118,7 +122,11 @@
 
 
 			},
-			scrolltolower() {}
+			scrolltolower() {},
+			
+			handContract() {
+				this.isContract = !this.isContract
+			}
 		}
 	}
 </script>
@@ -150,9 +158,16 @@
 
 
 		}
+		.des{
+			font-size: 28rpx;
+			font-style: normal;
+			font-weight: 400;
+			color: $theme-color;
+			margin-left: 38rpx;
+		}
 
 		.left {
-			width: 40rpx;
+			width: 140rpx;
 		}
 
 		.btn_box {

pages/pda/turnover/components/turnoverBom.vue

@@ -11,6 +11,8 @@
 					<view class="btn_box rx-bc" @click="handleTrade(index)" v-if='item.isOld == 1'>
 						工单换周转车
 					</view>
+					<view class="des" @click="handContract()">{{ isContract ? '收缩'  :  '展开'}}</view>
+					
 
 					<view class='title_des' v-if='item.isOld == 0'>
 						转换后周转车
@@ -50,26 +52,29 @@
 
 					<view class="table">
 						<u-list @scrolltolower="scrolltolower" class="z_list">
-							<view class="tr row rx-sc" v-for="(it, idx) in item.extInfo.positionList" :key='idx'>
-								<view class="item ww10">{{it.code}}</view>
-								<view class="item ww30" :class="{'color157': it.workOrderCode === wordItem.code}">
-									{{ it.workOrderCode }}
-								</view>
-								<view class="item ww30" :class="{'color157': it.categoryCode === wordItem.productCode}">
-									{{it.categoryCode}}
-								</view>
-								<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)">
-
-									<image class="check" v-if='item.isOld != 0 && it.check' src='@/static/check.png'>
-									</image>
-									<image class="check" v-if='item.isOld != 0 && !it.check'
-										src='@/static/check_no.png'></image>
-								</view>
-							</view>
+					      <view v-for="(it, idx) in item.extInfo.positionList" :key='idx' >
+							  <view  class="tr row rx-sc" v-if=" isContract || ( it.workOrderCode != '' &&  it.workOrderCode != null)" >
+							  	<view class="item ww10">{{it.code}}</view>
+							  	<view class="item ww30" :class="{'color157': it.workOrderCode === wordItem.code}">
+							  		{{ it.workOrderCode }}
+							  	</view>
+							  	<view class="item ww30" :class="{'color157': it.categoryCode === wordItem.productCode}">
+							  		{{it.categoryCode}}
+							  	</view>
+							  	<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)">
+							  
+							  		<image class="check" v-if='item.isOld != 0 && it.check' src='@/static/check.png'>
+							  		</image>
+							  		<image class="check" v-if='item.isOld != 0 && !it.check'
+							  			src='@/static/check_no.png'></image>
+							  	</view>
+							  </view>
+							  
+						  </view>
 
 						</u-list>
 
@@ -140,7 +145,10 @@
 				wordInfo: {
 					workOrderCode: null,
 					categoryCode: null,
-				}
+				},
+				
+				
+				isContract: false
 			}
 		},
 
@@ -248,6 +256,10 @@
 				})
 
 
+			},
+			
+			handContract() {
+				this.isContract = !this.isContract
 			}
 
 		}
@@ -280,6 +292,14 @@
 			}
 
 
+		}
+		
+		.des{
+			font-size: 28rpx;
+			font-style: normal;
+			font-weight: 400;
+			color: $theme-color;
+	
 		}
 
 		.left {