diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue
index a209c2af..59a4c92a 100644
--- a/src/mycomponents/job/jobFilter.vue
+++ b/src/mycomponents/job/jobFilter.vue
@@ -17,6 +17,21 @@
 				</view>
 				<u-switch v-model="checkedWaitModel" active-color="#4DD865" inactive-color="#eee" size="35" @change="switchChangeWait"></u-switch>	
 			</view>
+			<view v-if="isShowProductionLineCode" class="uni-flex space-between u-col-center" style="width: 100%;margin-top: 30rpx;">
+				<view class="" style="font-size: 32rpx;">
+					生产线
+				</view>
+				<u-input style="margin-left: 20rpx;" v-model="productionLineCode" :border="true"
+					placeholder="请输入生产线" @confirm="productionLineCodeConfirm" />
+			</view>
+			<view v-if="isShowFromLocationCode" class="uni-flex space-between u-col-center" style="width: 100%;margin-top: 30rpx;">
+				<view class="" style="font-size: 32rpx;">
+					来源库位
+				</view>
+				<u-input style="margin-left: 20rpx;" v-model="fromLocationCode" :border="true"
+					placeholder="请输入来源库位" @confirm="fromLocationCodeConfirm" />
+			</view>
+			
 			<view class="">
 				<view class="uni-flex u-row-center" style="margin-top: 30rpx;" v-if="isShowAsn">
 					<button class="filter_button" hover-class="filter_button_after"
