diff --git a/pages.json b/pages.json
index f42a362..58e5c2d 100644
--- a/pages.json
+++ b/pages.json
@@ -73,7 +73,9 @@
 		,{
 		    "path" : "pages/ProductManage/ZjCasing",
 		    "style": {
-		    	"navigationStyle": "custom"
+		    	"navigationStyle": "custom",
+				"enablePullDownRefresh": true,
+				"onReachBottomDistance": 50
 		    }  
 		}
 		,{
diff --git a/pages/ProductManage/ZjCasing.vue b/pages/ProductManage/ZjCasing.vue
index d4e57c4..0442abe 100644
--- a/pages/ProductManage/ZjCasing.vue
+++ b/pages/ProductManage/ZjCasing.vue
@@ -3,9 +3,33 @@
 		<nav-bar title="子卷套管"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label">区域</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+				</view>
 				<view class="filter_item">
 					<view class="filter_label_wraper">
-						<span class="filter_label">点位</span>
+						<span class="filter_label">设备</span>
+					</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">子卷号</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val4"
+						/>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">存放点位</span>
 					</view>
 					<view class="filter_input_wraper">
 						<search-box
@@ -23,32 +47,6 @@
 						/>
 					</view>
 				</view>
-				<view class="filter_item">
-					<view class="filter_label">区域</view>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label_wraper">
-						<span class="filter_label">设备</span>
-					</view>
-					<view class="filter_input_wraper">
-						<search-box
-						v-model="val3"
-						/>
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label_wraper">
-						<span class="filter_label">子卷号</span>
-					</view>
-					<view class="filter_input_wraper">
-						<search-box
-						v-model="val4"
-						/>
-					</view>
-				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
@@ -57,7 +55,6 @@
 							<tr>
 								<th>序号</th>
 								<th>选择</th>
-								<th>订单号</th>
 								<th>子卷号</th>
 								<th>机台编号</th>
 								<th>分切组</th>
@@ -70,13 +67,13 @@
 								<th>FRP管物料编码</th>
 								<th>FRP管物料描述</th>
 								<th>FRP管规格</th>
+								<th>订单号</th>
 							</tr>
 						</thead>
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.checked}">
 								<td>{{Number(i) + 1}}</td>
 								<td><span class="iconfont icon_unchecked" :class="{'icon_checked': e.checked}" @tap="toCheck(e)">&#xe66b;</span></td>
-								<td>{{e.mfg_order_name}}</td>
 								<td>{{e.container_name}}</td>
 								<td>{{e.point_code}}</td>
 								<td>{{e.split_group}}</td>
@@ -89,15 +86,17 @@
 								<td>{{e.FRP_material}}</td>
 								<td>{{e.FRP_description}}</td>
 								<td>{{e.FRP_model}}</td>
+								<td>{{e.mfg_order_name}}</td>
 							</tr>
 						</tbody>
 					</table>
 				</view>
 			</view>
+			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
 		</view>
 		<view class="submit-bar">
 			<button class="submit-button" :class="{'btn-disabled': !checkArr.length || !val2}" :disabled="disabled" @tap="_casingConfirm">套轴确认</button>
-			<button class="submit-button" @tap="_queryMaterialInfo">查询</button>
+			<button class="submit-button" @tap="searchList">查询</button>
 		</view>
 	</view>
 </template>
