From e217744880184595eef3a94d86b28ab790359392 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Tue, 10 Feb 2026 16:08:30 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=AE=A1=E7=90=86=EF=BC=8C=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=AE=A1=E6=89=B9=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../employeesapply/components/EmployeesApplyDetailForm.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/admin/employeesapply/components/EmployeesApplyDetailForm.vue b/src/views/admin/employeesapply/components/EmployeesApplyDetailForm.vue
index 64b6313..2de4683 100644
--- a/src/views/admin/employeesapply/components/EmployeesApplyDetailForm.vue
+++ b/src/views/admin/employeesapply/components/EmployeesApplyDetailForm.vue
@@ -270,7 +270,7 @@
                 <!-- <a-input v-model:value="formData.applyStatus" placeholder="请输入审核状态"  ></a-input> -->
                 <a-select v-model:value="formData.status" placeholder="请选择审核状态" style="width: 200px"
                           :disabled="false">
-                  <a-select-option value="2">待审核</a-select-option>
+                  <a-select-option value="1">待审核</a-select-option>
                   <a-select-option value="2">审核通过</a-select-option>
                   <a-select-option value="3">审核驳回</a-select-option>
                 </a-select>

From 7d4df94d86f8f84ac003895f90cef9442daee89f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Tue, 10 Feb 2026 16:22:42 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=AE=A1=E7=90=86=EF=BC=8C=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=AE=A1=E6=89=B9=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../employeesapply/components/EmployeesApplyHistoryForm.vue    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/admin/employeesapply/components/EmployeesApplyHistoryForm.vue b/src/views/admin/employeesapply/components/EmployeesApplyHistoryForm.vue
index eb92c0f..887c6b3 100644
--- a/src/views/admin/employeesapply/components/EmployeesApplyHistoryForm.vue
+++ b/src/views/admin/employeesapply/components/EmployeesApplyHistoryForm.vue
@@ -51,6 +51,7 @@
             <a-col :span="12">
               <a-form-item label="审核状态" name="status" v-bind="validateInfos.status">
                 <a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审核状态">
+                  <a-select-option value="pending">待审核</a-select-option>
                   <a-select-option value="modifyPass">审核通过</a-select-option>
                   <a-select-option value="modifyFail">审核驳回</a-select-option>
                 </a-select>
@@ -203,6 +204,8 @@ async function show(record) {
     formData.status = 'modifyFail'
   }else if(record.status == '2'){
     formData.status = 'modifyPass'
+  }else if(record.status == '1'){
+    formData.status = 'pending'
   }
   formData.auditContent = record.auditContent
   // 存储id和pkId到formData

From 0e1ed4190b8a12c1216c3be6c9fccc7c0c9f4e6b Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 11 Feb 2026 09:18:24 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/NuConfigSuppliersApplyHistoryForm.vue         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyHistoryForm.vue b/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyHistoryForm.vue
index 9801d9b..2770bce 100644
--- a/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyHistoryForm.vue
+++ b/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyHistoryForm.vue
@@ -51,6 +51,7 @@
             <a-col :span="12">
               <a-form-item label="审核状态" name="status" v-bind="validateInfos.status">
                 <a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审核状态">
+                  <a-select-option value="modifyStatus">待审核</a-select-option>
                   <a-select-option value="modifyPass">审核通过</a-select-option>
                   <a-select-option value="modifyFail">审核驳回</a-select-option>
                 </a-select>
@@ -172,8 +173,10 @@ async function show(record) {
 
 if(record.applyStatus == '5' || record.applyStatus == '3'){
   formData.status = 'modifyFail'
-}else if(record.applyStatus == '4' || record.applyStatus == '2'){
+}else if(record.applyStatus == '2'){
   formData.status = 'modifyPass'
+}else if(record.applyStatus == '4'){
+  formData.status = 'modifyStatus'
 }
   formData.applyContent = record.applyContent
   

From 962a4a5c78ecc5be317ad35942c272c3f0a19179 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 11 Feb 2026 15:48:07 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                                              | 2 +-
 src/components/Form/src/jeecg/components/JImageUploadtz.vue   | 4 ++--
 .../services/serviceDirective/ConfigServiceDirectiveList.vue  | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.env.development b/.env.development
index 436c5cd..f1fb35f 100644
--- a/.env.development
+++ b/.env.development
@@ -9,7 +9,7 @@ VITE_PUBLIC_PATH = /
 VITE_PROXY = [["/nursing-unit_101","http://localhost:8091/nursing-unit_101"],["/upload","http://localhost:3300/upload"],["/opeexup","http://localhost:8081/opeapi/"],["/opemedia","https://www.focusnu.com/media101/upFiles101"]]
 
 #后台接口全路径地址(必填)
-VITE_GLOB_DOMAIN_URL=http://localhost:8091/nursing-unit_101
+VITE_GLOB_DOMAIN_URL=http://localhost:3103/nursing-unit_101
 
 #后台接口父地址(必填)
 VITE_GLOB_API_URL=/nursing-unit_101
diff --git a/src/components/Form/src/jeecg/components/JImageUploadtz.vue b/src/components/Form/src/jeecg/components/JImageUploadtz.vue
index 84da3d9..c39ddb0 100644
--- a/src/components/Form/src/jeecg/components/JImageUploadtz.vue
+++ b/src/components/Form/src/jeecg/components/JImageUploadtz.vue
@@ -38,9 +38,9 @@
           <img v-if="!!file?.response?.message" :src="opeMediaAddress + file?.response?.message" style="width: 200px; height: 200px;"></img>
           <img v-else :src="file.url ? opeMediaAddress + file.url : file.r" style="width: 200px; height: 200px;">
         </div>
-        <div style="margin-top: 20px;">
+        <!-- <div style="margin-top: 20px;">
           {{ file.name }}
-        </div>
+        </div> -->
         <div style="margin-top: 20px;" v-if="!disabled">
           <!-- <a-button type="link" @click="handlePreview(file)">预览</a-button> -->
           <a-button type="link" danger @click="removeFile(index)" v-if="!props.disabled">删除</a-button>
diff --git a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
index 3c0ebd5..0e15255 100644
--- a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
+++ b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
@@ -256,6 +256,9 @@
         <BasicTable @register="registerTable">
           <!--插槽:table标题-->
           <template #tableTitle>
+            <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        
             <a-button type="primary" @click="directiveSyncCodeMangeFunc" v-show="!!ownOrgCode"
               preIcon="ant-design:setting-outlined">镜像码管理</a-button>
             <a-button type="primary" @click="handleDirectiveMainOpen" preIcon="ant-design:profile-outlined">