From b569e4fef8a26595a1137d8a745300fa705575e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Fri, 7 Nov 2025 14:21:27 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E9=87=87=E8=B4=AD=E9=9C=80=E6=B1=82):=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=87=87=E8=B4=AD=E9=9C=80=E6=B1=82=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加采购需求管理功能，包括需求列表展示、新增、编辑、删除和完成操作
新增需求列表页面和API接口
添加剩余时间显示组件用于展示需求截止时间
更新工作台页面添加采购需求入口
---
 api/oa/requirement.js                       |  44 ++
 components/oa/oa-remind-time/index.vue      | 101 ++++
 pages.json                                  |   8 +
 pages/workbench/article/article.vue         |   3 +-
 pages/workbench/index/index.vue             |   6 +
 pages/workbench/requirement/requirement.vue | 619 ++++++++++++++++++++
 static/images/requirement.png               | Bin 0 -> 3892 bytes
 7 files changed, 779 insertions(+), 2 deletions(-)
 create mode 100644 api/oa/requirement.js
 create mode 100644 components/oa/oa-remind-time/index.vue
 create mode 100644 pages/workbench/requirement/requirement.vue
 create mode 100644 static/images/requirement.png

diff --git a/api/oa/requirement.js b/api/oa/requirement.js
new file mode 100644
index 0000000..823c70d
--- /dev/null
+++ b/api/oa/requirement.js
@@ -0,0 +1,44 @@
+import request from "@/util/oaRequest"
+
+// 查询OA 需求列表
+export function listRequirements(query) {
+  return request({
+    url: '/oa/requirements/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询OA 需求详细
+export function getRequirements(requirementId) {
+  return request({
+    url: '/oa/requirements/' + requirementId,
+    method: 'get'
+  })
+}
+
+// 新增OA 需求
+export function addRequirements(data) {
+  return request({
+    url: '/oa/requirements',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改OA 需求
+export function updateRequirements(data) {
+  return request({
+    url: '/oa/requirements',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除OA 需求
+export function delRequirements(requirementId) {
+  return request({
+    url: '/oa/requirements/' + requirementId,
+    method: 'delete'
+  })
+}
diff --git a/components/oa/oa-remind-time/index.vue b/components/oa/oa-remind-time/index.vue
new file mode 100644
index 0000000..0d76dde
--- /dev/null
+++ b/components/oa/oa-remind-time/index.vue
@@ -0,0 +1,101 @@
+<template>
+  <view class="remaining-time" :class="computedClass">
+    <uni-icons 
+      :type="isExpired ? 'clock' : 'time'" 
+      :size="14" 
+      class="icon"
+    ></uni-icons>
+    <text class="text">{{ displayText }}</text>
+  </view>
+</template>
+
+<script>
+export default {
+  name: 'RemainingTime', 
+  props: {
+    // 截至日期（ISO格式，如：'2025-12-31T23:59:59'）
+    expireDate: {
+      type: String,
+      required: true,
+      validator(value) {
+        // 验证日期格式有效性
+        return !isNaN(Date.parse(value));
+      }
+    },
+    // 阈值天数（超过此值为绿色，否则红色）
+    thresholdDays: {
+      type: Number,
+      required: true,
+			default: 3,
+      validator(value) {
+        return value >= 0;
+      }
+    }
+  },
+  computed: {
+    // 计算剩余天数（负数表示逾期）
+    remainingDays() {
+      const now = new Date();
+      const expire = new Date(this.expireDate);
+      const diffTime = expire - now;
+      // 转换为天数并四舍五入
+      return Math.round(diffTime / (1000 * 60 * 60 * 24));
+    },
+    // 是否已逾期
+    isExpired() {
+      return this.remainingDays < 0;
+    },
+    // 显示文本
+    displayText() {
+      if (this.isExpired) {
+        return `已逾期 ${Math.abs(this.remainingDays)} 天`;
+      }
+      return `剩余 ${this.remainingDays} 天`;
+    },
+    // 计算样式类
+    computedClass() {
+      if (this.isExpired) {
+        return 'expired'; // 逾期状态
+      }
+      return this.remainingDays > this.thresholdDays 
+        ? 'normal' // 正常状态（超过阈值）
+        : 'warning'; // 警告状态（低于阈值）
+    }
+  }
+};
+</script>
+
+<style scoped>
+.remaining-time {
+  display: inline-flex;
+  align-items: center;
+  padding: 4rpx 12rpx;
+  border-radius: 20rpx;
+  font-size: 24rpx;
+  line-height: 1;
+}
+
+.icon {
+  margin-right: 8rpx;
+}
+
+.text {
+  font-weight: 500;
+}
+
+/* 正常状态（超过阈值） */
+.normal {
+  color: #00b42a; /* 绿色 */
+}
+
+/* 警告状态（低于阈值） */
+.warning {
+  color: #f53f3f; /* 红色 */
+}
+
+/* 逾期状态 */
+.expired {
+  background-color: #fef0f0;
+  color: #f53f3f; /* 红色背景+红色文字 */
+}
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 6eb0bc5..ce9f362 100644
--- a/pages.json
+++ b/pages.json
@@ -549,6 +549,14 @@
 			"navigationBarTitleText" : "项目明细详情",
 			"navigationStyle": "default"
 		}
+	},
+	{
+		"path" : "pages/workbench/requirement/requirement",
+		"style" : 
+		{
+			"navigationBarTitleText" : "采购需求",
+			"navigationStyle": "default"
+		}
 	}
   ],
   "tabBar": {
diff --git a/pages/workbench/article/article.vue b/pages/workbench/article/article.vue
index c10d594..92bdcc3 100644
--- a/pages/workbench/article/article.vue
+++ b/pages/workbench/article/article.vue
@@ -17,7 +17,7 @@
 					mode="cover"></image>
 				<view class="user-meta">
 					<view class="user-name">
-						{{ article.author || '未知用户' }}
+						{{ article.createBy || '未知用户' }}
 						<!-- <view class="user-level">Lv.1</view> -->
 					</view>
 					<view class="user-time-area">
@@ -81,7 +81,6 @@
 							.then(res => {
 								this.article = {
 									...res.data,
-									author: res.data.createBy,
 									title: res.data.noticeTitle,
 									content: res.data.noticeContent,
 								};
diff --git a/pages/workbench/index/index.vue b/pages/workbench/index/index.vue
index 63b6bfc..cd72cc9 100644
--- a/pages/workbench/index/index.vue
+++ b/pages/workbench/index/index.vue
@@ -103,6 +103,12 @@ export default {
 				  url: '/pages/workbench/feedback/feedback',
 					category: "信息中心"
 				},
+				{
+					text: '采购需求',
+					icon: '/static/images/requirement.png',
+					url: '/pages/workbench/requirement/requirement',
+					category: "信息中心"
+				},
 				{
 					text: '客户管理',
 					icon: '/static/images/customer.png',
diff --git a/pages/workbench/requirement/requirement.vue b/pages/workbench/requirement/requirement.vue
new file mode 100644
index 0000000..9c5bfbb
--- /dev/null
+++ b/pages/workbench/requirement/requirement.vue
@@ -0,0 +1,619 @@
+<template>
+	<view class="report-schedule">
+		<!-- header始终显示 -->
+		<view class="search-bar">
+			<view class="search-container">
+				<view class="task-type-button-container">
+					<view class="task-type-button" @click="openDrawer">
+						<uni-icons type="settings" color="#2979ff" size="22"></uni-icons>
+					</view>
+				</view>
+				<view class="search-input custom-search-input">
+					<input v-model="queryParams.title" class="input" type="text" placeholder="搜索采购需求" @confirm="onSearch"
+						@keyup.enter="onSearch" />
+					<view class="search-icon" @click="onSearch">
+						<uni-icons type="search" color="#bbb" size="20"></uni-icons>
+					</view>
+					<view v-if="searchName" class="clear-icon" @click="onClearSearch">
+						<uni-icons type="closeempty" color="#bbb" size="18"></uni-icons>
+					</view>
+				</view>
+				<view class="add-button" @click="handleAdd">
+					<uni-icons type="plusempty" color="#2979ff" size="22"></uni-icons>
+				</view>
+			</view>
+		</view>
+
+		<!-- 筛选抽屉 -->
+		<uni-drawer ref="drawerRef" mode="left" :width="320">
+			<view class="drawer-content">
+				<view class="drawer-title">筛选</view>
+				<view class="drawer-form">
+					<view class="drawer-form-item">
+						<text class="drawer-label">需求方</text>
+						<oa-user-select v-model="queryParams.requesterId" placeholder="请选择需求方" />
+					</view>
+					<view class="drawer-form-item">
+						<text class="drawer-label">负责人</text>
+						<oa-user-select v-model="queryParams.ownerId" placeholder="请选择负责人" />
+					</view>
+					<view class="drawer-form-item">
+						<text class="drawer-label">关联项目</text>
+						<oa-project-select v-model="queryParams.projectId" placeholder="请选择关联项目" />
+					</view>
+				</view>
+				<view class="drawer-btns">
+					<button class="drawer-btn-primary" @click="applyFilterAndClose">确定</button>
+					<button class="drawer-btn" @click="resetFilterAndClose">重置</button>
+					<button class="drawer-btn" @click="closeDrawer">关闭</button>
+				</view>
+			</view>
+		</uni-drawer>
+
+		<view>
+			<!-- 自定义列表，右滑菜单（uni-ui实现） -->
+			<scroll-view scroll-y style="height: 100vh;" @scrolltolower="loadMore">
+				<view v-if="customerList.length">
+					<uni-swipe-action>
+						<block v-for="(item, index) in customerList" :key="item.requirementId">
+							<uni-swipe-action-item :right-options="getSwipeOptions(item)" @click="swipeActionClick($event, item)"
+								style="margin-bottom: 16rpx;">
+								<view class="card">
+									<view class="card-title">
+										<text class="project">{{ item.title }}</text>
+										<uni-tag v-if="item.status == 2" type="success" text="已完成"></uni-tag>
+										<oa-remind-time v-else :expireDate="item.deadline" :thresholdDays="3"></oa-remind-time>
+									</view>
+									<view class="card-content">
+										<view>需求方({{ item.requesterNickName }}) -> 负责人({{ item.ownerNickName }})</view>
+										<view>关联项目：{{ item.projectName }}</view>
+										<view>需求描述：{{ item.description }}</view>
+										<view>截止日期：{{ item.deadline }}</view>
+									</view>
+								</view>
+							</uni-swipe-action-item>
+						</block>
+					</uni-swipe-action>
+				</view>
+				<view v-else class="empty">暂无数据</view>
+				<view class="load-more-tips">
+					<u-loading-icon v-if="loadingMore" text="加载中..." size="20" textSize="14" />
+					<text v-else-if="!hasMore && customerList.length">没有更多了</text>
+				</view>
+			</scroll-view>
+
+			<!-- 新增/编辑弹窗 -->
+			<uni-popup ref="popupRef" type="bottom">
+				<view class="popup-content">
+					<view class="uni-form">
+						<view class="uni-form-item">
+							<text class="uni-form-label">需求标题</text>
+							<u-input v-model="form.title" placeholder="请输入客户名称" />
+						</view>
+						<view class="uni-form-item">
+							<text class="uni-form-label">需求描述</text>
+							<uni-easyinput v-model="form.description" type="textarea" placeholder="请输入需求描述" />
+						</view>
+						
+						<view class="uni-form-item">
+							<text class="uni-form-label">负责人</text>
+							<oa-user-select v-model="form.ownerId" placeholder="请选择负责人" />
+						</view>
+						
+						<view class="uni-form-item">
+							<text class="uni-form-label">关联项目</text>
+							<oa-project-select v-model="form.projectId" placeholder="请选择关联项目" />
+						</view>
+						
+						<view class="uni-form-item">
+							<text class="uni-form-label">截至日期</text>
+							<uni-datetime-picker v-model="form.deadline" type="datetime" placeholder="请选择截止日期"
+								style="width:100%" />
+						</view>
+
+						<view class="uni-form-item">
+							<text class="uni-form-label">备注</text>
+							<u-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
+						</view>
+					</view>
+					<view class="popup-btns">
+						<u-button type="primary" @click="submitForm">确定</u-button>
+						<u-button @click="closePopup">取消</u-button>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		addRequirements,
+		delRequirements,
+		updateRequirements,
+		getRequirements,
+		listRequirements
+	} from '@/api/oa/requirement.js'
+
+	export default {
+		data() {
+			return {
+				queryParams: {
+					pageNum: 1,
+					pageSize: 10,
+					expressId: undefined,
+					description: undefined,
+					reportTime: undefined,
+					reportBy: undefined,
+					status: undefined,
+				},
+				projectOptions: [],
+				headerOptions: [],
+				customerList: [],
+				total: 0,
+				single: true,
+				multiple: true,
+				form: {},
+				showStartDate: false,
+				showEndDate: false,
+				swipeOptions: [{
+						text: '编辑',
+						style: {
+							backgroundColor: '#2979ff',
+							color: '#fff'
+						}
+					},
+					{
+						text: '删除',
+						style: {
+							backgroundColor: '#fa3534',
+							color: '#fff'
+						}
+					}
+				],
+				// 新增：筛选相关
+				searchName: '',
+				filterProject: '',
+				filterHeader: '',
+				filterDateRange: [],
+				pageNum: 1,
+				pageSize: 10,
+				loadingMore: false,
+				hasMore: true,
+				startLoading: false,
+				startPopupOpen: false,
+				_startScheduleId: null,
+				showGanttView: false,
+				ganttChartData: {
+					categories: [],
+					series: []
+				}
+			}
+		},
+		onLoad() {
+			this.pageNum = 1
+			this.hasMore = true
+			this.handleQuery()
+		},
+		methods: {
+			openDrawer() {
+				this.$refs.drawerRef.open();
+			},
+			closeDrawer() {
+				this.$refs.drawerRef.close();
+			},
+			applyFilterAndClose() {
+				this.applyFilter();
+				this.closeDrawer();
+			},
+			resetFilterAndClose() {
+				this.resetFilter();
+				this.closeDrawer();
+			},
+			// 搜索框检索
+			onSearch() {
+				this.searchName = this.searchName
+				this.handleQuery()
+			},
+			onClearSearch() {
+				this.searchName = ''
+				this.queryParams.scheduleName = ''
+				this.handleQuery()
+			},
+			// 筛选抽屉应用
+			applyFilter() {
+				this.queryParams.projectId = this.filterProject
+				this.queryParams.header = this.filterHeader
+				if (this.filterDateRange && this.filterDateRange.length === 2) {
+					this.queryParams.dateRange = this.filterDateRange
+				} else {
+					this.queryParams.dateRange = []
+				}
+				this.handleQuery()
+			},
+			// 筛选抽屉重置
+			resetFilter() {
+				this.queryParams = {
+					...this.queryParams,
+					level: undefined,
+					source: undefined,
+					industryId: undefined,
+				}
+			},
+			handleQuery() {
+				this.pageNum = 1
+				this.hasMore = true
+				this.queryParams.pageNum = 1
+				if (this.queryParams.dateRange && this.queryParams.dateRange.length === 2) {
+					this.queryParams.startDate = this.queryParams.dateRange[0]
+					this.queryParams.endDate = this.queryParams.dateRange[1]
+				} else {
+					this.queryParams.startDate = ''
+					this.queryParams.endDate = ''
+				}
+				this.getList()
+			},
+			getList() {
+				this.loadingMore = true
+				this.queryParams.pageNum = this.pageNum
+				this.queryParams.pageSize = this.pageSize
+				listRequirements(this.queryParams).then(res => {
+					const rows = res.rows || []
+					if (this.pageNum === 1) {
+						this.customerList = rows
+					} else {
+						this.customerList = this.customerList.concat(rows)
+					}
+					// 判断是否还有更多
+					this.hasMore = rows.length === this.pageSize
+					this.total = res.total || 0
+				}).finally(() => {
+					this.loadingMore = false
+				})
+			},
+			loadMore() {
+				if (!this.hasMore || this.loadingMore) return
+				this.pageNum++
+				this.getList()
+			},
+			handleAdd() {
+				this.form = {
+					requirementId: this.$store.state.user.id,
+					title: undefined,
+					requesterId: undefined,
+					ownerId: undefined,
+					projectId: undefined,
+					description: undefined,
+					deadline: undefined,
+					status: 0,
+					remark: undefined,
+					accessory: undefined,
+					createBy: undefined,
+					createTime: undefined,
+					updateBy: undefined,
+					updateTime: undefined,
+					delFlag: undefined
+				}
+				this.$refs.popupRef.open('bottom')
+			},
+			handleUpdate(row) {
+				getRequirements(row.requirementId).then(res => {
+					this.form = res.data || {}
+					this.$refs.popupRef.open('bottom')
+				})
+			},
+			handleDelete(item) {
+				uni.showModal({
+					title: '确认删除',
+					content: `确定要删除排产“${item.scheduleName}”吗？`,
+					success: (res) => {
+						if (res.confirm) {
+							const ids = item ? [item.requirementId] : this.selectedIds
+							delRequirements(ids).then(() => {
+								uni.showToast({
+									title: '删除成功',
+									icon: 'success'
+								})
+								this.getList()
+							})
+						}
+					}
+				})
+			},
+			handleExport() {
+				// 导出逻辑可根据实际API实现
+				uni.showToast({
+					title: '导出功能开发中',
+					icon: 'none'
+				})
+			},
+			submitForm() {
+				if (this.form.requirementId) {
+					updateRequirements(this.form).then(() => {
+						uni.showToast({
+							title: '修改成功',
+							icon: 'success'
+						})
+						this.closePopup()
+						this.getList()
+					})
+				} else {
+					addRequirements(this.form).then(() => {
+						uni.showToast({
+							title: '新增成功',
+							icon: 'success'
+						})
+						this.closePopup()
+						this.getList()
+					})
+				}
+			},
+			closePopup() {
+				this.$refs.popupRef.close()
+			},
+			getSwipeOptions(item) {
+				const options = [{
+						text: '编辑',
+						style: {
+							backgroundColor: '#2979ff',
+							color: '#fff'
+						}
+					},
+					{
+						text: '删除',
+						style: {
+							backgroundColor: '#fa3534',
+							color: '#fff'
+						}
+					}
+				];
+				if (!item.status || item.status != 2) {
+					options.push({
+						text: '完成',
+						style: { backgroundColor: '#19be6b', color: '#fff' }
+					});
+				}
+				return options;
+			},
+			swipeActionClick(e, item) {
+				const text = e.content.text;
+				if (text === '编辑') {
+					this.handleUpdate(item);
+				} else if (text === '删除') {
+					this.handleDelete(item);
+				} else if (text === '完成') {
+					this.handleFinish(item);
+				}
+			},
+			handleFinish(row) {
+				updateRequirements({
+					...row,
+					status: 2
+				}).then(_ => {
+					uni.showToast({
+						title: "采购完成"
+					})
+					this.getList()
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.report-schedule {
+		min-height: 100vh;
+		background-color: #f5f5f5;
+		padding-bottom: 120rpx;
+	}
+
+	.search-bar {
+		padding: 20rpx;
+		position: sticky;
+		top: 0;
+		z-index: 100;
+		background: #fff;
+	}
+
+	.search-container {
+		display: flex;
+		align-items: center;
+		gap: 20rpx;
+	}
+
+	.task-type-button-container {
+		display: flex;
+		gap: 12rpx;
+	}
+
+	.task-type-button {
+		width: 60rpx;
+		height: 60rpx;
+		background-color: transparent;
+		border-radius: 50%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.search-input {
+		flex: 1;
+		position: relative;
+		display: flex;
+		align-items: center;
+		background: #f5f5f5;
+		border-radius: 100rpx;
+		padding: 0 24rpx;
+		height: 60rpx;
+	}
+
+	.input {
+		flex: 1;
+		border: none;
+		background: transparent;
+		font-size: 30rpx;
+		outline: none;
+		height: 60rpx;
+		line-height: 60rpx;
+	}
+
+	.search-icon {
+		margin-left: 8rpx;
+		display: flex;
+		align-items: center;
+	}
+
+	.clear-icon {
+		margin-left: 8rpx;
+		display: flex;
+		align-items: center;
+	}
+
+	.drawer-content {
+		padding: 32rpx 24rpx 24rpx 24rpx;
+	}
+
+	.drawer-title {
+		font-size: 32rpx;
+		font-weight: bold;
+		margin-bottom: 24rpx;
+	}
+
+	.drawer-form {
+		margin-bottom: 32rpx;
+	}
+
+	.drawer-form-item {
+		margin-bottom: 24rpx;
+	}
+
+	.drawer-label {
+		display: block;
+		font-size: 28rpx;
+		color: #333;
+		margin-bottom: 8rpx;
+	}
+
+	.drawer-btns {
+		display: flex;
+		gap: 16rpx;
+		margin-top: 24rpx;
+	}
+
+	.drawer-btn-primary {
+		flex: 1;
+		background: #2979ff;
+		color: #fff;
+		border: none;
+		border-radius: 8rpx;
+		padding: 16rpx 0;
+		font-size: 28rpx;
+	}
+
+	.drawer-btn {
+		flex: 1;
+		background: #f5f5f5;
+		color: #333;
+		border: none;
+		border-radius: 8rpx;
+		padding: 16rpx 0;
+		font-size: 28rpx;
+	}
+
+	.card {
+		background: #fff;
+		border-radius: 16rpx;
+		box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
+		padding: 24rpx;
+	}
+
+	.card-title {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		font-weight: bold;
+		margin-bottom: 12rpx;
+	}
+
+	.project {
+		color: #2979ff;
+	}
+
+	.status {
+		font-size: 24rpx;
+		padding: 0 12rpx;
+		border-radius: 8rpx;
+	}
+
+	.status-1 {
+		background: #e0f7fa;
+		color: #009688;
+	}
+
+	.status-0,
+	.status-undefined {
+		background: #fffbe6;
+		color: #faad14;
+	}
+
+	.status-other {
+		background: #fbeff2;
+		color: #e91e63;
+	}
+
+	.card-content view {
+		margin-bottom: 8rpx;
+		color: #666;
+		font-size: 26rpx;
+	}
+
+	.empty {
+		text-align: center;
+		color: #bbb;
+		margin: 40rpx 0;
+	}
+
+	.popup-content {
+		padding: 24rpx;
+		background: #fff;
+		border-radius: 16rpx 16rpx 0 0;
+	}
+
+	.uni-form {
+		margin-bottom: 32rpx;
+		max-height: 50vh;
+		overflow-y: scroll;
+	}
+
+	.uni-form-item {
+		margin-bottom: 32rpx;
+	}
+
+	.uni-form-label {
+		display: block;
+		font-size: 28rpx;
+		color: #333;
+		margin-bottom: 8rpx;
+	}
+
+	.load-more-tips {
+		text-align: center;
+		color: #bbb;
+		padding: 24rpx 0 32rpx 0;
+		font-size: 28rpx;
+	}
+
+	.card-ops {
+		margin-top: 16rpx;
+		display: flex;
+		gap: 16rpx;
+	}
+
+	.gantt-toggle-bar {
+		display: flex;
+		gap: 16rpx;
+		padding: 16rpx 0 8rpx 0;
+		background: #fff;
+		justify-content: flex-end;
+	}
+</style>
\ No newline at end of file
diff --git a/static/images/requirement.png b/static/images/requirement.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcfe92042af724a75371574fb1f4483b7b06960c
GIT binary patch
literal 3892
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

literal 0
HcmV?d00001