发料任务筛选中增加：生产线、来源库位

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() {
 				// 如果不允许点击遮罩，直接返回

src/pages/issue/job/issueJob.vue

@@ -1,9 +1,10 @@
 <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 :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">
@@ -110,7 +111,7 @@
 		},
 
 		methods: {
-			getList(type) {
+			getList(type, fromLocationCode = '', productionLineCode = '') {
 				let that = this;
 				uni.showLoading({
 					title: "加载中­....",
@@ -137,6 +138,23 @@
 					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,
@@ -169,7 +187,14 @@
 					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({
@@ -229,12 +254,12 @@
 
 			cancleJob(id) {
 				cancleTakeIssueJob(id).then(res => {
-					if(res.data){
+					if (res.data) {
 						this.getList("refresh")
 						uni.showToast({
-							title:"放弃任务成功"
+							title: "放弃任务成功"
 						})
-					}else {
+					} else {
 						this.showMessage("放弃任务失败")
 					}
 				}).catch(error => {