From 6e9e4c67c130b276bf46559866a5493e7c6671cc Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Tue, 6 Aug 2024 22:17:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/balance/level.vue       |   4 +-
 src/mycomponents/job/jobFilter.vue       | 122 +++++++++++++++--------
 src/pages/issue/job/issueJob.vue         |  90 +++++++++++++++--
 src/pages/repleinsh/job/repleinshJob.vue |   2 +-
 4 files changed, 169 insertions(+), 49 deletions(-)

diff --git a/src/mycomponents/balance/level.vue b/src/mycomponents/balance/level.vue
index 57c2a22e..89a7844a 100644
--- a/src/mycomponents/balance/level.vue
+++ b/src/mycomponents/balance/level.vue
@@ -15,8 +15,8 @@
 		},
 		props: {
 			priority: {
-				type: String,
-				default:'2'
+				type: Number,
+				default:2
 			},
 			title: {
 				type: String,
diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue
index deeb70ad..121c8559 100644
--- a/src/mycomponents/job/jobFilter.vue
+++ b/src/mycomponents/job/jobFilter.vue
@@ -1,40 +1,55 @@
 <template>
-	<uni-popup ref="popup" >
+	<uni-popup ref="popup">
 		<view class="maskbox" @tap="maskClick"></view>
 		<view class="uni-flex uni-column center"
 			style="background-color: white;width: 100%; height:auto;padding: 20rpx;z-index: 99;position: relative; border-radius: 10rpx;">
-			<view class="uni-flex space-between u-col-center" style="width: 100%;">
-					<view class="" style="font-size: 32rpx;">
-						只看当天
-					</view>
-					
-				<u-switch v-model="checkedTodayModel" active-color="#4DD865" inactive-color="#eee" size="35" @change="switchChangeToday"></u-switch>	
+
+			<!-- 现场并不需要这两个筛选条件，暂时拿掉 -->
+			<!-- <view class="uni-flex space-between u-col-center" style="width: 100%;">
+				<view class="" style="font-size: 32rpx;">
+					只看当天
+				</view>
+
+				<u-switch v-model="checkedTodayModel" active-color="#4DD865" inactive-color="#eee" size="35"
+					@change="switchChangeToday"></u-switch>
 			</view>
 			<view class="uni-flex space-between u-col-center" style="width: 100%;margin-top: 30rpx;">
-				
+
 				<view class="" style="font-size: 32rpx;">
 					只看待处理
 				</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;">
+				<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" /> -->
-				<uni-data-select class="uni-data-select" style="margin-left: 50rpx;" placeholder="请输入生产线" v-model="productionLineCode" :clear="false" :localdata="productionline" @change="productionLineCodeConfirm"></uni-data-select>
-				
+				<uni-data-select class="uni-data-select" style="margin-left: 50rpx;" 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 v-if="isShowItemCode" 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;" confirmType="search" v-model="itemCode" :border="true"
+					placeholder="请输入物料代码" @confirm="itemCodeConfirm" />
+			</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;" confirmType="search" v-model="fromLocationCode" :border="true"
 					placeholder="请输入来源库位" @confirm="fromLocationCodeConfirm" />
 			</view>
-			
-			<view class="">
+
+			<!-- <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"
 						@click="scanOtherClick">扫描ASN单号</button>
@@ -43,8 +58,12 @@
 					<button class="filter_button" hover-class="filter_button_after"
 						@click="scanNumberClick">扫描任务编号</button>
 				</view>
+			</view> -->
+			<view class=" uni-flex uni-row" style="margin-top: 5px;">
+				<button class="btn_single_commit" hover-class="btn_commit_after" @click="query()">查询</button>
 			</view>
 		</view>
+
 	</uni-popup>
 	<win-scan-job-number ref="scanNumber" title="任务编号" @getScanCode='getScanNumber'></win-scan-job-number>
 	<win-scan-asn-number ref="scanAsnNumber" :title="otherTitle" @getScanCode='getScanAsNumber'></win-scan-asn-number>
@@ -59,12 +78,14 @@
 	import winScanAsnNumber from "@/mycomponents/scan/winScanAsnNumber.vue"
 
 	export default {
-		emits: ["switchChangeToday", "switchChangeWait", "onScanNumber", "onScanAsnNumber","productionLineCode","fromLocationCode","fromLocationCodeConfirm"],
+		emits: ["switchChangeToday", "switchChangeWait", "onScanNumber", "onScanAsnNumber", "productionLineCode",
+			"fromLocationCode", "fromLocationCodeConfirm", "itemCodeConfirm", "onQuery"
+		],
 		components: {
 			winScanJobNumber,
 			winScanAsnNumber
 		},
-		
+
 		props: {
 			checkedToday: {
 				type: Boolean,
@@ -78,34 +99,39 @@
 				type: String,
 				default: ""
 			},
-			isShowAsn:{
+			isShowAsn: {
 				type: Boolean,
 				default: false
 			},
-			isShowJob:{
+			isShowJob: {
 				type: Boolean,
 				default: true
 			},
-			isShowFromLocationCode:{
+			isShowFromLocationCode: {
 				type: Boolean,
 				default: false
 			},
-			isShowProductionLineCode:{
+			isShowProductionLineCode: {
 				type: Boolean,
 				default: false
 			},
-			productionline:{
+			productionline: {
 				type: Array,
 				default: []
+			},
+			isShowItemCode: {
+				type: Boolean,
+				default: false
 			}
 		},
 		data() {
 			return {
 				dataContent: {},
-				checkedTodayModel:false,
-				checkedWaitModel:false,
-				productionLineCode:'',// 生产线
-				fromLocationCode:'',// 来源库位
+				checkedTodayModel: false,
+				checkedWaitModel: false,
+				productionLineCode: '', // 生产线
+				fromLocationCode: '', // 来源库位
+				itemCode: '' //物料代码
 			}
 		},
 		watch: {
@@ -124,19 +150,36 @@
 				deep: true
 			}
 		},
-		mounted() {
-		},
+		mounted() {},
 		methods: {
+			getQueryCondition() {
+				let params = {
+					productionLineCode: this.productionLineCode,
+					fromLocationCode: this.fromLocationCode,
+					itemCode: this.itemCode
+				}
+				return params;
+			},
+
+			query() {
+				let params = this.getQueryCondition();
+				this.$emit("onQuery", params)
+				this.closeScanPopup();
+			},
+
 			// 生产线
-			productionLineCodeConfirm(e){
-				var lineCode=e
-				this.$emit("productionLineCode", lineCode)
-				
+			productionLineCodeConfirm(e) {
+				var lineCode = e
+				this.productionLineCode = e;
+				// this.$emit("productionLineCode", lineCode)
 			},
+
 			// 来源库位
-			fromLocationCodeConfirm(){
-				this.$emit("fromLocationCode", this.fromLocationCode)
+			fromLocationCodeConfirm() {
+				// this.$emit("fromLocationCode", this.fromLocationCode)
 			},
+
+			itemCodeConfirm() {},
 			// 点击遮罩
 			maskClick() {
 				// 如果不允许点击遮罩，直接返回
@@ -149,19 +192,18 @@
 				this.$refs.popup.close()
 			},
 			switchChangeToday(isOn) {
-				
 				let creationTime = '';
 				if (isOn) {
 					creationTime = getTodayDate();
 				}
-				
+
 				this.$emit("switchChangeToday", isOn, creationTime)
 				this.closeScanPopup()
 			},
 			switchChangeWait(isOn) {
 				let status = "1,2";
-				if(isOn){
-					status="1"
+				if (isOn) {
+					status = "1"
 				}
 				this.$emit("switchChangeWait", isOn, status)
 				this.closeScanPopup()
@@ -199,4 +241,4 @@
 		height: 100vh;
 		z-index: 0;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue
index 903e01d9..eaa2c31d 100644
--- a/src/pages/issue/job/issueJob.vue
+++ b/src/pages/issue/job/issueJob.vue
@@ -4,7 +4,13 @@
 		<job-filter :isShowFromLocationCode="true" :isShowProductionLineCode="true" :productionline="productionlineList"
 			ref="filter" otherTitle="" @switchChangeToday="switchChangeToday" @switchChangeWait="switchChangeWait"
 			@onScanNumber="getScanNumber" :checkedToday="checkedToday" :checkedWaitTask="checkedWaitTask"
-			@productionLineCode="productionLineCode" @fromLocationCode="fromLocationCode">
+			:isShowItemCode="true" @productionLineCode="productionLineCode" @fromLocationCode="fromLocationCode"
+			@onQuery="getListByFilter">
+			<!-- <job-filter :isShowFromLocationCode="true" :isShowProductionLineCode="true"
+				:productionline="productionlineList" 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">
@@ -228,9 +234,7 @@
 				var params = {
 					filters: filters,
 					pageNo: this.pageNo,
-					pageSize: this.pageSize,
-					sort: 'fromLocationCode',
-					by: 'asc'
+					pageSize: 100,
 				}
 				getIssueJobList(params).then(res => {
 					uni.hideLoading();
@@ -261,6 +265,79 @@
 					that.showMessage(error)
 				})
 			},
+
+			getListByFilter(params) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+				var filters = []
+				if (this.checkedToday) {
+					filters.push({
+						column: "create_time",
+						action: "betweeen",
+						value: this.todayTime
+					})
+				}
+
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+
+				filters.push({
+					column: "accept_user_id",
+					action: "==",
+					value: this.$store.state.user.id
+				})
+
+				if (params.fromLocationCode) {
+					// 来源库位
+					filters.push({
+						column: "fromLocationCode",
+						action: "==",
+						value: params.fromLocationCode
+					})
+				}
+				if (params.productionLine) {
+					// 生产线
+					filters.push({
+						column: "productionLineCode",
+						action: "==",
+						value: params.productionLine
+					})
+				}
+				if (params.itemCode) {
+					// 生产线
+					filters.push({
+						column: "itemCode",
+						action: "like",
+						value: params.itemCode
+					})
+				}
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getIssueJobList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.total == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.total == 1) {
+						that.openJobDetail(res.data.list[0]);
+					} else {
+						that.showItemList(res.data.list);
+					}
+				}).catch(error => {
+
+					that.showMessage(error)
+				})
+			},
+
+
 			fromLocationCode(fromLocation) {
 				this.fromLocation = fromLocation;
 				this.getList('refresh', this.fromLocation, this.productionLine)
@@ -303,7 +380,7 @@
 			},
 
 			showItemList(itemList) {
-				this.$refs.scanList.openPopup(itemList);
+				this.$refs.jobListPopup.openPopup(itemList);
 			},
 
 			selectedItem(item) {
@@ -510,7 +587,8 @@
 								}
 							} else {
 								this.showMessage("按来源库位[" + balance.locationCode + "]批次[" + result.label.batch +
-									"]物料号[" + result.label.itemCode + "]未查找到任务<br>" + "扫描[" + result.scanMessage + "]")
+									"]物料号[" + result.label.itemCode + "]未查找到任务<br>" + "扫描[" + result
+									.scanMessage + "]")
 							}
 						}).catch(error => {
 							this.showMessage(error + "<br>扫描[" + result.scanMessage + "]")
diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue
index c0bfa5b5..7cda3b72 100644
--- a/src/pages/repleinsh/job/repleinshJob.vue
+++ b/src/pages/repleinsh/job/repleinshJob.vue
@@ -2,7 +2,7 @@
 	<view class="">
 		<com-empty-view v-if="jobList.length==0"></com-empty-view>
 		<job-filter :isShowFromLocationCode="true" ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
-			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
+			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday" :isShowItemCode="true"
 			:checkedWaitTask="checkedWaitTask" @fromLocationCode="fromLocationCode">
 		</job-filter>
 		<view v-if="jobList.length>0">