diff --git a/pages.json b/pages.json
index 22b5724..943328b 100644
--- a/pages.json
+++ b/pages.json
@@ -505,6 +505,13 @@
                 "navigationStyle": "custom"
             }
         }
+        ,{
+            "path" : "pages/ftdl/mater-list-cxjl",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/ftdl/line-call-mater.vue b/pages/ftdl/line-call-mater.vue
index 61c6685..527c5c6 100644
--- a/pages/ftdl/line-call-mater.vue
+++ b/pages/ftdl/line-call-mater.vue
@@ -21,16 +21,16 @@
 						<!-- <span class="filter_label">物料</span> -->
 						<span class="filter_label">{{$t('filter.material')}}</span>
 					</view>
-					<view class="zd-col-24 filter_select">
-						<uni-data-select v-model="index" :localdata="options" placeholder="" @change="selectChange"></uni-data-select>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input" v-model="currentData.material_name" @tap="toJump">
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
-					<view class="zd-col-6">
+					<view class="zd-col-10">
 						<!-- <span class="filter_label">用料数量</span> -->
 						<span class="filter_label">{{$t('filter.material-use-number')}}</span>
 					</view>
-					<view class="zd-col-16">
+					<view class="zd-col-14">
 						<input type="number" v-model="val3" class="filter_input">
 					</view>
 					<view class="zd-col-2"><span class="filter_unit">{{unit}}</span></view>
@@ -48,9 +48,9 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<!-- <button class="zd-col-6 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val2 || !index}" :disabled="disabled" @tap="_loading">确认</button> -->
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_loading">确认</button> -->
 			<button class="zd-col-8 button-default" @tap="clearUp">{{$t('button.clear')}}</button>
-			<button class="zd-col-14 button-primary" :class="{'button-info': !val1 || !val2 || !index}" :disabled="disabled" @tap="_loading">{{$t('button.confirm')}}</button>
+			<button class="zd-col-14 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_loading">{{$t('button.confirm')}}</button>
 		</view>
 	</view>
 </template>
@@ -71,8 +71,8 @@
 				val2: '1',
 				val3: '',
 				unit: '',
+				currentData: {},
 				options: [],
-				index: '',
 				pointCode: '',
 				disabled: false
 			};
@@ -83,6 +83,10 @@
 		created () {
 		},
 		onShow() {
+			if (this.$store.getters.publicObj !== '') {
+				this.currentData = this.$store.getters.publicObj
+				this.$store.dispatch('setPublicObj', '')
+			}
 		},
 		methods: {
 			async _selectMaterialByRegion () {
@@ -97,12 +101,17 @@
 					this.options = []
 				}
 			},
