Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into master_hella

src/api/request2.js

@@ -1314,6 +1314,14 @@ export function getIssueJobList(params) {
 		data: params,
 	});
 }
+export function getIssueJobByProductionline() {
+	return request({
+		url: baseApi + "/wms/issue-job-main/getIssueJobByProductionline",
+		method: "get",
+		data: {},
+	});
+}
+ 
 /**
  * 发料任务明细
  * @param {*} 任务id

src/mycomponents/job/jobFilter.vue

@@ -21,8 +21,10 @@
 				<view class="" style="font-size: 32rpx;">
 					生产线
 				</view>
-				<u-input style="margin-left: 20rpx;" v-model="productionLineCode" :border="true"
+				<!-- <u-input style="margin-left: 20rpx;" v-model="productionLineCode" :border="true"
-					placeholder="请输入生产线" @confirm="productionLineCodeConfirm" />
+					placeholder="请输入生产线" @confirm="productionLineCodeConfirm" /> -->
+				<uni-data-select class="uni-data-select" style="margin-left: 20rpx;" placeholder="请输入生产线" v-model="productionLineCode" :clear="false" :localdata="productionline" @change="productionLineCodeConfirm"></uni-data-select>
+				
 			</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;">
@@ -92,6 +94,10 @@
 				type: Boolean,
 				default: false
 			},
+			productionline:{
+				type: Array,
+				default: []
+			}
 		},
 		data() {
 			return {

src/pages/issue/job/issueJob.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="">
 		<com-empty-view v-if="jobList.length==0"></com-empty-view>
-		<job-filter :isShowFromLocationCode="true" :isShowProductionLineCode="true" ref="filter" otherTitle=""
+		<job-filter :isShowFromLocationCode="true" :isShowProductionLineCode="true" :productionline="productionline" ref="filter" otherTitle=""
 			@switchChangeToday="switchChangeToday" @switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber"
 			:checkedToday="checkedToday" :checkedWaitTask="checkedWaitTask" @productionLineCode="productionLineCode"
 			@fromLocationCode="fromLocationCode">
@@ -31,7 +31,8 @@
 <script>
 	import {
 		cancleTakeIssueJob,
-		getIssueJobList,
+		getIssueJobList,
+		getIssueJobByProductionline
 	} from '@/api/request2.js';
 	import {
 		goHome,
@@ -76,10 +77,13 @@
 				todayTime: "",
 				status: '1,2', //待处理 、进行中
 				detailOptions: [],
-				detailGiveupOptions: [],
+				detailGiveupOptions: [],
+				productionline:[]
 			};
+		},
+		onLoad(){
+			this.getIssueJobByProductionline()
 		},
-
 		onShow() {
 			this.getList('refresh');
 		},
@@ -119,7 +123,20 @@
 			}
 		},
 
-		methods: {
+		methods: {
+			getIssueJobByProductionline(){
+				getIssueJobByProductionline().then(res=>{
+					console.log('生产线',res)
+					if(res.code==0){
+						this.productionline = res.data.map(item=>({
+							value: item, 
+							text: item
+						}))
+					}else{
+						this.productionline = []
+					}
+				})
+			},
 			getList(type, fromLocationCode = '', productionLineCode = '') {
 				let that = this;
 				uni.showLoading({

src/pages/purchaseReceipt/job/receiptJob.vue

@@ -356,6 +356,7 @@
 				
 			},
 			getScanResult(result) {
+				
 				
 
 				try {
@@ -366,6 +367,10 @@
 							column: "asn_number",
 							action: "==",
 							value: result.label.code
+						},{
+							column: "status",
+							action: "in",
+							value: '1,2',
 						}]
 					} else {
 						filters = [{