From 850378c9e89dce552b28b0466bf0b91663d6b9b3 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Tue, 29 Oct 2024 13:27:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E7=94=9F=E4=BA=A7=E9=A2=86=E9=80=80?=
 =?UTF-8?q?=E6=96=99=E6=B7=BB=E5=8A=A0=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PDA/api/index.js                           |  7 +++
 fe/PDA/common/basic.js                        | 16 ++++++-
 .../comjob/comJobUnScanDetail.vue             |  4 ++
 .../mycomponents/coms/task/comUnProduce.vue   |  6 +++
 fe/PDA/mycomponents/popup/balanceList.vue     | 11 +++--
 fe/PDA/mycomponents/popup/recommendList.vue   |  9 ++--
 fe/PDA/pages/index/index.vue                  |  4 ++
 fe/PDA/pages/task/unProducePick.vue           | 48 +++++++++++++++----
 fe/PDA/pages/task/unProducePickWip.vue        | 30 +++++++++---
 fe/PDA/pages/task/unProduceReturn.vue         | 29 +++++++++--
 fe/PDA/pages/task/unProduceReturnWip.vue      | 31 +++++++++---
 11 files changed, 156 insertions(+), 39 deletions(-)

diff --git a/fe/PDA/api/index.js b/fe/PDA/api/index.js
index ff9619633..fa84f94ee 100644
--- a/fe/PDA/api/index.js
+++ b/fe/PDA/api/index.js
@@ -1116,6 +1116,13 @@ export const rawDeliver = (params) => request(
 		data: params,
 		method: "post"
 	});
+	
+//原料直发 校验物品价格
+export const rawDeliverCheckPrice = (params) => request(
+	devUrl + "/api/pda/SalePriceSheet/get-list-by-itemcode-and-customercoder", { //
+		data: params,
+		method: "post"
+	});
 
 
 //调拨发货
diff --git a/fe/PDA/common/basic.js b/fe/PDA/common/basic.js
index d060e5a82..00297af75 100644
--- a/fe/PDA/common/basic.js
+++ b/fe/PDA/common/basic.js
@@ -218,8 +218,8 @@ export function getJobType(val) {
 	else if (val == 23) return 'SparePartIssueJob' //备品发料
 	else if (val == 96) return 'unProducePick' //非生产领料 原料
 	else if (val == 97) return 'unProducePickWip' //非生产领料 线边
-	else if (val == 98) return 'unProduceReturn' //非生产退料 原料
-	else if (val == 99) return 'unProduceReturnWip' //非生产退料 线边
+	else if (val == 98) return 'unProduceReturnWip' //非生产退料 线边
+	else if (val == 99) return 'unProduceReturn' //非生产退料 原料
 	else return 'Other'
 }
 