@@ -64,13 +79,23 @@
 			isShowAsn:{
 				type: Boolean,
 				default: false
-			}
+			},
+			isShowFromLocationCode:{
+				type: Boolean,
+				default: false
+			},
+			isShowProductionLineCode:{
+				type: Boolean,
+				default: false
+			},
 		},
 		data() {
 			return {
 				dataContent: {},
 				checkedTodayModel:false,
 				checkedWaitModel:false,
+				productionLineCode:'',// 生产线
+				fromLocationCode:'',// 来源库位
 			}
 		},
 		watch: {
@@ -92,6 +117,15 @@
 		mounted() {
 		},
 		methods: {
+			// 生产线
+			productionLineCodeConfirm(){
+				this.$emit("productionLineCode", this.productionLineCode)
+				
+			},
+			// 来源库位
+			fromLocationCodeConfirm(){
+				this.$emit("fromLocationCode", this.fromLocationCode)
+			},
 			// 点击遮罩
 			maskClick() {
 				// 如果不允许点击遮罩，直接返回
diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue
index 9d26a187..58e978b8 100644
--- a/src/pages/issue/job/issueJob.vue
+++ b/src/pages/issue/job/issueJob.vue
@@ -1,309 +1,334 @@
-<template>
-	<view class="">
-		<com-empty-view v-if="jobList.length==0"></com-empty-view>
-		<job-filter ref="filter" otherTitle="" @switchChangeToday="switchChangeToday"
-			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
-			:checkedWaitTask="checkedWaitTask">
-		</job-filter>
-		<view v-if="jobList.length>0">
-			<uni-swipe-action ref="swipeAction">
-				<view v-for="(item, index) in jobList" :key="index">
-					<uni-swipe-action-item :right-options="item.status=='2'?detailGiveupOptions:detailOptions"
-						@click="swipeClick($event,item)">
-						<com-issue-job-card :dataContent="item" @click='openJobDetail(item)'></com-issue-job-card>
-					</uni-swipe-action-item>
-				</view>
-			</uni-swipe-action>
-
-			<job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></job-list-popup>
-			<job-info-popup ref='jobInfoPopup'></job-info-popup>
-
-			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
-		</view>
-		<comMessage ref="comMessage"></comMessage>
-	</view>
-</template>
-
-<script>
-	import {
-		cancleTakeIssueJob,
-		getIssueJobList,
-	} from '@/api/request2.js';
-	import {
-		goHome,
-		updateTitle
-	} from '@/common/basic.js';
-
-	import {
-		getDetailOption,
-		getDetailGiveupOption
-	} from '@/common/array.js';
-
-	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
-	import jobFilter from '@/mycomponents/job/jobFilter.vue'
-	import comIssueJobCard from '@/pages/issue/coms/comIssueJobCard.vue'
-	import jobListPopup from '@/pages/issue/coms/jobListPopup.vue'
-	import jobInfoPopup from '@/pages/issue/coms/jobInfoPopup.vue'
-
-	export default {
-		name: 'issue',
-		components: {
-			comEmptyView,
-			jobFilter,
-			comIssueJobCard,
-			jobListPopup,
-			jobInfoPopup
-		},
-		data() {
-			return {
-				jobList: [],
-				pageNo: 1,
-				pageSize: 10,
-				totalCount: 0,
-				loadingType: "nomore",
-				checkedToday: false,
-				checkedWaitTask: false,
-				todayTime: "",
-				status: '1,2', //待处理 、进行中
-				detailOptions: [],
-				detailGiveupOptions: [],
-			};
-		},
-
-		onShow() {
-			this.getList('refresh');
-		},
-
-		onReady() {
-			this.detailOptions = getDetailOption();
-			this.detailGiveupOptions = getDetailGiveupOption();
-		},
-		onReachBottom() {
-			//避免多次触发
-			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
-				return;
-			}
-			this.getList("more");
-		},
-
-		onPullDownRefresh() {
-			this.getList('refresh');
-		},
-
-		//后退按钮
-		onBackPress(options) {
-			if (options.from === 'navigateBack') {
-				uni.navigateBack({
-					delta: 1
-				})
-				return false;
-			}
-		},
-
-		//返回首页
-		onNavigationBarButtonTap(e) {
-			if (e.index === 0) {
-				goHome();
-			} else if (e.index == 1) {
-				this.$refs.filter.openFilter();
-			}
-		},
-
-		methods: {
-			getList(type) {
-				let that = this;
-				uni.showLoading({
-					title: "加载中­....",
-					mask: true
-				});
-
-				this.loadingType = "loading";
-				if (type === "refresh") {
-					this.pageNo = 1;
-					this.jobList = [];
-				}
-				var filters = []
-				if (this.checkedToday) {
-					filters.push({
-						column: "request_time",
-						action: "betweeen",
-						value: this.todayTime
-					})
-				}
-
-				filters.push({
-					column: "status",
-					action: "in",
-					value: this.status
-				})
-
-				var params = {
-					filters: filters,
-					pageNo: this.pageNo,
-					pageSize: this.pageSize,
-				}
-				getIssueJobList(params).then(res => {
-					uni.hideLoading();
-					if (type === "refresh") {
-						uni.stopPullDownRefresh();
-					}
-					var list = res.data.list;
-					this.totalCount = res.data.total
-					updateTitle("发料任务(" + this.totalCount + ")");
-					this.loadingType = "loadmore";
-					if (list == null || list.length == 0) {
-						this.loadingType = "nomore";
-						return;
-					}
-					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
-					this.pageNo++;
-					
-
-				}).catch(error => {
-					if (type === "refresh") {
-						uni.stopPullDownRefresh();
-					}
-					updateTitle("发料任务");
-					this.loadingType = "";
-					uni.hideLoading();
-					that.showMessage(error)
-				})
-			},
-
-			getByAsnNumber(code) {
-				let that = this;
-				uni.showLoading({
-					title: "加载中....",
-					mask: true
-				});
-
-				getPurchasereceiptByAsnNumber(code).then(res => {
-					uni.hideLoading();
-					if (res.data.total == 0) {
-						that.showMessage('未查找到' + '【' + code + '】的收货任务');
-					} else if (res.data.total == 1) {
-						this.$refs.scanAsnNumber.closeScanPopup();
-						that.openJobDetail(res.data.list[0]);
-					} else {
-						this.$refs.scanAsnNumber.closeScanPopup();
-						that.showItemList(res.data.list);
-					}
-
-				}).catch(error => {
-					uni.hideLoading();
-					that.showErrorMessage(error);
-				})
-			},
-
-
-			openJobDetail(item) {
-				uni.navigateTo({
-					url: './issueDetail?id=' + item.masterId + '&status=' + item.status
-				});
-			},
-
-			showItemList(itemList) {
-				this.$refs.scanList.openPopup(itemList);
-			},
-
-			selectedItem(item) {
-				this.openJobDetail(item);
-			},
-
-			swipeClick(e, dataContent) {
-				if (e.content.text == "详情") {
-					this.openjobInfoPopup(dataContent);
-				} else if (e.content.text == "放弃") {
-					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
-						res => {
-							if (res) {
-								this.cancleJob(dataContent.masterId);
-							}
-						});
-				}
-			},
-
-			openjobInfoPopup(item) {
-				this.$refs.jobInfoPopup.openPopup(item)
-			},
-
-			cancleJob(id) {
-				cancleTakeIssueJob(id).then(res => {
-					if(res.data){
-						this.getList("refresh")
-						uni.showToast({
-							title:"放弃任务成功"
-						})
-					}else {
-						this.showMessage("放弃任务失败")
-					}
-				}).catch(error => {
-					this.showMessage(error)
-				})
-			},
-
-			switchChangeToday(state, creationTime) {
-				this.checkedToday = state;
-				this.todayTime = creationTime;
-				this.getList("refresh");
-			},
-
-			switchChangeWait(state, jobStatus) {
-				this.checkedWaitTask = state;
-				this.status = jobStatus;
-				this.getList("refresh");
-			},
-
-			getScanNumber(code) {
-				this.getDataListByType(code)
-			},
-			getDataListByType(code) {
-				let that = this;
-				uni.showLoading({
-					title: "加载中....",
-					mask: true
-				});
-				var filters = []
-				filters.push({
-					column: "status",
-					action: "in",
-					value: '1,2'
-				})
-				filters.push({
-					column: "number",
-					action: "==",
-					value: code
-				})
-
-				var params = {
-					filters: filters,
-					pageNo: 1,
-					pageSize: 100,
-				}
-				getIssueJobList(params).then(res => {
-					uni.hideLoading();
-					if (res.data.list.length == 0) {
-						that.showMessage('未查找到' + '【' + code + '】的收货任务');
-					} else if (res.data.list.length == 1) {
-						that.openJobDetail(res.data.list[0]);
-					}
-				}).catch(error => {
-					uni.hideLoading();
-					that.showMessage(error);
-				})
-			},
-
-			showMessage(message) {
-				this.$refs.comMessage.showErrorMessage(message, res => {
-					if (res) {
-
-					}
-				});
-			},
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-
-</style>
+<template>
+	<view class="">
+		<com-empty-view v-if="jobList.length==0"></com-empty-view>
+		<job-filter :isShowFromLocationCode="true" :isShowProductionLineCode="true" ref="filter" otherTitle=""
+			@switchChangeToday="switchChangeToday" @switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber"
+			:checkedToday="checkedToday" :checkedWaitTask="checkedWaitTask" @productionLineCode="productionLineCode"
+			@fromLocationCode="fromLocationCode">
+		</job-filter>
+		<view v-if="jobList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in jobList" :key="index">
+					<uni-swipe-action-item :right-options="item.status=='2'?detailGiveupOptions:detailOptions"
+						@click="swipeClick($event,item)">
+						<com-issue-job-card :dataContent="item" @click='openJobDetail(item)'></com-issue-job-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+
+			<job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></job-list-popup>
+			<job-info-popup ref='jobInfoPopup'></job-info-popup>
+
+			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		cancleTakeIssueJob,
+		getIssueJobList,
+	} from '@/api/request2.js';
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption
+	} from '@/common/array.js';
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+	import comIssueJobCard from '@/pages/issue/coms/comIssueJobCard.vue'
+	import jobListPopup from '@/pages/issue/coms/jobListPopup.vue'
+	import jobInfoPopup from '@/pages/issue/coms/jobInfoPopup.vue'
+
+	export default {
+		name: 'issue',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comIssueJobCard,
+			jobListPopup,
+			jobInfoPopup
+		},
+		data() {
+			return {
+				jobList: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				checkedWaitTask: false,
+				todayTime: "",
+				status: '1,2', //待处理 、进行中
+				detailOptions: [],
+				detailGiveupOptions: [],
+			};
+		},
+
+		onShow() {
+			this.getList('refresh');
+		},
+
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailGiveupOptions = getDetailGiveupOption();
+		},
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+		methods: {
+			getList(type, fromLocationCode = '', productionLineCode = '') {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.jobList = [];
+				}
+				var filters = []
+				if (this.checkedToday) {
+					filters.push({
+						column: "request_time",
+						action: "betweeen",
+						value: this.todayTime
+					})
+				}
+
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+
+				if (fromLocationCode != '') {
+					// 来源库位
+					filters.push({
+						column: "fromLocationCode",
+						action: "==",
+						value: fromLocationCode
+					})
+				}
+				if (productionLineCode != '') {
+					// 生产线
+					filters.push({
+						column: "productionLineCode",
+						action: "==",
+						value: productionLineCode
+					})
+				}
+
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+				getIssueJobList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					updateTitle("发料任务(" + this.totalCount + ")");
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+					this.pageNo++;
+
+
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					updateTitle("发料任务");
+					this.loadingType = "";
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+			fromLocationCode(fromLocationCode) {
+				console.log('fromLocationCode', fromLocationCode)
+				this.getList('refresh', fromLocationCode, '')
+			},
+			productionLineCode(productionLineCode) {
+				console.log('productionLineCode', productionLineCode)
+				this.getList('refresh', '', productionLineCode)
+			},
+			getByAsnNumber(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+
+				getPurchasereceiptByAsnNumber(code).then(res => {
+					uni.hideLoading();
+					if (res.data.total == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.total == 1) {
+						this.$refs.scanAsnNumber.closeScanPopup();
+						that.openJobDetail(res.data.list[0]);
+					} else {
+						this.$refs.scanAsnNumber.closeScanPopup();
+						that.showItemList(res.data.list);
+					}
+
+				}).catch(error => {
+					uni.hideLoading();
+					that.showErrorMessage(error);
+				})
+			},
+
+
+			openJobDetail(item) {
+				uni.navigateTo({
+					url: './issueDetail?id=' + item.masterId + '&status=' + item.status
+				});
+			},
+
+			showItemList(itemList) {
+				this.$refs.scanList.openPopup(itemList);
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "放弃") {
+					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
+						res => {
+							if (res) {
+								this.cancleJob(dataContent.masterId);
+							}
+						});
+				}
+			},
+
+			openjobInfoPopup(item) {
+				this.$refs.jobInfoPopup.openPopup(item)
+			},
+
+			cancleJob(id) {
+				cancleTakeIssueJob(id).then(res => {
+					if (res.data) {
+						this.getList("refresh")
+						uni.showToast({
+							title: "放弃任务成功"
+						})
+					} else {
+						this.showMessage("放弃任务失败")
+					}
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+			switchChangeToday(state, creationTime) {
+				this.checkedToday = state;
+				this.todayTime = creationTime;
+				this.getList("refresh");
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: '1,2'
+				})
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getIssueJobList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openJobDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
\ No newline at end of file