-			selectChange (e) {
-				this.index = e
-				let selobj = this.options.find(item => item.value === this.index)
-				this.val3 = selobj.qty
-				this.unit = selobj.measure_unit_id
+			toJump () {
+				uni.navigateTo({
+					url: '/pages/ftdl/mater-list-cxjl?title=查询物料'
+				})
 			},
+			// selectChange (e) {
+			// 	this.index = e
+			// 	let selobj = this.options.find(item => item.value === this.index)
+			// 	this.val3 = selobj.qty
+			// 	this.unit = selobj.measure_unit_id
+			// },
 			handleChange1 (e) {
 				if (e) {
 					this._getRegionByPoint(e)
@@ -129,17 +138,16 @@
 				this.val1 = ''
 				this.val2 = ''
 				this.pointCode = ''
-				this.index = ''
 				this.disabled = false
 			},
 			async _loading () {
 				this.disabled = true
-				if (!this.val1 || !this.val2 || !this.index) {
+				if (!this.val1 || !this.val2) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await loading(this.pointCode, this.val1, this.index, this.val2)
+					let res = await loading(this.pointCode, this.val1, this.currentData.material_code, this.val2)
 					if (res.code === '200') {
 						uni.showToast({
 							title: res.message,
diff --git a/pages/ftdl/mater-list-cxjl.vue b/pages/ftdl/mater-list-cxjl.vue
new file mode 100644
index 0000000..64d17fc
--- /dev/null
+++ b/pages/ftdl/mater-list-cxjl.vue
@@ -0,0 +1,157 @@
+<template>
+	<view class="zd_container">
+		<!-- 查询物料 -->
+		<nav-bar :title="title" :inner="true"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-9">
+						<!-- <span class="filter_label">区域</span> -->
+						<span class="filter_label">{{$t('filter.area')}}</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<uni-data-select v-model="index" :localdata="options" placeholder="" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<!-- <th>物料编码</th>
+								<th>物料名称</th> -->
+								<th>{{$t('grid.material-code')}}</th>
+								<th>{{$t('grid.material-name')}}</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.material_code === pkId}" @tap="toCheck(e)">
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_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="zd-row submit-bar">
+			<!-- <button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-8 button-primary" @tap="searchList">查询</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !pkId}" @tap="toSure">确认</button> -->
+			<button class="zd-col-8 button-default" @tap="toEmpty">{{$t('button.clear')}}</button>
+			<button class="zd-col-8 button-primary" @tap="searchList">{{$t('button.search')}}</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" @tap="toSure">{{$t('button.confirm')}}</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {selectFullMaterials, getCallRegions} from '@/utils/getData4.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options: [],
+				index: '',
+				dataList: [],
+				// dataList: [
+				// 	{material_code: 'code1', material_name: 'name1', measure_unit_id: '千克'},
+				// 	{material_code: 'code2', material_name: 'name2', measure_unit_id: '千克'},
+				// 	{material_code: 'code3', material_name: 'name3', measure_unit_id: '千克'},
+				// ],
+				pkId: '',
+				pkObj: {},
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 10
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+			// this.searchList()
+			this._getCallRegions()
+		},
+		methods: {
+			async _getCallRegions () {
+				try {
+					let res = await getCallRegions()
+					if (res) {
+						this.options = res.data
+					} else {
+						this.options =[]
+					}
+				} catch (e) {
+					this.options = []
+				}
+			},
+			selectChange (e) {
+				this.index = e
+				if (this.index) {
+					this.searchList()
+				}
+			},
+			searchList () {
+				this.dataList = []
+				this.pageNum = 1
+				this._selectFullMaterials()
+			},
+			async _selectFullMaterials () {
+				let res = await selectFullMaterials(this.index)
+				this.dataList = res.data
+				// this.totalCount = res.totalElements
+				// if (res.totalElements > 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._selectFullMaterials()
+					}, 1000)
+				} else { //停止加载
+					this.status = 'noMore'
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.material_code ? '' : e.material_code
+				this.pkObj = this.pkId === e.material_code ? e : {}
+			},
+			toEmpty () {
+				this.dataList = []
+				this.pageNum = 1
+				this.pkId = ''
+			},
+			toSure () {
+				if (this.pkId) {
+					this.$store.dispatch('setPublicObj', this.pkObj)
+					uni.navigateBack()
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/utils/getData4.js b/utils/getData4.js
index ed66365..70b1c6c 100644
--- a/utils/getData4.js
+++ b/utils/getData4.js
@@ -39,6 +39,17 @@ export const loading = (pcode, rcode, mcode, num) => request({
 	url:'api/hand/loading',
 	data: {point_code: pcode, region_code: rcode, material_code: mcode, num: num}
 })
+// 1.4查询物料信息
+export const selectFullMaterials = (rcode) => request({
+	url:'api/hand/selectFullMaterials',
+	data: {region_code: rcode}
+})
+// 1.4查询所有叫料区域
+export const getCallRegions = () => request({
+	url:'api/hand/getCallRegions',
+	data: {}
+})
+
 
 // 产线下料
 // 1.1查询物料信息