From c940cee886cceaf22e9a76e49103fb8dbc1de63a Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Tue, 1 Jul 2025 15:31:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=BA=E6=9E=84=E5=8A=A0?=
=?UTF-8?q?=E7=9B=9F/=E4=BF=A1=E6=81=AF=E5=8F=98=E6=9B=B4=E6=98=BE?=
=?UTF-8?q?=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env | 58 +++++++--------
.env.production | 74 +++++++++----------
.../components/OrgApplyInfoForm.vue | 9 ++-
.../biz/orgmodifyinfo/OrgModifyInfoList.vue | 8 +-
.../components/OrgHistoryForm.vue | 5 ++
.../components/OrgModifyInfoForm.vue | 18 +++--
6 files changed, 95 insertions(+), 77 deletions(-)
diff --git a/.env b/.env
index d302bcc..3313b72 100644
--- a/.env
+++ b/.env
@@ -1,38 +1,12 @@
#>>>>【运维】<<<
-# # port
-# VITE_PORT = 3100
-
-# # 网站标题
-# VITE_GLOB_APP_TITLE = 运维平台
-
-# # 简称，此变量只能是字符/下划线
-# VITE_GLOB_APP_SHORT_NAME = 运维平台
-
-# # 单点登录服务端地址
-# VITE_GLOB_APP_CAS_BASE_URL=http://cas.test.com:8443/cas
-
-# # 是否开启单点登录
-# VITE_GLOB_APP_OPEN_SSO = false
-
-# # 开启微前端模式
-# VITE_GLOB_APP_OPEN_QIANKUN=true
-
-# # 文件预览地址
-# VITE_GLOB_ONLINE_VIEW_URL=http://fileview.jeecg.com/onlinePreview
-
-
-# =========================================================================================================
-# =========================================================================================================
-
-#>>>>【运营】<<<
# port
VITE_PORT = 3100
# 网站标题
-VITE_GLOB_APP_TITLE = 运营平台
+VITE_GLOB_APP_TITLE = 运维平台
# 简称，此变量只能是字符/下划线
-VITE_GLOB_APP_SHORT_NAME = 运营平台
+VITE_GLOB_APP_SHORT_NAME = 运维平台
# 单点登录服务端地址
VITE_GLOB_APP_CAS_BASE_URL=http://cas.test.com:8443/cas
@@ -44,4 +18,30 @@ VITE_GLOB_APP_OPEN_SSO = false
VITE_GLOB_APP_OPEN_QIANKUN=true
# 文件预览地址
-VITE_GLOB_ONLINE_VIEW_URL=http://fileview.jeecg.com/onlinePreview
\ No newline at end of file
+VITE_GLOB_ONLINE_VIEW_URL=http://fileview.jeecg.com/onlinePreview
+
+
+# =========================================================================================================
+# =========================================================================================================
+
+#>>>>【运营】<<<
+# # port
+# VITE_PORT = 3100
+
+# # 网站标题
+# VITE_GLOB_APP_TITLE = 运营平台
+
+# # 简称，此变量只能是字符/下划线
+# VITE_GLOB_APP_SHORT_NAME = 运营平台
+
+# # 单点登录服务端地址
+# VITE_GLOB_APP_CAS_BASE_URL=http://cas.test.com:8443/cas
+
+# # 是否开启单点登录
+# VITE_GLOB_APP_OPEN_SSO = false
+
+# # 开启微前端模式
+# VITE_GLOB_APP_OPEN_QIANKUN=true
+
+# # 文件预览地址
+# VITE_GLOB_ONLINE_VIEW_URL=http://fileview.jeecg.com/onlinePreview
\ No newline at end of file
diff --git a/.env.production b/.env.production
index e01bbed..226468c 100644
--- a/.env.production
+++ b/.env.production
@@ -1,44 +1,9 @@
#>>>>【运维】<<<
-# # 是否启用mock
-# VITE_USE_MOCK = false
-
-# # 发布路径
-# VITE_PUBLIC_PATH = /devops
-
-# # 是否启用gzip或brotli压缩
-# # 选项值: gzip | brotli | none
-# # 如果需要多个可以使用“,”分隔
-# VITE_BUILD_COMPRESS = 'gzip'
-
-# # 使用压缩时是否删除原始文件，默认为false
-# VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
-
-# #后台接口父地址(必填)
-# VITE_GLOB_API_URL=/nursingunit
-
-# #后台接口全路径地址(必填)
-# VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit
-
-# # 接口父路径前缀
-# VITE_GLOB_API_URL_PREFIX=
-
-# # 试验田机构编码
-# VITE_SYTJGBM = '101'
-
-# 填写后将作为乾坤子应用启动，主应用注册时AppName需保持一致（放开 VITE_GLOB_QIANKUN_MICRO_APP_NAME 参数表示jeecg-vue3将以乾坤子应用模式启动）
-#VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3
-# 作为乾坤子应用启动时必填，需与qiankun主应用注册子应用时填写的 entry 保持一致
-#VITE_GLOB_QIANKUN_MICRO_APP_ENTRY=//qiankun.boot3.jeecg.com/jeecg-vue3
-
-# =========================================================================================================
-# =========================================================================================================
-
-#>>>>【运营】<<<
# 是否启用mock
VITE_USE_MOCK = false
# 发布路径
-VITE_PUBLIC_PATH = /ope
+VITE_PUBLIC_PATH = /devops
# 是否启用gzip或brotli压缩
# 选项值: gzip | brotli | none
@@ -58,4 +23,39 @@ VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit
VITE_GLOB_API_URL_PREFIX=
# 试验田机构编码
-VITE_SYTJGBM = '101'
\ No newline at end of file
+VITE_SYTJGBM = '101'
+
+# 填写后将作为乾坤子应用启动，主应用注册时AppName需保持一致（放开 VITE_GLOB_QIANKUN_MICRO_APP_NAME 参数表示jeecg-vue3将以乾坤子应用模式启动）
+# VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3
+# 作为乾坤子应用启动时必填，需与qiankun主应用注册子应用时填写的 entry 保持一致
+# VITE_GLOB_QIANKUN_MICRO_APP_ENTRY=//qiankun.boot3.jeecg.com/jeecg-vue3
+
+# =========================================================================================================
+# =========================================================================================================
+
+#>>>>【运营】<<<
+# # 是否启用mock
+# VITE_USE_MOCK = false
+
+# # 发布路径
+# VITE_PUBLIC_PATH = /ope
+
+# # 是否启用gzip或brotli压缩
+# # 选项值: gzip | brotli | none
+# # 如果需要多个可以使用“,”分隔
+# VITE_BUILD_COMPRESS = 'gzip'
+
+# # 使用压缩时是否删除原始文件，默认为false
+# VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
+
+# #后台接口父地址(必填)
+# VITE_GLOB_API_URL=/nursingunit
+
+# #后台接口全路径地址(必填)
+# VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit
+
+# # 接口父路径前缀
+# VITE_GLOB_API_URL_PREFIX=
+
+# # 试验田机构编码
+# VITE_SYTJGBM = '101'
\ No newline at end of file
diff --git a/src/views/biz/orgapplyinfo/components/OrgApplyInfoForm.vue b/src/views/biz/orgapplyinfo/components/OrgApplyInfoForm.vue
index 98ffd18..1cb6288 100644
--- a/src/views/biz/orgapplyinfo/components/OrgApplyInfoForm.vue
+++ b/src/views/biz/orgapplyinfo/components/OrgApplyInfoForm.vue
@@ -118,8 +118,13 @@
- {{ formData.orgProvince_dictText + formData.orgCity_dictText + formData.orgDistrict_dictText
- }}
+
+ {{
+ formData.orgProvince_dictText
+ + (!!formData.orgCity_dictText || '')
+ + (!!formData.orgDistrict_dictText || '')
+ }}
+
diff --git a/src/views/biz/orgmodifyinfo/OrgModifyInfoList.vue b/src/views/biz/orgmodifyinfo/OrgModifyInfoList.vue
index a191f5c..e3627f4 100644
--- a/src/views/biz/orgmodifyinfo/OrgModifyInfoList.vue
+++ b/src/views/biz/orgmodifyinfo/OrgModifyInfoList.vue
@@ -190,10 +190,10 @@ function handleAudit(record) {
*/
function getTableAction(record) {
return [
- {
- label: '详情',
- onClick: handleDetail.bind(null, record),
- },
+ // {
+ // label: '详情',
+ // onClick: handleDetail.bind(null, record),
+ // },
{
label: '审批',
onClick: handleAudit.bind(null, record),
diff --git a/src/views/biz/orgmodifyinfo/components/OrgHistoryForm.vue b/src/views/biz/orgmodifyinfo/components/OrgHistoryForm.vue
index 71a4efa..565b48d 100644
--- a/src/views/biz/orgmodifyinfo/components/OrgHistoryForm.vue
+++ b/src/views/biz/orgmodifyinfo/components/OrgHistoryForm.vue
@@ -107,6 +107,11 @@ const filteredTableData = computed(() => {
&& item.d1 !== 'orgCoordinateLo'
&& item.d1 !== 'orgCoordinateLa'
&& item.d1 !== 'modifyStatus'
+ && item.d1 !== 'orgBuildingNumber'
+ && item.d1 !== 'commitTime'
+ && item.d1 !== 'auditTime'
+ && item.d1 !== 'franchiseTime'
+
);
});
diff --git a/src/views/biz/orgmodifyinfo/components/OrgModifyInfoForm.vue b/src/views/biz/orgmodifyinfo/components/OrgModifyInfoForm.vue
index 79a31fa..2b2ed80 100644
--- a/src/views/biz/orgmodifyinfo/components/OrgModifyInfoForm.vue
+++ b/src/views/biz/orgmodifyinfo/components/OrgModifyInfoForm.vue
@@ -51,7 +51,8 @@
-
+
未入驻
已入驻
@@ -137,7 +138,8 @@
-
+
@@ -157,8 +159,13 @@
- {{ formData.orgProvince_dictText + formData.orgCity_dictText + formData.orgDistrict_dictText
- }}
+
+ {{
+ formData.orgProvince_dictText
+ + (!!formData.orgCity_dictText || '')
+ + (!!formData.orgDistrict_dictText || '')
+ }}
+
@@ -194,7 +201,8 @@
-
+