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 @@ -
+
删除 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 @@ - 待审核 + 待审核 审核通过 审核驳回 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 @@ + 待审核 审核通过 审核驳回 @@ -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 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 @@ + 待审核 审核通过 审核驳回 @@ -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 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 @@