@@ -496,4 +496,16 @@ const S4 = function() {
 export function guid() {
   return (S4() + S4() +'-' +S4() +'-' +S4() +'-' +S4() +'-' +S4() +S4() +S4()
   );
+}
+
+export function debounceSetting(fn, wait) {
+    let timeout = null;
+    wait = wait || 600;
+    return function () {
+      let that = this;
+      if(timeout !== null)   clearTimeout(timeout);  
+      timeout = setTimeout(() => {
+        fn.apply(that);
+      }, wait);
+    }    
 }
\ No newline at end of file
diff --git a/fe/PDA/mycomponents/comjob/comJobUnScanDetail.vue b/fe/PDA/mycomponents/comjob/comJobUnScanDetail.vue
index 36e4f587e..49e96e4ac 100644
--- a/fe/PDA/mycomponents/comjob/comJobUnScanDetail.vue
+++ b/fe/PDA/mycomponents/comjob/comJobUnScanDetail.vue
@@ -8,6 +8,10 @@
 			</text>
 			<text class="tit_ljh">{{ jobContent.number }}</text>
 		</view> -->
+		<view class="label_order">
+			<text >OA单号：</text>
+			<text style="font-weight: bold; color:black" >{{jobContent.oaNumber}}</text>
+		</view>
 		<view class="label_order">
 			<text >ERP储位：</text>
 			<text style="font-weight: bold; color:black" >{{jobContent.fromErpLocationCode}}</text>
diff --git a/fe/PDA/mycomponents/coms/task/comUnProduce.vue b/fe/PDA/mycomponents/coms/task/comUnProduce.vue
index 27ea27829..d2de74816 100644
--- a/fe/PDA/mycomponents/coms/task/comUnProduce.vue
+++ b/fe/PDA/mycomponents/coms/task/comUnProduce.vue
@@ -8,6 +8,11 @@
 			</image>
 		</view>
 		<view class="margin_xs_bottom" style="clear: both;">
+			<view class="label_order">
+				<!-- <image class="icon_normal" src="@/static/icons_ui/icon_apply_num.svg"></image> -->
+				<text>OA单号：</text>
+				<text  style="font-weight: bold; color:black" >{{dataContent.oaNumber}}</text>
+			</view>
 			<view class="label_order">
 				<!-- <image class="icon_normal" src="@/static/icons_ui/icon_apply_num.svg"></image> -->
 				<text>单号：</text>
@@ -15,6 +20,7 @@
 				<!-- <text>申请单：{{dataContent.materialRequestNumber}}</text> -->
 				<text  style="font-weight: bold; color:black"  v-else>{{dataContent.unplannedReceiptRequestNumber}}</text>
 			</view>
+			
 			<view class="" >
 				<view class="label_order">
 					<text >ERP储位：</text>
diff --git a/fe/PDA/mycomponents/popup/balanceList.vue b/fe/PDA/mycomponents/popup/balanceList.vue
index 323ee0eb1..359344b8e 100644
--- a/fe/PDA/mycomponents/popup/balanceList.vue
+++ b/fe/PDA/mycomponents/popup/balanceList.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="container">
-		<uni-popup ref="popup"  :maskClick="true">
+		<u-popup ref="popup" v-model="showPopup" border-radius="15" style="width: 100%;"   mode="center">
 			<view class="" style="align-items: center;background-color: #fff;  border-radius: 15rpx; margin: 20rpx;">
 				<view class="uni-center popup-content"
 					style="font-weight: bold; font-size: 40rpx;padding-top: 20rpx; padding-bottom: 20rpx;">
@@ -9,7 +9,7 @@
 				<view class="" style="background-color: black; height: 1rpx; ">
 
 				</view>
-				<scroll-view scroll-y=""
+				<scroll-view scroll-y
 					style="background-color: #fff; align-items: center; border-radius: 10rpx; height: 600rpx; width: 100%">
 						<view class="uni-flex " style="flex-direction: column; " v-for="(item,index) in dataList" :key="index">
 							<view class="uni-flex " style="font-size: 38rpx; padding: 25rpx; flex-direction: row;" >
@@ -64,7 +64,7 @@
 
 			</view>
 
-		</uni-popup>
+		</u-popup>
 
 	</view>
 </template>
@@ -80,6 +80,7 @@
 		data() {
 			return {
 				dataList: [],
+				showPopup:false
 
 			}
 		},
@@ -88,10 +89,10 @@
 		methods: {
 			openScanPopup(list) {
 				this.dataList = list;
-				this.$refs.popup.open('center')
+				this.showPopup=true
 			},
 			closeScanPopup() {
-				this.$refs.popup.close()
+				this.showPopup=false
 			},
 			select(item) {
 				this.closeScanPopup();
diff --git a/fe/PDA/mycomponents/popup/recommendList.vue b/fe/PDA/mycomponents/popup/recommendList.vue
index 469fd0dda..7c0e19dd9 100644
--- a/fe/PDA/mycomponents/popup/recommendList.vue
+++ b/fe/PDA/mycomponents/popup/recommendList.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="container">
-		<uni-popup ref="popup"  :maskClick="true">
+		<u-popup ref="popup"  v-model="showPopup" border-radius="15" style="width: 100%;"   mode="center">
 			<view class="" style="align-items: center;background-color: #fff;  border-radius: 15rpx; margin: 20rpx;">
 				<view class="uni-center popup-content"
 					style="font-weight: bold; font-size: 40rpx;padding-top: 20rpx; padding-bottom: 20rpx;">
@@ -64,7 +64,7 @@
 
 			</view>
 
-		</uni-popup>
+		</u-popup>
 
 	</view>
 </template>
@@ -80,6 +80,7 @@
 		data() {
 			return {
 				dataList: [],
+				showPopup:false
 
 			}
 		},
@@ -88,10 +89,10 @@
 		methods: {
 			openScanPopup(list) {
 				this.dataList = list;
-				this.$refs.popup.open('center')
+				this.showPopup=true
 			},
 			closeScanPopup() {
-				this.$refs.popup.close()
+				this.showPopup=false
 			},
 			select(item) {
 				this.closeScanPopup();
diff --git a/fe/PDA/pages/index/index.vue b/fe/PDA/pages/index/index.vue
index 8c65ac82f..b0665de86 100644
--- a/fe/PDA/pages/index/index.vue
+++ b/fe/PDA/pages/index/index.vue
@@ -161,6 +161,10 @@
 			}
 		},
 		onShow() {
+			localStorage.setItem("pick_oaNumber","")
+			localStorage.setItem("pickWip_oaNumber","")
+			localStorage.setItem("return_oaNumber","")
+			localStorage.setItem("returnWip_oaNumber","")
 			let that = this;
 			if (that.timer != null)
 				return;
diff --git a/fe/PDA/pages/task/unProducePick.vue b/fe/PDA/pages/task/unProducePick.vue
index 22c758f5d..efc64f216 100644
--- a/fe/PDA/pages/task/unProducePick.vue
+++ b/fe/PDA/pages/task/unProducePick.vue
@@ -1,7 +1,11 @@
 <template>
 	<page-meta root-font-size="18px"></page-meta>
 	<view class="">
-
+		<view class="" style=" padding: 20rpx; font-weight: bold;">
+			<uni-easyinput v-model="oaNumber" :styles="styles" :placeholderStyle="placeholderStyle" placeholder="请输入OA单号"
+				@input="changeValue"></uni-easyinput>
+		</view>
+		
 		<win-empty-view v-if="dataList.length==0"></win-empty-view>
 		<view hover-class="uni-list-cell-hover" v-for="(item, index) in dataList" :key="item.id"
 			@click="openDetail(item)">
@@ -23,8 +27,10 @@
 	} from '@/api/index.js';
 
 	import {
-		goHome
+		goHome,
+		debounceSetting
 	} from '@/common/basic.js';
+	
 
 	import winEmptyView from '@/mycomponents/wincom/winEmptyView.vue'
 	import comUnProduce from '@/mycomponents/coms/task/comUnProduce.vue';
@@ -60,21 +66,29 @@
 				isIssueTimeChange: false,
 				isToday: false,
 				titleArray: ['任务编号'],
-				loadingType: "nomore"
+				loadingType: "nomore",
+				styles: {
+					color: '#2979FF',
+					borderColor: '#2979FF',
+					padding:"20"
+				},
+				placeholderStyle: "color:#2979FF;font-size:14px;font-weight: bold;",
+				oaNumber:""
 			};
 		},
 		onShow() {
+			this.oaNumber =localStorage.getItem("pick_oaNumber")
 			this.getList('refresh');
 		},
-		
+
 		mounted() {
-			
+
 		},
 		//返回首页
 		onNavigationBarButtonTap(e) {
 			if (e.index === 0) {
 				goHome();
-			}else if(e.index === 1){
+			} else if (e.index === 1) {
 				window.location.reload();
 			}
 		},
@@ -111,7 +125,8 @@
 					pageIndex: that.pageIndex,
 					isCreationTimeSorting: that.isIssueTimeChange,
 					isToday: that.isToday,
-					ishaspag:1
+					ishaspag: 1,
+					OaNumber: localStorage.getItem("pick_oaNumber")? localStorage.getItem("pick_oaNumber"):""
 				};
 				getUnProducePickList(params)
 					.then(res => {
@@ -133,6 +148,7 @@
 					.catch(err => {
 						this.showMessage(err.message);
 						uni.hideLoading();
+						uni.stopPullDownRefresh();
 					});
 			},
 
@@ -155,7 +171,7 @@
 			showMessage(message) {
 				this.$refs.comMessage.showMessage(message);
 			},
-			onPull() {
+			onPullDownRefresh() {
 				this.getList('refresh');
 			},
 			onReachBottom() {
@@ -170,9 +186,21 @@
 			},
 			selectedItem(item) {
 				this.openDetail(item);
-			}
+			},
+			changeValue: debounceSetting(function() {
+				localStorage.setItem("pick_oaNumber",this.oaNumber)
+				this.getList('refresh');
+			}, 500),
+			
+			// changeValue(e){
+			// 	console.log(e)
+			// 	debounceSetting(this.test(e), 500)
+			// } ,
+			// test:function(e){
+			// 	console.log("1"+e)
+			// }
 		}
 	};
 </script>
 <style scoped lang="scss">