@@ -105,7 +104,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryProductArea, queryMaterialInfo2, casingConfirm} from '@/utils/getData2.js'
+	import {queryProductArea, queryDeviceByarea, queryMaterialInfo2, casingConfirm} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -115,37 +114,84 @@
 			return {
 				val1: '',
 				val2: '',
-				val3: '',
 				val4: '',
-				options: [],
-				index: '',
+				options1: [],
+				index1: '',
+				options2: [],
+				index2: '',
 				qty: '',
 				dataList: [],
 				disabled: false,
-				checkArr: []
+				checkArr: [],
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 10
 			};
 		},
 		created () {
 			this._queryProductArea()
-			this._queryMaterialInfo()
 		},
 		methods: {
-			/** 选择器 */
-			selectChange(e) {
-				this.index = e
+			/** 选择器1 */
+			selectChange1(e) {
+				this.index1 = e
+				this._queryDeviceByarea(e)
 			},
 			/** 生产区域下拉框查询 */
 			async _queryProductArea () {
 				let res = await queryProductArea()
-				this.options = [...res.data]
+				this.options1 = [...res.data]
+			},
+			/** 选择器2 */
+			selectChange2(e) {
+				this.index2 = e
+			},
+			/** 设备下拉框 */
+			async _queryDeviceByarea (e) {
+				let res = await queryDeviceByarea(e)
+				this.options2 = [...res.data]
+			},
+			searchList () {
+				this.dataList = []
+				this.pageNum = 1
+				this._queryMaterialInfo()
 			},
 			/** 初始化查询 */
 			async _queryMaterialInfo () {
-				let res = await queryMaterialInfo2(this.val1, this.index, this.val3, this.val4)
+				let res = await queryMaterialInfo2(this.val1, this.index1, this.index2, this.val4, this.pageNum + '', this.pageSize + '')
 				res.data.map(el => {
 					this.$set(el, 'checked', false)
 				})
-				this.dataList = [...res.data]	
+				this.totalCount = res.size
+				if (res.size > 0) {
+					const dataMap = res.data
+					this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
+					this.reload = false
+				} else {
+					this.dataList = []
+				}
+				if (this.totalCount == this.dataList.length) {
+					this.reload = false
+					this.status = 'noMore'
+				}
+			},
+			onReachBottom () {
+				if (this.totalCount > this.dataList.length) {
+					this.status = 'loading'
+					setTimeout(() => {
+						this.pageNum++
+						this._queryMaterialInfo()
+					}, 1000)
+				} else { //停止加载
+					this.status = 'noMore'
+				}
 			},
 			/** 确认 */
 			async _casingConfirm () {
@@ -155,10 +201,10 @@
 					return
 				}
 				try {
-					let res = await casingConfirm(this.checkArr, this.val2)
+					let res = await casingConfirm(this.checkArr, this.val2, this.val1)
 					this.disabled = false
 					this.checkArr = []
-					this._queryMaterialInfo()
+					this.searchList()
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
@@ -181,11 +227,6 @@
 	.slide_new table td:nth-child(2), .slide_new table th:nth-child(2)
 		position sticky
 		left 89rpx
-		width 92rpx
 		z-index 102
-	.slide_new table td:nth-child(3), .slide_new table th:nth-child(3)
-		position sticky
-		left 176rpx
-		z-index 103
 		box-shadow 1px 0 2px rgba(0,0,0,.12)
 </style>
diff --git a/pages/ProductManage/ZjDelivery.vue b/pages/ProductManage/ZjDelivery.vue
index f2cd767..88ad189 100644
--- a/pages/ProductManage/ZjDelivery.vue
+++ b/pages/ProductManage/ZjDelivery.vue
@@ -3,13 +3,27 @@
 		<nav-bar title="子卷配送"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label">区域</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+				</view>
 				<view class="filter_item">
 					<view class="filter_label_wraper">
-						<span class="filter_label">起点</span>
+						<span class="filter_label">设备</span>
+					</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">气涨轴</span>
 					</view>
 					<view class="filter_input_wraper">
 						<search-box
-						v-model="val3"
+						v-model="val2"
 						/>
 					</view>
 				</view>
@@ -25,20 +39,14 @@
 				</view>
 				<view class="filter_item">
 					<view class="filter_label_wraper">
-						<span class="filter_label">气涨轴</span>
+						<span class="filter_label">起点</span>
 					</view>
 					<view class="filter_input_wraper">
 						<search-box
-						v-model="val2"
+						v-model="val3"
 						/>
 					</view>
 				</view>
-				<view class="filter_item">
-					<view class="filter_label">区域</view>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
-					</view>
-				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
@@ -47,12 +55,12 @@
 							<tr>
 								<th>序号</th>
 								<th>选择</th>
-								<th>订单号</th>
-								<th>子卷号</th>
+								<th>气涨轴</th>
 								<th>机台编号</th>
 								<th>分切组</th>
 								<th>生产顺序</th>
 								<th>生产日期</th>
+								<th>子卷号</th>
 								<th>纸筒/FRP管</th>
 								<th>纸筒物料编码</th>
 								<th>纸筒物料描述</th>
@@ -60,18 +68,19 @@
 								<th>FRP管物料编码</th>
 								<th>FRP管物料描述</th>
 								<th>FRP管规格</th>
+								<th>订单号</th>
 							</tr>
 						</thead>
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.checked}">
 								<td>{{Number(i) + 1}}</td>
 								<td><span class="iconfont icon_unchecked" :class="{'icon_checked': e.checked}" @tap="toCheck(e)">&#xe66b;</span></td>
-								<td>{{e.mfg_order_name}}</td>
-								<td>{{e.container_name}}</td>
+								<td>{{e.qzzno}}</td>
 								<td>{{e.point_code}}</td>
 								<td>{{e.split_group}}</td>
 								<td>{{e.manufacture_sort}}</td>
 								<td>{{e.manufacture_date}}</td>
+								<td>{{e.container_name}}</td>
 								<td>{{e.paper_tube_or_FRP}}</td>
 								<td>{{e.paper_tube_material}}</td>
 								<td>{{e.paper_tube_description}}</td>
@@ -79,6 +88,7 @@
 								<td>{{e.FRP_material}}</td>
 								<td>{{e.FRP_description}}</td>
 								<td>{{e.FRP_model}}</td>
+								<td>{{e.mfg_order_name}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -98,7 +108,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryProductArea, queryMaterialInfo3, needVehicle, shippingConfirm, returnVehicle, shippingCheck} from '@/utils/getData2.js'
+	import {queryProductArea, queryDeviceByarea, queryMaterialInfo3, needVehicle, shippingConfirm, returnVehicle, shippingCheck} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -109,8 +119,8 @@
 				val1: '',
 				val2: '',
 				val3: '',
-				options: [],
-				index: '',
+				options1: [],
+				index1: '',
 				qty: '',
 				dataList: [],
 				disabled1: false,
@@ -125,18 +135,28 @@
 			this._queryMaterialInfo()
 		},
 		methods: {
-			/** 选择器 */
-			selectChange(e) {
-				this.index = e
+			/** 选择器1 */
+			selectChange1(e) {
+				this.index1 = e
+				this._queryDeviceByarea(e)
 			},
 			/** 生产区域下拉框查询 */
 			async _queryProductArea () {
 				let res = await queryProductArea()
-				this.options = [...res.data]
+				this.options1 = [...res.data]
+			},
+			/** 选择器2 */
+			selectChange2(e) {
+				this.index2 = e
+			},
+			/** 设备下拉框 */
+			async _queryDeviceByarea (e) {
+				let res = await queryDeviceByarea(e)
+				this.options2 = [...res.data]
 			},
 			/** 初始化查询 */
 			async _queryMaterialInfo () {
-				let res = await queryMaterialInfo3(this.val1, this.val2, this.index)
+				let res = await queryMaterialInfo3(this.val1, this.val2, this.index1, this.index2)
 				if (this.val2) {
 					res.data.map(el => {
 						this.$set(el, 'checked', true)
@@ -255,11 +275,6 @@
 	.slide_new table td:nth-child(2), .slide_new table th:nth-child(2)
 		position sticky
 		left 89rpx
-		width 92rpx
 		z-index 102
-	.slide_new table td:nth-child(3), .slide_new table th:nth-child(3)
-		position sticky
-		left 176rpx
-		z-index 103
 		box-shadow 1px 0 2px rgba(0,0,0,.12)
 </style>
diff --git a/utils/getData2.js b/utils/getData2.js
index c664f2d..32de785 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -87,6 +87,12 @@ export const queryProductArea = () => request({
 	url:'api/pda/raw/queryProductArea',
 	data: {}
 })
+// export const queryProductArea = () => {
+// 	let res = {
+// 		data: [{value: '01', text: 'a'}, {value: '02', text: 'b'}]
+// 	}
+// 	return res
+// }
 // 1.2空纸管库设备物料初始化查询
 export const queryMaterialInfo1 = (code, mcode, area, option) => request({
 	url:'api/pda/empty/queryMaterialInfo',
@@ -112,21 +118,31 @@ export const emptyConfirm = (jo, qty, code, option) => request({
  * 子卷套管
  */
 // 1.1分切计划初始化查询
-export const queryMaterialInfo2 = (code, area, device, name) => request({
+export const queryMaterialInfo2 = (code, area, device, name, page, size) => request({
 	url:'api/pda/casing/queryMaterialInfo',
 	data: {
 		point_code: code,
 		product_area: area,
 		device_code: device,
-		container_name: name
+		container_name: name,
+		page: page,
+		size: size
 	}
 })
 // 1.2套轴确认
-export const casingConfirm = (row, qzz) => request({
+export const casingConfirm = (row, qzz, code) => request({
 	url:'api/pda/casing/confirm',
 	data: {
 		cut_rows: row,
-		qzzno: qzz
+		qzzno: qzz,
+		point_code: code
+	}
+})
+//1.3设备下拉框
+export const queryDeviceByarea = (area) => request({
+	url:'api/pda/casing/queryDeviceByarea',
+	data: {
+		product_area: area
 	}
 })
 
@@ -134,12 +150,13 @@ export const casingConfirm = (row, qzz) => request({
  * 子卷配送
  */
 // 1.1分切计划初始化查询
-export const queryMaterialInfo3 = (code, qzz, area) => request({
+export const queryMaterialInfo3 = (code, qzz, area, device) => request({
 	url:'api/pda/shipping/queryMaterialInfo',
 	data: {
 		vehicle_code: code,
 		qzzno: qzz,
-		product_area: area
+		product_area: area,
+		device_code: device
 	}
 })
 // 1.2呼叫载具