From 5e55f68ae3ae16dc00fefd78b77aa687edcf7158 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 17 Feb 2025 18:32:30 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=AE=B5=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                         | 8 ++++----
 src/components/DepTree/index.vue         | 8 +-------
 src/views/hard/hard-order/index.vue      | 5 +++++
 src/views/hard/hard-sb/index.vue         | 5 +++++
 src/views/hard/hard-sh/index.vue         | 5 +++++
 src/views/wallet/wallet-active/index.vue | 2 +-
 6 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/.env.development b/.env.development
index 6480b17..06c6a70 100644
--- a/.env.development
+++ b/.env.development
@@ -8,18 +8,18 @@ VITE_OPEN = true
 ENV = 'development'
 
 # ADMIN 服务地址
-VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 线上
+# VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 线上
 # VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/
 # VITE_ADMIN_PROXY_PATH = http://localhost:9999/
-# VITE_ADMIN_PROXY_PATH = http://192.168.101.50:9999/ # 邓-本地
+VITE_ADMIN_PROXY_PATH = http://192.168.101.50:9999/ # 邓-本地
 # VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境
 
 
 # 图片访问基础地址
-VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api # 线上
+# VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api # 线上
 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc
 # VITE_IMAGE_BASE_PATH = http://localhost:9999
-# VITE_IMAGE_BASE_PATH = http://192.168.101.50:9999 # 邓-本地
+VITE_IMAGE_BASE_PATH = http://192.168.101.50:9999 # 邓-本地
 # VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境
 
 # 代码生成服务地址
diff --git a/src/components/DepTree/index.vue b/src/components/DepTree/index.vue
index b107500..ec67555 100644
--- a/src/components/DepTree/index.vue
+++ b/src/components/DepTree/index.vue
@@ -3,13 +3,7 @@
 		<!-- 头部区域 -->
 		<div class="container-header">
 			<div class="container-header-input">
-				<el-input
-					v-model="searchName"
-					suffix-icon="search"
-					:placeholder="placeholder"
-					clearable
-					@change="getTreeData"
-				/>
+				<el-input v-model="searchName" suffix-icon="search" :placeholder="placeholder" clearable @change="getTreeData" />
 			</div>
 			<div class="container-header-dropdown" v-if="showExpand">
 				<el-dropdown :hide-on-click="false">
diff --git a/src/views/hard/hard-order/index.vue b/src/views/hard/hard-order/index.vue
index 767c816..680191b 100644
--- a/src/views/hard/hard-order/index.vue
+++ b/src/views/hard/hard-order/index.vue
@@ -18,6 +18,11 @@
 							<select-dept v-model="state.queryForm.deptIdIdDeepen" />
 						</el-form-item>
 					</el-col>
+					<el-col :span="4">
+						<el-form-item class="w100" label="用餐时间段" prop="hourType">
+							<dict-select v-model="state.queryForm.hourType" dict-code="daily_menu" />
+						</el-form-item>
+					</el-col>
 					<el-col :span="5">
 						<el-form-item class="w100" label="创建时间" prop="payTimeList">
 							<el-date-picker v-model="state.queryForm.payTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
diff --git a/src/views/hard/hard-sb/index.vue b/src/views/hard/hard-sb/index.vue
index f4b6144..05e22cf 100644
--- a/src/views/hard/hard-sb/index.vue
+++ b/src/views/hard/hard-sb/index.vue
@@ -3,6 +3,11 @@
 		<div class="layout-padding-auto layout-padding-view">
 			<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
 				<el-row :gutter="24">
+					<el-col :span="4">
+						<el-form-item class="w100" label="用餐时间段" prop="hourType">
+							<dict-select v-model="state.queryForm.hourType" dict-code="daily_menu" />
+						</el-form-item>
+					</el-col>
 					<el-col :span="5">
 						<el-form-item class="w100" label="创建时间" prop="payTimeList">
 							<el-date-picker v-model="state.queryForm.payTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
diff --git a/src/views/hard/hard-sh/index.vue b/src/views/hard/hard-sh/index.vue
index 6387d16..9203213 100644
--- a/src/views/hard/hard-sh/index.vue
+++ b/src/views/hard/hard-sh/index.vue
@@ -3,6 +3,11 @@
 		<div class="layout-padding-auto layout-padding-view">
 			<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
 				<el-row :gutter="24">
+					<el-col :span="4">
+						<el-form-item class="w100" label="用餐时间段" prop="hourType">
+							<dict-select v-model="state.queryForm.hourType" dict-code="daily_menu" />
+						</el-form-item>
+					</el-col>
 					<el-col :span="5">
 						<el-form-item class="w100" label="创建时间" prop="payTimeList">
 							<el-date-picker v-model="state.queryForm.payTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
diff --git a/src/views/wallet/wallet-active/index.vue b/src/views/wallet/wallet-active/index.vue
index 5b8c764..d621c41 100644
--- a/src/views/wallet/wallet-active/index.vue
+++ b/src/views/wallet/wallet-active/index.vue
@@ -77,7 +77,7 @@
 						<el-button
 							v-auth="'wallet_walletActive_refresh_active'"
 							v-if="row.isActiveHardware == 1"
-							icon="Postcard"
+							icon="RefreshRight"
 							text
 							type="primary"
 							@click="doRefreshAvatar(row)"