-</style>
+</style>
\ No newline at end of file
diff --git a/fe/PDA/pages/task/unProducePickWip.vue b/fe/PDA/pages/task/unProducePickWip.vue
index c95f802f2..5e09605ea 100644
--- a/fe/PDA/pages/task/unProducePickWip.vue
+++ b/fe/PDA/pages/task/unProducePickWip.vue
@@ -1,7 +1,10 @@
 <template>
 	<page-meta root-font-size="18px"></page-meta>
 	<view class="">
-
+		<view class="" style=" padding: 20rpx; font-weight: bold;">
+			<uni-easyinput v-model="oaNumber" :styles="styles" :placeholderStyle="placeholderStyle" placeholder="请输入OA单号"
+				@input="changeValue"></uni-easyinput>
+		</view>
 		<win-empty-view v-if="dataList.length==0"></win-empty-view>
 		<view hover-class="uni-list-cell-hover" v-for="(item, index) in dataList" :key="item.id"
 			@click="openDetail(item)">
@@ -23,7 +26,8 @@
 	} from '@/api/index.js';
 
 	import {
-		goHome
+		goHome,
+		debounceSetting
 	} from '@/common/basic.js';
 
 	import winEmptyView from '@/mycomponents/wincom/winEmptyView.vue'
@@ -60,10 +64,18 @@
 				isIssueTimeChange: false,
 				isToday: false,
 				titleArray: ['任务编号'],
