优化

api/pda/workOrder.js

@@ -182,3 +182,27 @@ export async function getVehicle(params) {
 	}
 	return Promise.reject(data.message);
 }
+
+//  pda报工后换车
+export async function transferVehicle(params) {
+	const data = await postJ(
+		Vue.prototype.apiUrl + `/pda/mes/workreport/transferVehicle`, params, true,
+	);
+
+	if (data.code == 0) {
+		return data.data;
+	}
+	return Promise.reject(data.message);
+}
+
+// 更换后的周转车记录
+export async function getNewVehicle(params) {
+	const data = await postJ(
+		Vue.prototype.apiUrl + `/pda/mes/workreport/getNewVehicle`, params, true,
+	);
+
+	if (data.code == 0) {
+		return data.data;
+	}
+	return Promise.reject(data.message);
+}

pages/center/about/about.vue

@@ -6,7 +6,11 @@
       left-icon="back"
       @clickLeft="back"
     >
-      <view class="title">关于株洲硬质合金集团型材分公司</view>
+      <!-- <view class="title">关于株洲硬质合金集团型材分公司</view> -->
+	   <view class="title">关于湖南碳谷新材料有限公司</view>
+	   
+	    <!-- <view class="title">关于株洲索尔切削刀具有限公司</view> -->
+
     </uni-nav-bar>
 
     <image class="zcc-img" mode="widthFix" src="../../../static/u3.png"></image>

pages/login/login.vue

@@ -9,7 +9,9 @@
     ></uni-icons>
     <view class="login-title">
       <label>智慧工厂信息化系统</label>
-      <text>株洲硬质合金集团型材分公司</text>
+      <!-- <text>株洲硬质合金集团型材分公司</text> -->
+	  <text>湖南碳谷新材料有限公司</text>
+	  
     </view>
     <view>
       <view class="login-content">

pages/pda/picking/bill/components/instanceBom.vue

@@ -40,7 +40,7 @@
 				<view class="item">
 					<view class="lable rx-cc">领料仓库</view>
 					<view class="content ">
-						{{ mate.warehouse }}
+						{{ mate.warehouseName }}
 					</view>
 				</view>
 

pages/pda/picking/details.vue

