Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_vue

修改机构加盟/信息变更显示bug
2025-07-01 15:31:41 +08:00 · 2025-07-01 15:31:31 +08:00
6 changed files with 95 additions and 77 deletions
--- 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
+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
--- 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'
+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'
--- a/src/views/biz/orgapplyinfo/components/OrgApplyInfoForm.vue
+++ b/src/views/biz/orgapplyinfo/components/OrgApplyInfoForm.vue
@ -118,8 +118,13 @@
            </a-col>
            <a-col :span="12">
              <a-form-item label="机构所在地">
-                <span>{{ formData.orgProvince_dictText + formData.orgCity_dictText + formData.orgDistrict_dictText
-                }}</span>
+                <span>
+                  {{
+                    formData.orgProvince_dictText
+                    + (!!formData.orgCity_dictText || '')
+                    + (!!formData.orgDistrict_dictText || '')
+                  }}
+                </span>
              </a-form-item>
            </a-col>
            <a-col :span="12">
--- 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),
--- 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'
+
    );
 });

--- a/src/views/biz/orgmodifyinfo/components/OrgModifyInfoForm.vue
+++ b/src/views/biz/orgmodifyinfo/components/OrgModifyInfoForm.vue
@ -51,7 +51,8 @@
              </a-form-item>
            </a-col>
            <a-col :span="12">
-              <a-form-item label="机构是否完成入驻" v-bind="validateInfos.izEntry" id="OrgModifyInfoForm-izEntry" name="izEntry">
+              <a-form-item label="机构是否完成入驻" v-bind="validateInfos.izEntry" id="OrgModifyInfoForm-izEntry"
+                name="izEntry">
                <a-select v-model:value="formData.izEntry" placeholder="请选择机构是否入驻" allowClear>
                  <a-select-option value="0">未入驻</a-select-option>
                  <a-select-option value="1">已入驻</a-select-option>
@ -137,7 +138,8 @@
            <a-col :span="12">
              <a-form-item label="企业注册地址" v-bind="validateInfos.comRegisterAddress"
                id="OrgModifyInfoForm-comRegisterAddress" name="comRegisterAddress">
-                <a-textarea v-model:value="formData.comRegisterAddress" placeholder="请输入企业注册地址" allow-clear></a-textarea>
+                <a-textarea v-model:value="formData.comRegisterAddress" placeholder="请输入企业注册地址"
+                  allow-clear></a-textarea>
              </a-form-item>
            </a-col>
            <a-col :span="12">
@ -157,8 +159,13 @@
            </a-col>
            <a-col :span="12">
              <a-form-item label="机构所在地">
-                <span>{{ formData.orgProvince_dictText + formData.orgCity_dictText + formData.orgDistrict_dictText
-                }}</span>
+                <span>
+                  {{
+                    formData.orgProvince_dictText
+                    + (!!formData.orgCity_dictText || '')
+                    + (!!formData.orgDistrict_dictText || '')
+                  }}
+                </span>
              </a-form-item>
            </a-col>
            <a-col :span="12">
@ -194,7 +201,8 @@
            <a-col :span="12">
              <a-form-item label="机构建筑面积" v-bind="validateInfos.orgBuildingArea" id="OrgModifyInfoForm-orgBuildingArea"
                name="orgBuildingArea">
-                <a-input v-model:value="formData.orgBuildingArea" placeholder="请输入机构建筑面积" addon-after="平方米" style="width: 100%" />
+                <a-input v-model:value="formData.orgBuildingArea" placeholder="请输入机构建筑面积" addon-after="平方米"
+                  style="width: 100%" />
              </a-form-item>
            </a-col>
          </a-row>
Author	SHA1	Message	Date
1378012178@qq.com	af1878cee5	Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_vue	2025-07-01 15:31:41 +08:00
1378012178@qq.com	c940cee886	修改机构加盟/信息变更显示bug	2025-07-01 15:31:31 +08:00