-				loadingType: "nomore"
+				loadingType: "nomore",
+				styles: {
+					color: '#2979FF',
+					borderColor: '#2979FF',
+					padding:"20"
+				},
+				placeholderStyle: "color:#2979FF;font-size:14px;font-weight: bold;",
+				oaNumber:""
 			};
 		},
 		onShow() {
+			this.oaNumber =localStorage.getItem("pickWip_oaNumber")
 			this.getList('refresh');
 		},
 		
@@ -111,7 +123,8 @@
 					pageIndex: that.pageIndex,
 					isCreationTimeSorting: that.isIssueTimeChange,
 					isToday: that.isToday,
-					ishaspag:0
+					ishaspag:0,
+					OaNumber: localStorage.getItem("pickWip_oaNumber")? localStorage.getItem("pickWip_oaNumber"):""
 				};
 				getUnProducePickList(params)
 					.then(res => {
@@ -133,6 +146,7 @@
 					.catch(err => {
 						this.showMessage(err.message);
 						uni.hideLoading();
+						uni.stopPullDownRefresh();
 					});
 			},
 
@@ -155,7 +169,7 @@
 			showMessage(message) {
 				this.$refs.comMessage.showMessage(message);
 			},
-			onPull() {
+			onPullDownRefresh() {
 				this.getList('refresh');
 			},
 			onReachBottom() {
@@ -170,7 +184,11 @@
 			},
 			selectedItem(item) {
 				this.openDetail(item);
-			}
+			},
+			changeValue: debounceSetting(function() {
+				localStorage.setItem("pickWip_oaNumber",this.oaNumber)
+				this.getList('refresh');
+			}, 500),
 		}
 	};
 </script>
diff --git a/fe/PDA/pages/task/unProduceReturn.vue b/fe/PDA/pages/task/unProduceReturn.vue
index 2c5cbcd2b..37badf9e6 100644
--- a/fe/PDA/pages/task/unProduceReturn.vue
+++ b/fe/PDA/pages/task/unProduceReturn.vue
@@ -1,7 +1,10 @@
 <template>
 	<page-meta root-font-size="18px"></page-meta>
 	<view class="">
-
+		<view class="" style=" padding: 20rpx; font-weight: bold;">
+			<uni-easyinput v-model="oaNumber" :styles="styles" :placeholderStyle="placeholderStyle" placeholder="请输入OA单号"
+				@input="changeValue"></uni-easyinput>
+		</view>
 		<win-empty-view v-if="dataList.length==0"></win-empty-view>
 		<view hover-class="uni-list-cell-hover" v-for="(item, index) in dataList" :key="item.id"
 			@click="openDetail(item)">
@@ -23,7 +26,8 @@
 	} from '@/api/index.js';
 
 	import {
-		goHome
+		goHome,
+		debounceSetting
 	} from '@/common/basic.js';
 
 	import winEmptyView from '@/mycomponents/wincom/winEmptyView.vue'
@@ -60,10 +64,18 @@
 				isIssueTimeChange: false,
 				isToday: false,
 				titleArray: ['任务编号'],
-				loadingType: "nomore"
+				loadingType: "nomore",
+				styles: {
+					color: '#2979FF',
+					borderColor: '#2979FF',
+					padding:"20"
+				},
+				placeholderStyle: "color:#2979FF;font-size:14px;font-weight: bold;",
+				oaNumber:""
 			};
 		},
 		onShow() {
+			this.oaNumber =localStorage.getItem("return_oaNumber")
 			this.getList('refresh');
 		},
 		
