From f6c7c9bc0855764e63585e8eac9da19d500e56e0 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 21 Oct 2026 11:18:21 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=AE=A2=E9=A4=90=E9=A2=84?=
 =?UTF-8?q?=E7=BA=A6=E6=97=B6=E9=97=B4=E7=AE=A1=E7=90=86table=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                                    |  4 ++--
 src/views/hard/hard-appt/cycle-rule-list.vue        | 11 +++++++----
 src/views/hard/hard-appt/time-window-rule-table.vue | 11 +++++++----
 src/views/mch/mch-tool/reservation.vue              | 10 +++++-----
 vite.config.ts                                      |  1 +
 5 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/.env.development b/.env.development
index 8cc9e032..bc786072 100644
--- a/.env.development
+++ b/.env.development
@@ -10,8 +10,8 @@ ENV = 'development'
 # ADMIN 服务地址
 # VITE_ADMIN_PROXY_PATH = http://123.157.250.162:8089/api/ # 测试线上
 # VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 测试线上-过期
-# VITE_ADMIN_PROXY_PATH = https://www.zianxin.com/api
-VITE_ADMIN_PROXY_PATH = http://localhost:9999/
+VITE_ADMIN_PROXY_PATH = https://www.zianxin.com/api
+# VITE_ADMIN_PROXY_PATH = http://localhost:9999/
 # VITE_ADMIN_PROXY_PATH = http://192.168.101.196:9999 # 邓-本地
 # VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境线上
 
diff --git a/src/views/hard/hard-appt/cycle-rule-list.vue b/src/views/hard/hard-appt/cycle-rule-list.vue
index 3ee0c5b5..70e66e53 100644
--- a/src/views/hard/hard-appt/cycle-rule-list.vue
+++ b/src/views/hard/hard-appt/cycle-rule-list.vue
@@ -1,13 +1,13 @@
 <template>
-	<div class="min-w-0">
-		<SearchPanel v-if="!props.hideSearch" ref="queryRef" :model="state.queryForm" :loading="Boolean(state.loading)"
+	<div class="min-w-0" :class="{ 'flex min-h-0 flex-1 flex-col': props.fitHeight }">
+		<SearchPanel v-if="!props.hideSearch" ref="queryRef" class="shrink-0" :model="state.queryForm" :loading="Boolean(state.loading)"
 			@search="getDataList" @reset="resetQuery">
 			<el-form-item label="规则名称" prop="ruleName">
 				<el-input v-model="state.queryForm.ruleName" clearable placeholder="请输入规则名称" />
 			</el-form-item>
 		</SearchPanel>
 
-		<div class="mb-3 flex w-full items-center">
+		<div class="mb-3 flex w-full shrink-0 items-center">
 			<el-button icon="FolderAdd" type="primary" :disabled="props.disabled"
 				@click="formRef.openDialog(null, props.mchId, props.deptId)"
 				v-auth="'hard_hardAppt_add'">新增</el-button>
@@ -20,6 +20,7 @@
 		</div>
 
 		<el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
+			:class="{ 'min-h-0 flex-1': props.fitHeight }" :height="props.fitHeight ? '100%' : undefined"
 			:header-cell-style="tableStyle.headerCellStyle" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="42" align="center" />
 			<el-table-column type="index" label="#" width="48" />
@@ -47,7 +48,7 @@
 				</template>
 			</el-table-column>
 		</el-table>
-		<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		<pagination class="shrink-0" @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 
 		<cycle-rule-form ref="formRef" @refresh="getDataList(false)" />
 		<user-reservation-view-dialog ref="userViewRef" />
@@ -68,6 +69,8 @@ const props = defineProps<{
 	disabled?: boolean
 	/** 隐藏规则名称查询区，独立列表页由页面统一提供查询条件时使用。 */
 	hideSearch?: boolean
+	/** 在有界的纵向弹性容器中占满剩余高度，表格内部滚动；默认按内容撑高。 */
+	fitHeight?: boolean
 }>()
 
 const CycleRuleForm = defineAsyncComponent(() => import("./cycle-rule-form.vue"))
diff --git a/src/views/hard/hard-appt/time-window-rule-table.vue b/src/views/hard/hard-appt/time-window-rule-table.vue
index 1b5e8f21..168aa1ec 100644
--- a/src/views/hard/hard-appt/time-window-rule-table.vue
+++ b/src/views/hard/hard-appt/time-window-rule-table.vue
@@ -1,6 +1,6 @@
 <template>
-	<div class="min-w-0">
-		<div class="mb-2 flex w-full items-center">
+	<div class="min-w-0" :class="{ 'flex min-h-0 flex-1 flex-col': props.fitHeight }">
+		<div class="mb-2 flex w-full shrink-0 items-center">
 			<el-button icon="FolderAdd" type="primary" :disabled="addDisabled" v-auth="'hard_hardAppt_add'"
 				@click="formDialogRef.openDialog(null, props.deptId, props.mchId ?? undefined)">
 				新增