@@ -168,6 +168,7 @@
 
 			getList() {
 				workorderList({ids: this.idsList, taskId:this.taskId}).then(res => {
+					console.log('4',res)
 					
 					this.List = res.map(m => {
 						 m.workOrderId = m.id

pages/pda/turnover/components/turnoverBom.vue

@@ -1,163 +1,100 @@
 <template>
-	
-	<view>
-	<view>
-		<view class="title_box rx-bc">
-			<view class="name">周转车</view>
-		</view>
 
-		<view v-for="(item, index) in newList" :key='index'>
+	<view>
+		<view>
 			<view class="title_box rx-bc">
-				<view class="btn_box rx-bc" @click="handleTrade(index)" >
-					工单换周转车
-				</view>
+				<view class="name">周转车</view>
 			</view>
 
-			<view class="content_table">
-				<view class="item rx-sc">
-					<view class="rx ww50 ">
-						<view class="lable ww80 rx-cc ">编号</view>
-						<view class="content rx-sc">
-							<view>{{item.code}}</view>
-						</view>
+			<view v-for="(item, index) in newList" :key='index'>
+				<view class="title_box rx-bc">
+					<view class="btn_box rx-bc" @click="handleTrade(index)" v-if='item.isOld == 1'>
+						工单换周转车
 					</view>
-
-					<view class="rx ww50">
-						<view class="lable rx-cc ww80">名称</view>
-						<view class="content rx-sc">
-							<view>{{item.name}}</view>
-						</view>
+					
+					<view  class='title_des' v-if='item.isOld == 0'>
+						转换后周转车详
 					</view>
-
-				</view>
-			</view>
-
-
-			<view class="content_table2">
-				<view class="head row rx-sc">
-					<view class="item ww10">货位</view>
-					<view class="item ww30">工单编号</view>
-					<view class="item ww30">产品编码</view>
-					<view class="item ww15">数量</view>
-					<view class="item ww15"></view>
 				</view>
 
-				<view class="table">
-					<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  ">
-							<text :class="{ 'isend': it.isend }">{{it.newQuantity}}</text>
+				<view class="content_table">
+					<view class="item rx-sc">
+						<view class="rx ww50 ">
+							<view class="lable ww80 rx-cc ">编号</view>
+							<view class="content rx-sc">
+								<view>{{item.code}}</view>
+							</view>
 						</view>
 
-						<view class="item ww15 rx-cc " v-if='!it.isend ' @click="handleCheck(index, idx, it)">
-							
-							<image class="check" v-if='it.check' src='@/static/check.png'></image>
-							<image class="check" v-else src='@/static/check_no.png'></image>
+						<view class="rx ww50">
+							<view class="lable rx-cc ww80">名称</view>
+							<view class="content rx-sc">
+								<view>{{item.name}}</view>
+							</view>
 						</view>
+
 					</view>
+				</view>
 
 
+				<view class="content_table2">
+					<view class="head row rx-sc">
+						<view class="item ww10">货位</view>
+						<view class="item ww30">工单编号</view>
+						<view class="item ww30">产品编码</view>
+						<view class="item ww15">数量</view>
+						<view class="item ww15"></view>
+					</view>
 
+					<view class="table">
+						<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  ">
+								<text :class="{ 'isend': it.isend }">{{it.newQuantity}}</text>
+							</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>
 
 
-			</view>
 
-		</view>
-	</view>
-	
-	<view>
-		<view class="title_box rx-bc">
-			<view class="name">更换后周转车</view>
-		</view>
-	
-		<view v-for="(item, index) in newTurnover" :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>
-			
-			</view>
-	
-			<view class="content_table">
-				<view class="item rx-sc">
-					<view class="rx ww50 ">
-						<view class="lable ww80 rx-cc ">编号</view>
-						<view class="content rx-sc">
-							<view>{{item.code}}</view>
-						</view>
-					</view>
-	
-					<view class="rx ww50">
-						<view class="lable rx-cc ww80">名称</view>
-						<view class="content rx-sc">
-							<view>{{item.name}}</view>
-						</view>
 					</view>
-	
-				</view>
-			</view>
-	
-	
-			<view class="content_table2">
-				<view class="head row rx-sc">
-					<view class="item ww10">货位</view>
-					<view class="item ww30">工单编号</view>
-					<view class="item ww35">产品编码</view>
-					<view class="item ww25">数量</view>
-				
-				</view>
-	
-				<view class="table">
-					<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 ww35" :class="{'color157': it.categoryCode === wordItem.productCode}">
-							{{it.categoryCode}}
-						</view>
-						<view class="item ww25  content_num">
-							<input class="uni-input" v-if='it.isFull == 0' @input="quantInt(index, idx, it)"
-								v-model="it.quantity" type="digit" ></input>
-							<text v-else>{{it.quantity}}</text>
-						</view>
-	
-				
-					</view>
-	
-	
-	
-	
-	
-	
+
+
 				</view>
-	
-	
+
 			</view>
-	
 		</view>
-	</view>
+
+		<turnoverPopup ref='turnoverRef' @saveTurn='saveTurn'></turnoverPopup>
+
+
 	</view>
 </template>
 
 <script>
 	import {
-	
-		scanLedger,
-		
-
+		transferVehicle,
 	} from '@/api/pda/workOrder.js'
+
+	import turnoverPopup from './turnoverPopup.vue'
 	export default {
+		components: {
+			turnoverPopup
+		},
 		props: {
 			list: {
 				type: Array,
@@ -169,11 +106,11 @@
 			},
 
 
-            newTurnover: {
+			newTurnover: {
 				type: Array,
 				default: () => []
 			},
-			  
+
 		},
 
 
@@ -193,7 +130,7 @@
 			return {
 				recycleQuantity: '',
 				newList: [],
-				
+
 				wordInfo: {
 					workOrderCode: null,
 					categoryCode: null,
@@ -203,20 +140,8 @@
 
 		methods: {
 
-			quantInt(index, idx, it) {
-				if (it.quantity >= 1) {
-					this.$set(this.newTurnover[index].extInfo.positionList[idx], 'workOrderCode', this.wordInfo.workOrderCode )
-					this.$set(this.newTurnover[index].extInfo.positionList[idx], 'categoryCode', this.wordInfo.categoryCode)
-
-				} else {
-					this.$set(this.newTurnover[index].extInfo.positionList[idx], 'workOrderCode', '')
-					this.$set(this.newTurnover[index].extInfo.positionList[idx], 'categoryCode', '')
-					this.$set(this.newTurnover[index].extInfo.positionList[idx], 'quantity', 0)
-				}
 
 
-			},
-
 			handleCheck(index, idx, it) {
 
 
@@ -241,9 +166,6 @@
 
 				if (flag) {
 					this.$set(this.newList[index].extInfo.positionList[idx], 'check', !it.check)
-					if(it.check) {
-						this.$set(this.newList[index].extInfo.positionList[idx], 'quantity', 0)
-					}
 				} else {
 					uni.showToast({
 						icon: 'none',
@@ -256,61 +178,62 @@
 			},
 
 			handleTrade(index) {
-				
+
 				let arr = this.newList[index].extInfo.positionList.filter(e => {
 					return e.check
 				})
-				if(arr.length == 0) {
+				if (arr.length == 0) {
 					uni.showToast({
 						icon: 'none',
 						title: '请先勾选需要转移的工单'
 					})
-					
+
 					return false
 				}
-				
-				arr.forEach(f => {
-					f.isend = true
-				})
-				
+
+
+
 				this.wordInfo.workOrderCode = arr[0].workOrderCode
 				this.wordInfo.categoryCode = arr[0].categoryCode
-				
-				// 周转车 
-				this.scanData('w0300000004195005')
+
+
+				this.$refs.turnoverRef.open('w0300000004195005', this.wordInfo, this.newList, this.wordItem, index)
 				return false
-				
+
 				let _this = this
 				uni.scanCode({
 					success: function(res) {
-						_this.scanData(res.result)
+
+						_this.$refs.turnoverRef.open(res.result, this.wordInfo, this.newList, this.wordItem,
+							index)
 					}
 				})
-				
+
 			},
-			scanData(result) {
-				let _turnover = [...this.newList, ...this.newTurnover]
-				let isFals = _turnover.some(m => m.code == result)
-				if (isFals) {
-					uni.showToast({
-						title: '周转车已存在',
-						icon: 'none'
-					})
-					return false
-				}
-				
-				scanLedger(result).then(res => {
-				
-		           this.newTurnover.push(res[0])
-				   console.log( this.newTurnover)
+
+			saveTurn(index, newTurnover) {
+				let arr = this.newList[index].extInfo.positionList.filter(e => {
+					return e.check
 				})
-				},
+
+				arr.forEach(f => {
+					f.isend = true
+					f.quantity = 0
+				})
+
+				let turnoverArr = []
+				newTurnover[0].isOld = 0 // 新的
+				newTurnover[0].id = null
+				this.newList[index].isOld = 1 // 老的
+				turnoverArr = [this.newList[index], ...newTurnover]
 				
-				getDelete(index) {
-					this.newTurnover.splice(index, 1)
-				},
-		
-		
+				transferVehicle(turnoverArr).then(res => {
+					
+				})
+
+
+			}
+
 		}
 	}
 </script>
@@ -452,14 +375,15 @@
 				width: 35%;
 
 			}
-			
+
 			.ww15 {
 				width: 15%;
 			}
+
 			.ww25 {
 				width: 25%;
 			}
-			
+
 
 			.ww30 {
 				width: 30%;
@@ -533,7 +457,13 @@
 		width: 40rpx;
 		height: 40rpx;
 	}
-	.isend{
-		text-decoration:line-through;
+
+	.isend {
+		text-decoration: line-through;
+	}
+	
+	.title_des{
+		font-size: 28rpx;
+		color: #FFA929;
 	}
 </style>

pages/pda/turnover/components/turnoverPopup.vue

@@ -0,0 +1,458 @@
+<template>
+	<view>
+		<u-popup :show="show" mode='center' v-if='show' :closeOnClickOverlay='false'>
+
+			<view class="popup_box">
+
+				<view class="title_box rx-bc">
+					<view class="name">周转车 </view>
+					<view >数量: {{sum - count || 0}} </view>
+				</view>
+
+				<u-list @scrolltolower="scrolltolower" class="list_box">
+					<view v-for="(item, index) in newTurnover" :key='index'>
+
+
+						<view class="content_table">
+							<view class="item rx-sc">
+								<view class="rx ww50 ">
+									<view class="lable ww80 rx-cc ">编号</view>
+									<view class="content rx-sc">
+										<view>{{item.code}}</view>
+									</view>
+								</view>
+
+								<view class="rx ww50">
+									<view class="lable rx-cc ww80">名称</view>
+									<view class="content rx-sc">
+										<view>{{item.name}}</view>
+									</view>
+								</view>
+
+							</view>
+						</view>
+
+
+						<view class="content_table2">
+							<view class="head row rx-sc">
+								<view class="item ww10">货位</view>
+								<view class="item ww30">工单编号</view>
+								<view class="item ww35">产品编码</view>
+								<view class="item ww25">数量</view>
+
+							</view>
+
+							<view class="table">
+								<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 ww35"
+										:class="{'color157': it.categoryCode === wordItem.productCode}">
+										{{it.categoryCode}}
+									</view>
+									<view class="item ww25  content_num">
+										<input class="uni-input" v-if='it.isFull == 0' @input="quantInt(index, idx, it)"
+											v-model="it.quantity" type="digit"></input>
+										<text v-else>{{it.quantity}}</text>
+									</view>
+
+
+								</view>
+
+
+
+
+
+
+							</view>
+
+
+						</view>
+
+					</view>
+
+
+
+				</u-list>
+
+				<view class="operate_box rx-sc">
+					<u-button size="small" class="u-reset-button" @click="cancel">取消</u-button>
+					<u-button size="small" class="u-reset-button" type="success" @click="save">确定</u-button>
+				</view>
+
+			</view>
+		</u-popup>
+	</view>
+
+
+</template>
+
+<script>
+	import {
+		scanLedger,
+	} from '@/api/pda/workOrder.js'
+	export default {
+		props: {
+
+
+		},
+		data() {
+			return {
+				show: false,
+				wordInfo: {},
+				wordItem: {},
+				newTurnover: [],
+				idx: null,
+				
+				sum: 0,
+				count: 0,
+			}
+		},
+		methods: {
+			open(result, wordInfo, newList, wordItem, index) {
+				this.wordInfo = wordInfo
+				this.wordItem = wordItem
+				this.idx = index
+
+           
+			    this.count= 0
+			    this.sum = 0;
+				newList[0].extInfo.positionList.forEach(e => {
+					if(e.check) {
+						  this.sum  += Number(e.newQuantity);
+					}
+				})
+			
+			   
+
+				let isFals = newList.some(m => m.code == result && m.isOld == 1)
+				if (isFals) {
+					uni.showToast({
+						title: '周转车已存在',
+						icon: 'none'
+					})
+					return false
+				}
+
+				scanLedger(result).then(res => {
+					this.newTurnover = res
+					this.show = true
+				})
+
+
+
+
+
+			},
+
+			quantInt(index, idx, it) {
+				if (it.quantity >= 1) {
+					this.$set(this.newTurnover[index].extInfo.positionList[idx], 'workOrderCode', this.wordInfo
+						.workOrderCode)
+					this.$set(this.newTurnover[index].extInfo.positionList[idx], 'categoryCode', this.wordInfo
+						.categoryCode)
+						
+						this.$set(this.newTurnover[index].extInfo.positionList[idx], 'numAdd', true)
+							this.countFn()
+
+				} else {
+					this.$set(this.newTurnover[index].extInfo.positionList[idx], 'workOrderCode', '')
+					this.$set(this.newTurnover[index].extInfo.positionList[idx], 'categoryCode', '')
+					this.$set(this.newTurnover[index].extInfo.positionList[idx], 'quantity', 0)
+					this.$set(this.newTurnover[index].extInfo.positionList[idx], 'numAdd', false)
+					this.countFn()
+				}
+				
+				
+			
+
+
+			},
+			
+			countFn() {
+	
+				
+				this.count = 0;
+				this.newTurnover[0].extInfo.positionList.forEach(e => {
+					if(e.numAdd) {
+						
+						 this.count  += Number(e.quantity);
+					}
+				})
+				
+			},
+
+			cancel() {
+				this.show = false
+			},
+
+			save() {
+				if(this.sum - this.count != 0) {
+					uni.showToast({
+						title: '转移数量对应不上',
+						icon: 'none'
+					})
+					return
+				}
+				this.$emit('saveTurn', this.idx, this.newTurnover)
+				this.show = false
+			
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.popup_box {
+		width: 98vw;
+		min-height: 60vh;
+		max-height: 80vh;
+		padding: 16rpx;
+		box-sizing: border-box;
+
+		overflow: hidden;
+		display: flex;
+		flex-direction: column;
+	}
+
+	.title_box {
+		margin-top: 20rpx;
+
+		.name {
+			font-size: 28rpx;
+			font-style: normal;
+			font-weight: 400;
+			color: $theme-color;
+			padding-left: 20rpx;
+
+			position: relative;
+
+			&:before {
+				position: absolute;
+				content: '';
+				left: 0rpx;
+				top: 0rpx;
+				bottom: 0rpx;
+				width: 4rpx;
+				height: 28rpx;
+				background: $theme-color;
+				margin: auto;
+			}
+
+
+		}
+
+		.left {
+			width: 40rpx;
+		}
+
+		.btn_box {
+			padding: 0 18rpx;
+			height: 60rpx;
+			background: $theme-color;
+			font-size: 26rpx;
+			font-style: normal;
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #fff;
+			border-radius: 4rpx;
+
+			.scan {
+				width: 34rpx;
+				height: 34rpx;
+				margin-right: 12rpx;
+
+			}
+
+		}
+
+	}
+
+
+	.content_table {
+		margin-top: 8rpx;
+		width: 100%;
+		border: 2rpx solid $border-color;
+
+		.item {
+			display: flex;
+			border-bottom: 2rpx solid $border-color;
+
+			.lable {
+				width: 132rpx;
+				text-align: center;
+				background-color: #F7F9FA;
+				font-size: 26rpx;
+				border-right: 2rpx solid $border-color;
+				flex-shrink: 0;
+			}
+
+
+
+			.ww80 {
+				width: 80rpx;
+			}
+
+			.ww50 {
+				width: 50%;
+			}
+
+			.content {
+				width: 518rpx;
+				min-height: 64rpx;
+				font-size: 28rpx;
+				line-height: 28rpx;
+				font-style: normal;
+				font-weight: 400;
+				padding: 2rpx 8rpx;
+				box-sizing: border-box;
+				word-wrap: break-word;
+				flex-grow: 1 !important;
+				font-size: 24rpx;
+
+			}
+
+
+			&:last-child {
+				border-bottom: none;
+			}
+		}
+
+
+	}
+
+
+
+	.content_table2 {
+		width: 100%;
+
+
+		.row {
+			width: 100%;
+
+
+			.item {
+
+				color: #404446;
+				font-size: 28rpx;
+				padding-left: 12rpx;
+
+			}
+
+			.color157 {
+				color: $theme-color;
+			}
+
+			.ww20 {
+				width: 20%;
+			}
+
+			.ww35 {
+				width: 35%;
+
+			}
+
+			.ww15 {
+				width: 15%;
+			}
+
+			.ww25 {
+				width: 25%;
+			}
+
+
+			.ww30 {
+				width: 30%;
+			}
+
+			.ww15 {
+				width: 15%;
+			}
+
+
+			.ww10 {
+				width: 10%;
+			}
+		}
+
+		.head {
+			height: 64rpx;
+			background: #F7F9FA;
+			border-top: 2rpx solid #E3E5E5;
+			border-left: 2rpx solid #E3E5E5;
+
+			.item {
+				height: 64rpx;
+				line-height: 64rpx;
+				border-right: 2rpx solid #E3E5E5;
+				box-sizing: border-box;
+			}
+		}
+
+
+
+		.tr {
+			border-top: 2rpx solid #E3E5E5;
+			border-left: 2rpx solid #E3E5E5;
+
+
+			.item {
+				font-size: 24rpx;
+				min-height: 64rpx;
+				display: flex;
+				align-items: center;
+				border-right: 2rpx solid #E3E5E5;
+				box-sizing: border-box;
+				white-space: normal;
+				word-break: break-all;
+
+			}
+
+			&:last-child {
+				border-bottom: 2rpx solid #E3E5E5;
+
+			}
+		}
+	}
+
+
+	.content_num {
+		display: flex;
+		align-items: center;
+		padding: 0 4rpx;
+
+		/deep/ .uni-input-input {
+			border: 2rpx solid #F0F8F2;
+			background: #F0F8F2;
+			color: $theme-color;
+		}
+
+	}
+
+	.check {
+		width: 40rpx;
+		height: 40rpx;
+	}
+
+	.isend {
+		text-decoration: line-through;
+	}
+
+
+	.list_box {
+		flex: 1;
+		overflow: hidden;
+
+
+	}
+
+	.operate_box {
+		padding: 10rpx 160rpx;
+
+		/deep/ .u-button {
+			width: 160rpx;
+		}
+	}
+</style>

pages/pda/turnover/index/index.vue

@@ -9,23 +9,19 @@
 					<workOrderBom :item='item' @handleScan='handleWordScan'></workOrderBom>
 
 
-					<turnoverBom v-if='item.turnover.length != 0' :list='item.turnover' :wordItem='item' :newTurnover='item.newTurnover'
-						@handleScan='handleScan'></turnoverBom>
+					<turnoverBom v-if='item.turnover.length != 0' :list='item.turnover' :wordItem='item'
+						:newTurnover='item.newTurnover' @handleScan='handleScan'></turnoverBom>
+
 
 
 
 
-				
 				</view>
 			</u-list>
 
 		</view>
 
-		<view class="bottom-wrapper">
-			<view class="btn_box" @click="save">更换周转车</view>
-
-		</view>
-
+	
 
 
 	</view>
@@ -37,12 +33,9 @@
 
 	import {
 		getVehicle,
-
 	} from '@/api/pda/workOrder.js'
 
-	import {
-		batchSave
-	} from '@/api/pda/feeding.js'
+
 
 
 
@@ -68,22 +61,14 @@
 			this.taskName = options.taskName
 
 			this.getList()
-
+        
 		},
 
 
 		methods: {
 			scrolltolower() {},
 
-			save() {
-
-
-				batchSave(this.List).then(res => {
-
-
-
-				})
-			},
+	
 
 			getList() {
 				getVehicle({
@@ -108,6 +93,9 @@
 
 				})
 			},
+			
+			
+	
 
 
 
@@ -175,20 +163,6 @@
 
 	}
 
-	.bottom-wrapper {
-		.btn_box {
-			width: 750rpx;
-			height: 88rpx;
-			line-height: 88rpx;
-			background: $theme-color;
-			text-align: center;
-			font-size: 36rpx;
-			font-style: normal;
-			font-weight: 400;
-			color: #fff;
-		}
-	}
-
 
 	.operate_box {
 		padding: 10rpx 160rpx;

pages/pda/workOrder/index/index.vue

@@ -52,7 +52,7 @@
 		data() {
 			return {
 				page: 1,
-				size: 5,
+				size: 10,
 				dataList: [],
 
 				searchFrom: {
@@ -92,6 +92,7 @@
 
 
 			scrolltolower() {
+	
 				if (isEnd) return
 				this.page++
 				this.getList()