From 334893be52c9be7aa80cb828ec29491fd011d987 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 24 Mar 2025 11:25:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=BF=E6=AC=A1=E8=A1=A5=E6=96=99=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/request2.js                          |  10 +
 src/mycomponents/job/jobFilterTime.vue       | 442 +++++++++++++++++++
 src/pages/repleinsh/job/repleinshTimeJob.vue |  77 +++-
 3 files changed, 520 insertions(+), 9 deletions(-)
 create mode 100644 src/mycomponents/job/jobFilterTime.vue

diff --git a/src/api/request2.js b/src/api/request2.js
index 30e4ebf9..ea4b6cef 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -1503,6 +1503,16 @@ export function getIssueJobByProductionline() {
 		data: {},
 	});
 }
+/**
+ * 便次补料生产线查询
+ */
+export function getRepleinshTimByProductionline() {
+	return request({
+		url: baseApi + "/wms/repleinsh-request-detail/getRepleinshRequestByProductionline",
+		method: "get",
+		data: {},
+	});
+}
 
 /**
  * 发料接收生产线查询
diff --git a/src/mycomponents/job/jobFilterTime.vue b/src/mycomponents/job/jobFilterTime.vue
new file mode 100644
index 00000000..9caef9d8
--- /dev/null
+++ b/src/mycomponents/job/jobFilterTime.vue
@@ -0,0 +1,442 @@
+<template>
+	<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>
+			<view class="uni-flex space-between u-col-center" style="width: 100%;margin-top: 30rpx;" v-if="isShowBad">
+				<view class="" style="font-size: 32rpx;">
+					只看欠品
+				</view>
+			
+				<u-switch v-model="isOwing" active-color="#4DD865" inactive-color="#eee" size="35"
+					@change="switchChangeBad"></u-switch>
+			</view>
+			<view class="uni-flex space-between u-col-center" style="width: 100%;margin-top: 30rpx;"  v-if="isShowStatus">
+
+				<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;">
+				<view class="" style="font-size: 32rpx;width:100rpx">
+					生产线
+				</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>
+			</view>
+			<!-- <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="isWorkStationCode" 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: 86rpx;" confirmType="search" v-model="workStationCode" :border="true"
+					placeholder="请输入工位" @confirm="workStationCodeConfirm" />
+			</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;">
+					{{fromLoactionCodeName}}
+				</view>
+				<u-input style="margin-left: 20rpx;" confirmType="search" v-model="fromLocationCode" :border="true"
+					:placeholder="`请输入${fromLoactionCodeName}`"
+					@confirm="fromLocationCodeConfirm" />
+			</view>
+			<view v-if="isShowToLocationCode" 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="toLocationCode" :border="true"
+					placeholder="请输入目标库位"  />
+			</view> -->
+			
+			<view class="uni-flex space-between u-col-center"
+				style="width: 100%;margin-top: 30rpx;">
+				<view class="" style="font-size: 32rpx;width:100rpx">
+					 日期
+				</view>
+				<view class="uni-list-cell-db " style="margin-left: 50rpx;border-radius: 4px;border: 1px solid #dcdfe6;padding-left: 0.625rem;">
+					<picker mode="date" :value="day" @change="dateChange">
+						<view style="min-height: 2.1875rem;line-height: 2.1875rem;" :style="{color:day?'inherit':'#c0c4cc'}">{{day?day:'请输入日期'}}</view>
+					</picker>
+				</view>
+			</view>
+			<view class="uni-flex space-between u-col-center"
+				style="width: 100%;margin-top: 30rpx;">
+				<view class="" style="font-size: 32rpx;width:100rpx">
+					便次
+				</view>
+				<u-input style="margin-left: 50rpx" confirmType="search" v-model="deliNo" :border="true"
+					placeholder="请输入便次" />
+			</view>
+			
+			<view class="uni-flex space-between u-col-center"
+				style="width: 100%;margin-top: 30rpx;">
+				<view class="" style="font-size: 32rpx;width:100rpx">
+					 时间
+				</view>
+				<view class="uni-list-cell-db " style="margin-left: 50rpx;border-radius: 4px;border: 1px solid #dcdfe6;padding-left: 0.625rem;">
+					<picker mode="time" :value="time" @change="timeChange">
+						<view style="min-height: 2.1875rem;line-height: 2.1875rem;" :style="{color:time?'inherit':'#c0c4cc'}">{{time?time:'请输入时间'}}</view>
+					</picker>
+				</view>
+			</view>
+			
+			
+			<view v-if="isShowFromAreaCode" 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="fromAreaCode" :border="true"
+					placeholder="请输入来源库区" />
+			</view>
+			<view v-if="isShowToAreaCode" 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: 50rpx;" confirmType="search" v-model="toAreaCode" :border="true"
+					placeholder="请输入到库区" />
+			</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"
+						@click="scanOtherClick">扫描ASN单号</button>
+				</view>
+				<view class="uni-flex u-row-center" style="margin-top: 30rpx;" v-if="isShowJob">
+					<button class="filter_button" hover-class="filter_button_after"
+						@click="scanNumberClick">扫描任务编号</button>
+				</view>
+			</view> -->
+			<view class=" uni-flex uni-row" style="margin-top: 5px;" v-if="isShowQurery">
+				<button class="btn_single_clear" hover-class="btn_commit_after" @click="reset()">重置</button>
+				<button class="btn_single_commit" hover-class="btn_commit_after" style="margin-left: 20rpx;"
+					@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>
+</template>
+
+<script>
+	import {
+		getTodayDate
+	} from '@/common/basic.js';
+
+	import winScanJobNumber from "@/mycomponents/scan/winScanJobNumber.vue"
+	import winScanAsnNumber from "@/mycomponents/scan/winScanAsnNumber.vue"
+
+	export default {
+		emits: ["switchChangeToday", "switchChangeWait", "onScanNumber", "onScanAsnNumber", "productionLineCode",
+			"fromLocationCode", "fromLocationCodeConfirm", "itemCodeConfirm", "onQuery"
+		],
+		components: {
+			winScanJobNumber,
+			winScanAsnNumber
+		},
+
+		props: {
+			checkedToday: {
+				type: Boolean,
+				default: false
+			},
+			checkedWaitTask: {
+				type: Boolean,
+				default: false
+			},
+			otherTitle: {
+				type: String,
+				default: ""
+			},
+			isShowAsn: {
+				type: Boolean,
+				default: false
+			},
+			isShowJob: {
+				type: Boolean,
+				default: true
+			},
+			fromLoactionCodeName:{
+				type: String,
+				default: "来源库位"
+			},
+			isShowFromLocationCode: {
+				type: Boolean,
+				default: false
+			},
+			isShowToLocationCode: {
+				type: Boolean,
+				default: false
+			},
+			isShowProductionLineCode: {
+				type: Boolean,
+				default: false
+			},
+			productionline: {
+				type: Array,
+				default: []
+			},
+			isShowItemCode: {
+				type: Boolean,
+				default: false
+			},
+			isShowQurery: {
+				type: Boolean,
+				default: false
+			},
+			//来源库区
+			isShowFromAreaCode: {
+				type: Boolean,
+				default: false
+			},
+			//到库区
+			isShowToAreaCode: {
+				type: Boolean,
+				default: false
+			},
+			// 只看欠品
+			isShowBad: {
+				type: Boolean,
+				default: false
+			},
+			isShowStatus: {
+				type: Boolean,
+				default: true
+			},
+			isWorkStationCode: {
+				type: Boolean,
+				default: false
+			},
+		},
+		data() {
+			return {
+				dataContent: {},
+				checkedTodayModel: false,
+				isOwing:false,
+				checkedWaitModel: false,
+				productionLineCode: '', // 生产线
+				fromLocationCode: '', // 来源库位
+				toLocationCode:"",//目标库位
+				fromAreaCode: '', // 来源库区
+				deliNo: '', // 便次
+				day: '', // 日期
+				time: '', // 时间
+				toAreaCode: '', // 到库区
+				itemCode: '', //物料代码
+				workStationCode:'',//工位
+				creationTime: '',
+				status: '1,2',
+				isOnToday: false,
+				isOnWait: false,
+				params: {}
+			}
+		},
+		watch: {
+			checkedToday: {
+				handler(newName, oldName) {
+					this.checkedTodayModel = this.checkedToday
+				},
+				immediate: true,
+				deep: true
+			},
+			checkedWaitTask: {
+				handler(newName, oldName) {
+					this.checkedWaitModel = this.checkedWaitTask
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+		mounted() {},
+		methods: {
+			dateChange(e) {
+				this.day = e.detail.value
+			},
+			timeChange(e) {
+				this.time = e.detail.value
+			},
+			dateClick(){
+				alert(1)
+				this.$refs.datePickerRef.show()
+			},
+			maskClick(e){
+				console.log('maskClick事件:', e);
+			},
+			getQueryCondition() {
+				let params = {
+					productionLineCode: this.productionLineCode,
+					fromLocationCode: this.fromLocationCode,
+					toLocationCode:this.toLocationCode,
+					fromAreaCode: this.fromAreaCode, // 来源库区
+					deliNo:this.deliNo,// 便次
+					day:this.day,// 日期
+					time:this.time,// 时间
+					toAreaCode: this.toAreaCode, // 到库区
+					itemCode: this.itemCode,
+					creationTime: this.creationTime,
+					status: this.status,
+					workStationCode: this.workStationCode,
+				}
+				if(this.isShowBad){
+					params.isOwing = this.isOwing
+				}
+				return params;
+			},
+			reset() {
+				this.isOwing = false
+				this.checkedTodayModel = false
+				this.checkedWaitModel = false
+				this.productionLineCode = ''
+				this.fromLocationCode = ''
+				this.toLocationCode=""
+				this.fromAreaCode = '' // 来源库区
+				this.deliNo = '' // 便次
+				this.day = '' // 日期
+				this.time = '' // 时间
+				this.toAreaCode = '' // 到库区
+				this.itemCode = ''
+				this.creationTime = ''
+				this.status = '1,2'
+				this.workStationCode = ''
+				this.query()
+			},
+
+			query() {
+				let params = this.getQueryCondition();
+				this.$emit("onQuery", params)
+				this.closeScanPopup();
+			},
+
+			// 生产线
+			productionLineCodeConfirm(e) {
+				var lineCode = e
+				this.productionLineCode = e;
+				// this.$emit("productionLineCode", lineCode)
+			},
+
+			// 来源库位
+			fromLocationCodeConfirm() {
+				// this.$emit("fromLocationCode", this.fromLocationCode)
+			},
+
+			itemCodeConfirm() {
+
+			},
+			// 点击遮罩
+			maskClick() {
+				// 如果不允许点击遮罩，直接返回
+				this.closeScanPopup();
+			},
+			openFilter() {
+				this.$refs['popup'].open("top");
+			},
+			openFilterParams(params) {
+				this.$refs['popup'].open("top");
+				if(params){
+					this.productionLineCode = params.productionLineCode
+					this.fromLocationCode = params.fromLocationCode
+					this.fromAreaCode = params.fromAreaCode
+					this.deliNo = params.deliNo
+					this.day = params.day
+					this.time = params.time
+					this.toAreaCode = params.toAreaCode
+					this.itemCode = params.itemCode
+					this.creationTime = params.creationTime
+					this.status = params.status
+					this.checkedTodayModel=this.creationTime?true:false
+					this.checkedWaitModel=this.status=="1"?true:false
+				}
+				
+			},
+			closeScanPopup() {
+				this.$refs.popup.close()
+			},
+			switchChangeBad(isOn) {
+				this.isOwing = isOn
+			},
+			switchChangeToday(isOn) {
+				let creationTime = '';
+				if (isOn) {
+					creationTime = getTodayDate();
+				}
+				this.creationTime = creationTime;
+				this.$emit("switchChangeToday", isOn, creationTime)
+				if (!this.isShowQurery) {
+					this.closeScanPopup()
+				}
+			},
+			switchChangeWait(isOn) {
+				let status = "1,2";
+				if (isOn) {
+					status = "1"
+				}
+				this.status = status;
+				this.$emit("switchChangeWait", isOn, status)
+				if (!this.isShowQurery) {
+					this.closeScanPopup()
+				}
+			},
+
+			scanNumberClick() {
+				this.$refs.scanNumber.openScanPopup();
+				this.closeScanPopup();
+			},
+
+			scanOtherClick() {
+				this.$refs.scanAsnNumber.openScanPopup();
+				this.closeScanPopup();
+			},
+
+			getScanAsNumber(val) {
+				this.$emit("onScanAsnNumber", val)
+				this.$refs.scanAsnNumber.closeScanPopup();
+				this.closeScanPopup();
+			},
+			getScanNumber(val) {
+				this.$emit("onScanNumber", val)
+				this.$refs.scanNumber.closeScanPopup();
+				this.closeScanPopup();
+			},
+		}
+	}
+</script>
+<style lang="scss">
+	.maskbox {
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100vw;
+		height: 100vh;
+		z-index: 0;
+	}
+	.example-body {
+		background-color: #fff;
+		padding: 10px;
+	}
+</style>
\ No newline at end of file
diff --git a/src/pages/repleinsh/job/repleinshTimeJob.vue b/src/pages/repleinsh/job/repleinshTimeJob.vue
index 10a27a8a..7c5fa948 100644
--- a/src/pages/repleinsh/job/repleinshTimeJob.vue
+++ b/src/pages/repleinsh/job/repleinshTimeJob.vue
@@ -1,12 +1,11 @@
 <template>
 	<view class="">
 		<com-empty-view v-if="jobList.length==0"></com-empty-view>
-		
-		<job-filter :isShowFromLocationCode="false" :isShowFromAreaCode="false" :isShowToAreaCode="false" :isShowStatus="false"
-			:isShowProductionLineCode="false" 
+		<job-filter-time :isShowFromLocationCode="false" :isShowFromAreaCode="false" :isShowToAreaCode="false" :isShowStatus="false"
+			:isShowProductionLineCode="true"  :productionline="productionlineList"
 			ref="filter" otherTitle="" :isShowItemCode="false"
-			@onQuery="getListByFilter" :isShowQurery='true'>
-		</job-filter>
+			@onQuery="getListByFilter" :isShowQurery="true" :isShowBad="true">
+		</job-filter-time>
 		
 	<!-- 	<job-filter :isShowFromLocationCode="true" 
 			ref="filter" otherTitle="" :isShowItemCode="true"
@@ -43,6 +42,7 @@
 		getRepleinshTimeJobList,
 		cancleTakeRepleinshJob,
 		closeTakeRepleinshJob,
+		getRepleinshTimByProductionline,
 	} from '@/api/request2.js';
 
 	import {
@@ -70,7 +70,7 @@
 		} from '@/common/balance.js';
 
 	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
-	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+	import jobFilterTime from '@/mycomponents/job/jobFilterTime.vue'
 	import comRepleinshJobCard from '@/pages/repleinsh/coms/comRepleinshJobCard.vue'
 	import comRepleinshTimeJobCard from '@/pages/repleinsh/coms/comRepleinshTimeJobCard.vue'
 	import repleinshInfoPopup from '@/pages/repleinsh/coms/repleinshInfoPopup.vue'
@@ -82,7 +82,7 @@
 		name: 'repleinsh',
 		components: {
 			comEmptyView,
-			jobFilter,
+			jobFilterTime,
 			comRepleinshJobCard,
 			comRepleinshTimeJobCard,
 			repleinshInfoPopup,
@@ -120,6 +120,7 @@
 		},
 		onLoad(option) {
 			this.title = option.title
+			this.getRepleinshTimByProductionline()
 			// this.getBusinessTypeFunc()
 		},
 
@@ -199,10 +200,26 @@
 					}
 				});
 			},
+			getRepleinshTimByProductionline() {
+				getRepleinshTimByProductionline().then(res => {
+					if (res.code == 0) {
+						this.productionlineList = res.data.map(item => ({
+							value: item.value,
+							text: item.label
+						}))
+						this.productionlineList.unshift({
+							value: "",
+							text: "全部"
+						})
+					} else {
+						this.productionlineList = []
+					}
+				})
+			},
 			setQueryParam(){
 				var filterParams = []
 				var queryParams=uni.getStorageSync(repleinshJobFilter)
-				
+				console.log('queryParams',queryParams)
 				//只看当天
 				if (queryParams.creationTime ) {
 					filterParams.push({
@@ -211,6 +228,15 @@
 						value: queryParams.creationTime
 					})
 				}
+				// 只看欠品
+				if(queryParams.isOwing){
+					filterParams.push({
+						column: "isOwing",
+						action: "==",
+						value: 'TRUE'
+					})
+				}
+				
 				//只看待处理
 				// if (queryParams.status) {
 				// 	filterParams.push({
@@ -230,7 +256,39 @@
 					action: "!=",
 					value: "8"
 				})
-					// 来源库位
+				if(queryParams.productionLineCode){
+					filterParams.push({
+						column: "productionLineCode",
+						action: "==",
+						value: queryParams.productionLineCode
+					})
+				}
+				// 日期
+				if(queryParams.day){
+					filterParams.push({
+						column: "day",
+						action: "==",
+						value: queryParams.day
+					})
+				}
+				// 时间
+				if(queryParams.time){
+					filterParams.push({
+						column: "time",
+						action: "==",
+						value: queryParams.time
+					})
+				}
+				// 便次
+				if(queryParams.deliNo){
+					filterParams.push({
+						column: "deliNo",
+						action: "==",
+						value: queryParams.deliNo
+					})
+				}
+				
+				// 来源库位
 				if (queryParams.fromLocationCode) {
 					filterParams.push({
 						column: "fromLocationCode",
@@ -316,6 +374,7 @@
 			},
 
 			getListByFilter(params) {
+				console.log('查询参数',params)
 				uni.setStorageSync(repleinshJobFilter,params)
 				this.getList('refresh')
 			},