From 039c303b340529d65b6afaba68cb2a3df111d7f4 Mon Sep 17 00:00:00 2001
From: z <ZhouYu0323@126.com>
Date: Wed, 27 Aug 2025 23:10:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes-ui/mini-app/src/pages.json                |  2 +-
 .../pages/index/components/CategoryPanel.vue  |  1 -
 .../pages/receivingGoods/receivingGoods.vue   | 51 ++++++++++---------
 mes-ui/mini-app/src/services/constants.ts     |  4 +-
 4 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/mes-ui/mini-app/src/pages.json b/mes-ui/mini-app/src/pages.json
index 8ab712f5..ae02dbe0 100644
--- a/mes-ui/mini-app/src/pages.json
+++ b/mes-ui/mini-app/src/pages.json
@@ -172,7 +172,7 @@
     },{
       "path": "pages/receivingGoods/receivingGoods",
       "style": {
-        "navigationBarTitleText": "收货信息"
+        "navigationBarTitleText": "采购单收货"
       }
     }
   ],
diff --git a/mes-ui/mini-app/src/pages/index/components/CategoryPanel.vue b/mes-ui/mini-app/src/pages/index/components/CategoryPanel.vue
index 3db571dc..7ed4ae6f 100644
--- a/mes-ui/mini-app/src/pages/index/components/CategoryPanel.vue
+++ b/mes-ui/mini-app/src/pages/index/components/CategoryPanel.vue
@@ -15,7 +15,6 @@
 	}>()
 
 	const handleToBooking = (item : Object) => {
-		console.log('点击了分类', JSON.stringify(item))
 		if (item.auth) {
 			const path = item.path
 			const url = `/pages/${path}/${path}`
diff --git a/mes-ui/mini-app/src/pages/receivingGoods/receivingGoods.vue b/mes-ui/mini-app/src/pages/receivingGoods/receivingGoods.vue
index 1b1e4585..e5570459 100644
--- a/mes-ui/mini-app/src/pages/receivingGoods/receivingGoods.vue
+++ b/mes-ui/mini-app/src/pages/receivingGoods/receivingGoods.vue
@@ -43,7 +43,6 @@
 		// 发送请求
 		const data = await getReceivingGoods(queryParams);
 		isLoading.value = false;
-
 		dataList.value.push(...data.list);
 		// 分页条件
 		if (queryParams.pageNo < data.totalPages) {
@@ -167,10 +166,14 @@
 	const confirmFilter = () => {
 		// 清空搜索框内容
 		searchVal.value = '';
+    queryParams.subOrDetailName=""
 		// 这里可以添加过滤逻辑
-		console.log('过滤数据:', filterData);
 		// 收起下拉区域
 		showPop.value?.close();
+    queryParams.pageNo = 1;
+    isFinish.value = false;
+    dataList.value = [];
+    getListData()
 	}
 </script>
 <template>
@@ -285,34 +288,34 @@
 		</scroll-view>
 		<uni-popup class="popup" ref="showPop" :mask-click="false" type="top" background-color="#fff">
 			<view style="margin-top: 6%;">
-				<uni-forms  :modelValue="filterData">
-					<uni-forms-item label="姓名" name="projectName">
-						<uni-easyinput type="text" v-model="filterData.projectName" placeholder="请输入项目名称" />
+				<uni-forms  :modelValue="queryParams">
+					<uni-forms-item label="项目名称" name="projectName">
+						<uni-easyinput type="text" v-model="queryParams.projectName" placeholder="请输入项目名称" />
 					</uni-forms-item>
-					<uni-forms-item label="年龄" name="subProjectName">
-						<uni-easyinput type="text" v-model="filterData.subProjectName" placeholder="请输入子项目名称" />
+					<uni-forms-item label="子项目名称" name="projectSubName">
+						<uni-easyinput type="text" v-model="queryParams.projectSubName" placeholder="请输入子项目名称" />
 					</uni-forms-item>
-					<uni-forms-item name="supplier" label="供应商">
-						<uni-easyinput type="text" v-model="filterData.supplier" placeholder="请输入供应商" />
+					<uni-forms-item name="supplierName" label="供应商">
+						<uni-easyinput type="text" v-model="queryParams.supplierName" placeholder="请输入供应商" />
 					</uni-forms-item>
-					<uni-forms-item label="姓名" name="partName">
-						<uni-easyinput type="text" v-model="filterData.partName" placeholder="请输入零件名称" />
+					<uni-forms-item label="零件名称" name="boomName">
+						<uni-easyinput type="text" v-model="queryParams.boomName" placeholder="请输入零件名称" />
 					</uni-forms-item>
-					<uni-forms-item label="年龄" name="process">
-						<uni-easyinput type="text" v-model="filterData.process" placeholder="请输入工序" />
+					<uni-forms-item label="工序" name="procedureName">
+						<uni-easyinput type="text" v-model="queryParams.procedureName" placeholder="请输入工序" />
 					</uni-forms-item>
-					<uni-forms-item name="drawingNo" label="图号">
-						<uni-easyinput type="text" v-model="filterData.drawingNo" placeholder="请输入图号" />
+					<uni-forms-item name="blueprintNo" label="图号">
+						<uni-easyinput type="text" v-model="queryParams.blueprintNo" placeholder="请输入图号" />
 					</uni-forms-item>
 				</uni-forms>
 			</view>
-		
-		
+
+
 			<view class="filter-buttons">
-				<view class="cancel" @click="cancelFilter">取消</view>
-				<view class="ok" @click="confirmFilter">确认</view>
+        <view class="ok" @click="confirmFilter">确认</view>
+        <view class="cancel" @click="cancelFilter">取消</view>
 			</view>
-		
+
 		</uni-popup>
 	</view>
 </template>
@@ -329,7 +332,7 @@
 		align-items: center;
 		justify-content: center;
 		margin-left: auto; /* Push the filter button to the right */
-	
+
 		.filter-icon {
 			width: 40rpx;
 			height: 40rpx;
@@ -343,7 +346,7 @@
 		padding: 10px;
 		border: 1px solid #ddd;
 	}
-	
+
 	.filter-buttons .ok {
 		background-color: #007aff;
 		color: white;
@@ -377,8 +380,8 @@
 		}
 
 
-	
-		
+
+
 	}
 
 	.data-list {
diff --git a/mes-ui/mini-app/src/services/constants.ts b/mes-ui/mini-app/src/services/constants.ts
index 63ce0a9d..5415a464 100644
--- a/mes-ui/mini-app/src/services/constants.ts
+++ b/mes-ui/mini-app/src/services/constants.ts
@@ -9,5 +9,5 @@
 // export const serviceDomain = 'https://nxhs.cjyx.cc'
  // export const serviceDomain = 'https://star.hz-hl.com'
 // export const serviceDomain = 'http://222.71.165.187:9010'
- export const serviceDomain = 'http://localhost:8080'
-// export const serviceDomain = 'https://nxhs.cjyx.cc'
+ // export const serviceDomain = 'http://localhost:8080'
+export const serviceDomain = 'https://nxhs.cjyx.cc'