From 8645e1f1d6850e420e6e2ee1d11983e79d21c391 Mon Sep 17 00:00:00 2001
From: yangzhq68909 <993367776@qq.com>
Date: Mon, 9 Jun 2025 11:25:55 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=AF=B7=E5=81=87=E9=A2=86=E5=AF=BC=E5=B9=B2?=
 =?UTF-8?q?=E9=83=A8=E4=B8=8D=E5=86=8D=E9=80=89=E6=8B=A9=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?/=E5=88=86=E7=AE=A1=E9=A2=86=E5=AF=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env/.env.development                    |  4 ++--
 src/pages-humanResource/absence/add.vue | 12 ++----------
 src/pages/login/login.vue               |  4 ++--
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/env/.env.development b/env/.env.development
index c78f0dc..09ee786 100644
--- a/env/.env.development
+++ b/env/.env.development
@@ -4,6 +4,6 @@ NODE_ENV = 'development'
 VITE_DELETE_CONSOLE = false
 # 是否开启sourcemap
 VITE_SHOW_SOURCEMAP = true
-#VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot'
+VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot'
 #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot'
-VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot'
\ No newline at end of file
+#VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot'
\ No newline at end of file
diff --git a/src/pages-humanResource/absence/add.vue b/src/pages-humanResource/absence/add.vue
index 2405a10..9e3d463 100644
--- a/src/pages-humanResource/absence/add.vue
+++ b/src/pages-humanResource/absence/add.vue
@@ -25,8 +25,8 @@
 					:rules="[{ required: true, message: '请选择开始时间' }]" :min-date="minBegintime" />
 				<wd-calendar label="结束时间" prop="endtime" v-model="model.endtime"
 					:rules="[{ required: true, message: '请选择结束时间' }]" :min-date="minEndtime" />
-				<wd-picker :label="examineleader" prop="examineleader" v-model="model.examineleader"
-					:columns="examineleaderData" :rules="[{ required: true, message: '请选择' + examineleader }]" />
+				<wd-picker label="审批领导" prop="examineleader" v-model="model.examineleader" v-if="zwmc == '0'"
+					:columns="examineleaderData" :rules="[{ required: true, message: '请选择审批领导'}]" />
 				<wd-picker label="单位劳资员" prop="hr" v-model="model.hr" :columns="hrData" v-if="zwmc == '0'"/>
 				<SelectUser label="班组长" v-model="model.teamleader" isRadioSelection v-if="zwmc == '0'"></SelectUser>
 				<wd-input label="出发地" prop="departure" v-model="model.departure"
@@ -88,7 +88,6 @@
 		type: [], //用[]、0无法正常被验证  就是不选请假类型时也能通过表单验证 所以在form中使用自定义验证
 		begintime: null,
 		endtime: null,
-		examineleader: '',
 		hr: '',
 		teamleader: '',
 		departure: appStore.location,
@@ -101,8 +100,6 @@
 	const typeData = ref([])
 	const examineleaderData = ref([])
 	const hrData = ref([])
-	/**判断显示审批 / 分管领导*/
-	const examineleader = ref('')
 	const zwmc = ref('')
 	const ifOk = ref(true)
 	const minBegintime = ref(0)
@@ -251,11 +248,6 @@
 					}
 				})
 				zwmc.value = res.result.zwmc
-				if (zwmc.value == '2') {
-					examineleader.value = '分管领导';
-				} else {
-					examineleader.value = '审批领导';
-				}
 			} else {
 				toast.warning(res.message)
 				setTimeout(() => {
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 385a637..2e1ebfd 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -105,9 +105,9 @@
 		let pw = Base64.encode(encodeURIComponent(password.value))
 		loading.value = true
 		/*生产环境 begin */
-		loginApi({ username: un, password: pw })
+		// loginApi({ username: un, password: pw })
 			/*开发环境 begin */
-			// loginApi({ username: userName.value, password: password.value, captcha: 'app' })
+			loginApi({ username: userName.value, password: password.value, captcha: 'app' })
 			.then((res : any) => {
 				if (res.success) {
 					const { result } = res