55

pages/pda/common.js

@@ -104,7 +104,7 @@ export const tableHeader = selectEquiType => {
 			return [
 				{
 						label: '编号', 
-						prop: 'batchNo'
+						prop: 'codeNumber'
 				},
 				{
 					label: '规格',

pages/pda/feeding/components/deviceBom.vue

@@ -288,6 +288,7 @@
 						this.$set(this.list[this.listIndex].extInfo, 'positionList', positionList)
 						this.$set(this.list[this.listIndex].extInfo, 'lineNum', this.formData.lineNum)
 						this.$set(this.list[this.listIndex].extInfo, 'levelNum', this.formData.levelNum)
+						this.$forceUpdate()
 
 						currentLetterIndex++; // 自增索引
 

pages/pda/feeding/components/turnoverBom.vue

@@ -10,13 +10,13 @@
 					<uni-icons custom-prefix="iconfont" type="icon-shanchu" size="20" color="#fa3534"></uni-icons>
 				</view>
 				
-				<view class="des" @click="handContract">{{isContract ? '展开' : '收缩'}}</view>
+				<view class="des" @click="handContract()">{{isContract ?  '收缩'  : '展开' }}</view>
 			</view>
 
 			<view class="content_table">
 				<view class="item rx-sc">
 					<view class="rx ww50 ">
-						<view class="lable ww80 rx-cc ">编号</view>
+						<view class="lable ww80 rx-cc ">编码</view>
 						<view class="content rx-sc">
 							<view>{{item.code}}</view>
 						</view>
@@ -30,6 +30,19 @@
 					</view>
 
 				</view>
+				
+				
+				<view class="item rx-sc">
+				<view class="rx ww50 ">
+							<view class="lable ww80 rx-cc ">编号</view>
+							<view class="content rx-sc">
+									<view>{{item.codeNumber}}</view>
+							</view>
+							</view>
+	
+				
+				</view>
+				
 			</view>
 
 

pages/pda/jobBooking/components/turnoverBom.vue

@@ -1,14 +1,19 @@
 <template>
 	<view>
 		<view class="title_box rx-bc">
-			<view class="name">周转车</view>
+			<view class="name">周转车22</view>
 		</view>
 
 		<view v-for="(item, index) in newList" :key='index'>
 			<view class="title_box rx-bc" v-if='!isDetails'>
-				<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 @click="getDelete(index)" custom-prefix="iconfont" type="icon-shanchu" size="20" color="#fa3534"></uni-icons>
+					
+					<view class="des" @click="handContract()">{{ isContract ? '收缩'  :  '展开'}}</view>
 				</view>
+			
+				
+				
 				<view class="btn_box rx-bc" @click="handleScan(index)" v-if="pattern == 'job'">
 					<image class="scan" src="@/static/pda/ScanIt.svg"></image>
 					更换周转车
@@ -18,7 +23,7 @@
 			<view class="content_table">
 				<view class="item rx-sc">
 					<view class="rx ww50 ">
-						<view class="lable ww80 rx-cc ">编号</view>
+						<view class="lable ww80 rx-cc ">编码</view>
 						<view class="content rx-sc">
 							<view>{{item.code}}</view>
 						</view>
@@ -32,6 +37,19 @@
 					</view>
 
 				</view>
+				
+				<view class="item rx-sc">
+					<view class="rx ww50 ">
+						<view class="lable ww80 rx-cc ">编号</view>
+						<view class="content rx-sc">
+							<view>{{item.codeNumber}}</view>
+						</view>
+					</view>
+				
+			
+				
+				</view>
+				
 			</view>
 
 
@@ -45,26 +63,28 @@
 
 				<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 ww35" :class="{'color157': it.workOrderCode === wordItem.code}">
-								{{ it.workOrderCode }}
-							</view>
-							<view class="item ww35" :class="{'color157': it.categoryCode === wordItem.productCode}">
-								{{it.categoryCode}}
-							</view>
-
-							<view class="item ww20  " :class="{'content_num' : pattern == 'job' }" v-if='!isDetails'>
-								<input class="uni-input" v-if='it.isFull == 0' @input="quantInt(index, idx, it)"
-									v-model="it.quantity" type="digit"
-									:disabled="(!Object.prototype.hasOwnProperty.call(it, 'isOccupy') && it.isOccupy) || pattern != 'job'"></input>
-								<text v-else>{{it.quantity}}</text>
-							</view>
-
-							<view class="item ww20" v-if='isDetails'>
-								{{ it.quantity }}
-							</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 ww35" :class="{'color157': it.workOrderCode === wordItem.code}">
+						  		{{ it.workOrderCode }}
+						  	</view>
+						  	<view class="item ww35" :class="{'color157': it.categoryCode === wordItem.productCode}">
+						  		{{it.categoryCode}}
+						  	</view>
+						  
+						  	<view class="item ww20  " :class="{'content_num' : pattern == 'job' }" v-if='!isDetails'>
+						  		<input class="uni-input" v-if='it.isFull == 0' @input="quantInt(index, idx, it)"
+						  			v-model="it.quantity" type="digit"
+						  			:disabled="(!Object.prototype.hasOwnProperty.call(it, 'isOccupy') && it.isOccupy) || pattern != 'job'"></input>
+						  		<text v-else>{{it.quantity}}</text>
+						  	</view>
+						  
+						  	<view class="item ww20" v-if='isDetails'>
+						  		{{ it.quantity }}
+						  	</view>
+						  </view>
+					  </view>
 					</u-list>
 
 				</view>
@@ -121,6 +141,8 @@
 				newList: [],
 
 				totalCount: 0,
+				
+				isContract: false
 
 
 			}
@@ -173,7 +195,12 @@
 
 
 			},
-			scrolltolower() {}
+			scrolltolower() {},
+			
+			handContract() {
+				this.isContract = !this.isContract
+			
+			}
 		}
 	}
 </script>
@@ -206,8 +233,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/sample/inspection/index.vue

@@ -21,7 +21,7 @@
 						<u-button size="small" class="u-reset-button" type="success"
 							@click="scanIt(item.workOrderId)">扫一扫</u-button>
 
-						<u-button size="small" class="u-reset-button" type="success"
+						<u-button size="small" class="u-reset-button" type="success" style="width: 200rpx;"
 							@click="handZZCQuality">周转车质检</u-button>
 						<u-button size="small" class="u-reset-button" type="success" @click="handQuality">质检</u-button>
 					</view>