@@ -115,7 +127,8 @@
 					pageIndex: that.pageIndex,
 					isCreationTimeSorting: that.isIssueTimeChange,
 					isToday: that.isToday,
-					ishaspag:1
+					ishaspag:1,
+					OaNumber: localStorage.getItem("return_oaNumber")? localStorage.getItem("return_oaNumber"):""
 				};
 				getUnProduceReturnList(params)
 					.then(res => {
@@ -136,6 +149,7 @@
 					.catch(err => {
 						this.showMessage(err.message);
 						uni.hideLoading();
+						uni.stopPullDownRefresh();
 					});
 			},
 
@@ -173,7 +187,12 @@
 			},
 			selectedItem(item) {
 				this.openDetail(item);
-			}
+			},
+			changeValue: debounceSetting(function() {
+				localStorage.setItem("return_oaNumber",this.oaNumber)
+				this.getList('refresh');
+			}, 500),
+			
 			
 		}
 	};
diff --git a/fe/PDA/pages/task/unProduceReturnWip.vue b/fe/PDA/pages/task/unProduceReturnWip.vue
index f06a61d4f..d1e9ce599 100644
--- a/fe/PDA/pages/task/unProduceReturnWip.vue
+++ b/fe/PDA/pages/task/unProduceReturnWip.vue
@@ -1,7 +1,10 @@
 <template>
 	<page-meta root-font-size="18px"></page-meta>
 	<view class="">
-
+		<view class="" style=" padding: 20rpx; font-weight: bold;">
+			<uni-easyinput v-model="oaNumber" :styles="styles" :placeholderStyle="placeholderStyle" placeholder="请输入OA单号"
+				@input="changeValue"></uni-easyinput>
+		</view>
 		<win-empty-view v-if="dataList.length==0"></win-empty-view>
 		<view hover-class="uni-list-cell-hover" v-for="(item, index) in dataList" :key="item.id"
 			@click="openDetail(item)">
@@ -23,7 +26,8 @@
 	} from '@/api/index.js';
 
 	import {
-		goHome
+		goHome,
+		debounceSetting
 	} from '@/common/basic.js';
 
 	import winEmptyView from '@/mycomponents/wincom/winEmptyView.vue'
@@ -60,10 +64,18 @@
 				isIssueTimeChange: false,
 				isToday: false,
 				titleArray: ['任务编号'],
-				loadingType: "nomore"
+				loadingType: "nomore",
+				styles: {
+					color: '#2979FF',
+					borderColor: '#2979FF',
+					padding:"20"
+				},
+				placeholderStyle: "color:#2979FF;font-size:14px;font-weight: bold;",
+				oaNumber:""
 			};
 		},
 		onShow() {
+			this.oaNumber =localStorage.getItem("returnWip_oaNumber")
 			this.getList('refresh');
 		},
 		
@@ -111,7 +123,8 @@
 					pageIndex: that.pageIndex,
 					isCreationTimeSorting: that.isIssueTimeChange,
 					isToday: that.isToday,
-					ishaspag:0
+					ishaspag:0,
+					OaNumber: localStorage.getItem("returnWip_oaNumber")? localStorage.getItem("returnWip_oaNumber"):""
 				};
 				getUnProduceReturnList(params)
 					.then(res => {
@@ -132,6 +145,7 @@
 					.catch(err => {
 						this.showMessage(err.message);
 						uni.hideLoading();
+						uni.stopPullDownRefresh();
 					});
 			},
 
@@ -144,7 +158,6 @@
 			},
 
 
-
 			openDetail(item) {
 				uni.navigateTo({
 					url: './unProduceReturnWipDetail?id=' + item.id+ '&jobStatus=' + item.jobStatus
@@ -154,7 +167,7 @@
 			showMessage(message) {
 				this.$refs.comMessage.showMessage(message);
 			},
-			onPull() {
+			onPullDownRefresh() {
 				this.getList('refresh');
 			},
 			onReachBottom() {
@@ -169,7 +182,11 @@
 			},
 			selectedItem(item) {
 				this.openDetail(item);
-			}
+			},
+			changeValue: debounceSetting(function() {
+				localStorage.setItem("returnWip_oaNumber",this.oaNumber)
+				this.getList('refresh');
+			}, 500),
 			
 		}
 	};