From 62ef81065c9bbbf618aef8ee7a37b5d9ddaf542a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Wed, 16 Jul 2025 11:49:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AEeasycom=EF=BC=8C=E7=9B=AE?=
 =?UTF-8?q?=E5=89=8D=E9=A1=B5=E9=9D=A2=E4=B8=AD=E5=9B=A0=E4=B8=BA=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E7=94=A8=E5=88=B0getName=E6=96=B9=E6=B3=95=EF=BC=8C?=
 =?UTF-8?q?=E6=89=80=E4=BB=A5=E5=85=88=E4=B8=8D=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/oa/oa-project-select/index.vue     |  67 ++++++++
 components/oa/oa-user-select/index.vue        |   0
 pages.json                                    |   8 +-
 .../reportSchedule/reportSchedule.vue         | 144 +++++++++---------
 4 files changed, 148 insertions(+), 71 deletions(-)
 create mode 100644 components/oa/oa-project-select/index.vue
 create mode 100644 components/oa/oa-user-select/index.vue

diff --git a/components/oa/oa-project-select/index.vue b/components/oa/oa-project-select/index.vue
new file mode 100644
index 0000000..213a951
--- /dev/null
+++ b/components/oa/oa-project-select/index.vue
@@ -0,0 +1,67 @@
+<template>
+  <uni-data-select
+    v-model="innerValue"
+    :localdata="projectOptions"
+    :placeholder="placeholder"
+    :clear="clear"
+    :filterable="filterable"
+    @change="onChange"
+  />
+</template>
+
+<script>
+import uniDataSelect from '@/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue'
+import { listProject } from '@/api/oa/project'
+
+export default {
+  name: 'OaProjectSelect',
+  components: { uniDataSelect },
+  props: {
+    value: [String, Number],
+    placeholder: {
+      type: String,
+      default: '请选择项目'
+    },
+    clear: {
+      type: Boolean,
+      default: true
+    },
+    filterable: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      projectOptions: [],
+      innerValue: this.value
+    }
+  },
+  watch: {
+    value(val) {
+      this.innerValue = val
+    },
+    innerValue(val) {
+      this.$emit('input', val)
+      this.$emit('update:value', val)
+      this.$emit('change', val)
+    }
+  },
+  mounted() {
+    this.getProjectOptions()
+  },
+  methods: {
+    getProjectOptions() {
+      listProject().then(res => {
+        this.projectOptions = (res.rows || []).map(item => ({
+          text: item.projectName,
+          value: item.projectId
+        }))
+      })
+    },
+    onChange(val) {
+      this.innerValue = val
+    }
+  }
+}
+</script>
diff --git a/components/oa/oa-user-select/index.vue b/components/oa/oa-user-select/index.vue
new file mode 100644
index 0000000..e69de29
diff --git a/pages.json b/pages.json
index 05c1a70..704ae69 100644
--- a/pages.json
+++ b/pages.json
@@ -350,5 +350,11 @@
     "app-plus": {
       "bounce": "none"
     }
-  }
+  },
+	"easycom": {
+		"autoscan": true,
+		"custom": {
+			"^oa-(.*)": "components/oa/oa-$1/index.vue"
+		}
+	}
 }
diff --git a/pages/workbench/reportSchedule/reportSchedule.vue b/pages/workbench/reportSchedule/reportSchedule.vue
index d6c20ce..bfc0c11 100644
--- a/pages/workbench/reportSchedule/reportSchedule.vue
+++ b/pages/workbench/reportSchedule/reportSchedule.vue
@@ -1,68 +1,66 @@
 <template>
 	<view class="report-schedule">
-		<!-- 视图切换按钮 -->
-		<view class="gantt-toggle-bar">
-			<u-button :type="!showGanttView ? 'primary' : 'default'" size="mini"
-				@click="showGanttView = false">表格视图</u-button>
-			<u-button :type="showGanttView ? 'primary' : 'default'" size="mini" @click="showGanttView = true">甘特图视图</u-button>
+		<!-- 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 class="task-type-button" @click="toggleGanttView">
+						<uni-icons :type="showGanttView ? 'list' : 'calendar'" color="#2979ff" size="22"></uni-icons>
+					</view>
+				</view>
+				<view class="search-input custom-search-input">
+					<input v-model="searchName" 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>
+						<uni-data-select v-model="filterProject" :localdata="projectOptions" placeholder="请选择项目" :clear="true"
+							filterable />
+					</view>
+					<view class="drawer-form-item">
+						<text class="drawer-label">执行人</text>
+						<uni-data-select v-model="filterHeader" :localdata="headerOptions" placeholder="请选择执行人" :clear="true"
+							filterable />
+					</view>
+					<view class="drawer-form-item">
+						<text class="drawer-label">日期</text>
+						<uni-datetime-picker v-model="filterDateRange" type="daterange" rangeSeparator="至"
+							start-placeholder="开始日期" end-placeholder="结束日期" :clear-icon="true" style="width:100%" />
+					</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>
+
+		<!-- 内容区：根据showGanttView切换 -->
 		<gantt v-if="showGanttView" :chart-data="ganttChartData" />
 
 		<view v-else>
-			<!-- 顶栏 -->
-			<view class="search-bar">
-				<view class="search-container">
-					<view class="task-type-button-container">
-						<view class="task-type-button" @click="openDrawer">
-							<uni-icons type="list" color="#2979ff" size="22"></uni-icons>
-						</view>
-					</view>
-					<view class="search-input custom-search-input">
-						<input v-model="searchName" 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>
-							<uni-data-select v-model="filterProject" :localdata="projectOptions" placeholder="请选择项目" :clear="true"
-								filterable />
-						</view>
-						<view class="drawer-form-item">
-							<text class="drawer-label">执行人</text>
-							<uni-data-select v-model="filterHeader" :localdata="headerOptions" placeholder="请选择执行人" :clear="true"
-								filterable />
-						</view>
-						<view class="drawer-form-item">
-							<text class="drawer-label">日期</text>
-							<uni-datetime-picker v-model="filterDateRange" type="daterange" rangeSeparator="至"
-								start-placeholder="开始日期" end-placeholder="结束日期" :clear-icon="true" style="width:100%" />
-						</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>
-
 			<!-- 自定义列表，右滑菜单（uni-ui实现） -->
 			<scroll-view scroll-y style="height: 100vh;" @scrolltolower="loadMore">
 				<view v-if="reportScheduleList.length">
@@ -546,6 +544,12 @@ export default {
 					}
 				]
 			}
+		},
+		toggleGanttView() {
+			this.showGanttView = !this.showGanttView;
+			if (this.showGanttView) {
+				this.ganttChartData = this.getGanttChartData(this.reportScheduleList);
+			}
 		}
 	}
 }
@@ -573,7 +577,18 @@ export default {
 }
 
 .task-type-button-container {
-	position: relative;
+	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 {
@@ -609,17 +624,6 @@ export default {
 	align-items: center;
 }
 
-.task-type-button,
-.add-button {
-	width: 60rpx;
-	height: 60rpx;
-	background-color: transparent;
-	border-radius: 50%;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
-
 .drawer-content {
 	padding: 32rpx 24rpx 24rpx 24rpx;
 }