@@ -16,9 +16,10 @@
 				@exportExcel="exportExcel" @queryTable="getDataList" />
 			<right-toolbar v-else class="ml-auto" @queryTable="getDataList" />
 		</div>
-		<div v-if="refundHint" class="mb-2 text-xs text-[var(--el-color-warning)]">{{ refundHint }}</div>
+		<div v-if="refundHint" class="mb-2 shrink-0 text-xs text-[var(--el-color-warning)]">{{ refundHint }}</div>
 
 		<el-table :data="dayRows" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
+			:class="{ 'min-h-0 flex-1': props.fitHeight }" :height="props.fitHeight ? '100%' : undefined"
 			:cell-class-name="windowCellClassName"
 			:header-cell-style="tableStyle.headerCellStyle" :row-style="windowGroupRowStyle" :span-method="spanMethod"
 			@selection-change="handleSelectionChange" @sort-change="sortChangeHandle">
@@ -78,7 +79,7 @@
 			<el-table-column prop="remark" label="备注" min-width="120" show-overflow-tooltip />
 		</el-table>
 
-		<pagination v-if="props.paginated" v-bind="state.pagination" @size-change="sizeChangeHandle"
+		<pagination v-if="props.paginated" class="shrink-0" v-bind="state.pagination" @size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle" />
 
 		<hard-appt-form ref="formDialogRef" @refresh="getDataList" />
@@ -132,6 +133,8 @@ const props = defineProps<{
 	disabled?: boolean
 	/** 是否展示分页，独立列表页使用；定餐配置面板内不展示。 */
 	paginated?: boolean
+	/** 在有界的纵向弹性容器中占满剩余高度，表格内部滚动；默认按内容撑高。 */
+	fitHeight?: boolean
 	/** 是否展示导出按钮，全局列表页使用。 */
 	showExport?: boolean
 	/** 是否按完整开放预约时间循环着色；默认关闭，由预约管理页启用。 */
diff --git a/src/views/mch/mch-tool/reservation.vue b/src/views/mch/mch-tool/reservation.vue
index d6afe281..d66a3fbf 100644
--- a/src/views/mch/mch-tool/reservation.vue
+++ b/src/views/mch/mch-tool/reservation.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="layout-padding">
-		<div class="layout-padding-auto layout-padding-view">
-			<el-form v-if="showSearch" ref="queryRef" :inline="true" :model="queryForm" @keyup.enter="handleSearch">
+		<div class="layout-padding-auto layout-padding-view min-h-0 min-w-0">
+			<el-form v-if="showSearch" ref="queryRef" class="shrink-0" :inline="true" :model="queryForm" @keyup.enter="handleSearch">
 				<el-row>
 					<el-form-item style="width: 420px" label="商户" prop="mchId">
 						<select-mch v-model="queryForm.mchId" autoFirst placeholder="请选择商户" />
@@ -22,15 +22,15 @@
 				</el-row>
 			</el-form>
 
-			<el-alert v-if="merchantId && !state.mchDetail.functionScope.tableReservation" class="mb8" type="warning"
+			<el-alert v-if="merchantId && !state.mchDetail.functionScope.tableReservation" class="mb8 shrink-0" type="warning"
 				show-icon :closable="false" title="该商户未开通定餐功能，开通定餐后才能新增预约规则" />
 
 			<time-window-rule-table v-if="merchantId && effectiveMode === RESERVE_MODE.TIME_WINDOW" ref="ruleTableRef"
-				paginated highlight-window-groups :mch-id="merchantId" :dept-id="state.mchDetail.deptId"
+				paginated highlight-window-groups fit-height :mch-id="merchantId" :dept-id="state.mchDetail.deptId"
 				:window-expired="queryForm.windowExpired"
 				:disabled="!state.mchDetail.functionScope.tableReservation" />
 			<cycle-rule-list v-else-if="merchantId && effectiveMode === RESERVE_MODE.WEEKLY_CYCLE" ref="ruleTableRef"
-				hide-search :mch-id="merchantId" :dept-id="state.mchDetail.deptId"
+				hide-search fit-height :mch-id="merchantId" :dept-id="state.mchDetail.deptId"
 				:disabled="!state.mchDetail.functionScope.tableReservation" />
 			<el-empty v-else description="请先选择商户，再管理预约时间规则" />
 		</div>
diff --git a/vite.config.ts b/vite.config.ts
index b95874cd..bce6754d 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -23,6 +23,7 @@ const alias: Record<string, string> = {
 
 const viteConfig = defineConfig((mode: ConfigEnv) => {
 	const env = loadEnv(mode.mode, process.cwd())
+	console.log(env)
 	// 判断是否开发环境
 	const isDev = env.ENV === "development"
 	const isServe = mode.command === "serve"