From 8dd460b322d3d4a9db37a11070b6f6c06dafbcac Mon Sep 17 00:00:00 2001
From: yangzhq68909 <993367776@qq.com>
Date: Fri, 27 Jun 2025 17:58:10 +0800
Subject: [PATCH 1/2] 1

---
 env/.env.development      | 2 +-
 src/pages/login/login.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/env/.env.development b/env/.env.development
index 77103c3..f347345 100644
--- a/env/.env.development
+++ b/env/.env.development
@@ -7,7 +7,7 @@ VITE_SHOW_SOURCEMAP = true
 # 是否启用读取配置文件 min
 #VITE_WEBAPP = 'D://opt//AppUpdateTest'
 VITE_WEBAPP = ''
-VITE_SERVER_BASEURL = 'http://10.75.15.246: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'
 
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 72d8ac9..d1cbda1 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

From 512a83984ba900190ceaec432f15cda974d0e8cd Mon Sep 17 00:00:00 2001
From: yangzhq68909 <993367776@qq.com>
Date: Fri, 11 Jul 2025 08:54:55 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AF=B7=E5=81=87=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env/.env                                |  2 +-
 src/api/system/department.ts            |  7 ++++++
 src/manifest.json                       |  2 +-
 src/pages-humanResource/absence/add.vue | 29 ++++++++++++++++++-------
 src/pages/login/login.vue               |  4 ++--
 5 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/env/.env b/env/.env
index 5a3c17e..8a9e6a3 100644
--- a/env/.env
+++ b/env/.env
@@ -1,4 +1,4 @@
-VITE_APP_TITLE = '数智产销测试'
+VITE_APP_TITLE = '数智产销'
 VITE_APP_PORT = 9000
 
 VITE_UNI_APPID = '__UNI__9F097F0'
diff --git a/src/api/system/department.ts b/src/api/system/department.ts
index 0ac1052..695e224 100644
--- a/src/api/system/department.ts
+++ b/src/api/system/department.ts
@@ -32,4 +32,11 @@ export function queryMyDeptTreeListApi(config : object) { // 部门
 		method: 'GET',
 		data: config
 	})
+}
+
+export function queryDepNameRealApi() { // 获取单位 优先借用单位、储备单位
+	return http({
+		url: '/sys/sysDepart/queryDepNameReal',
+		method: 'GET'
+	})
 }
\ No newline at end of file
diff --git a/src/manifest.json b/src/manifest.json
index 7affead..6d3cf2a 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,5 +1,5 @@
 {
-  "name": "数智产销测试",
+  "name": "数智产销",
   "appid": "__UNI__9F097F0",
   "description": "",
   "versionName": "2.1.0",
diff --git a/src/pages-humanResource/absence/add.vue b/src/pages-humanResource/absence/add.vue
index 47d59ee..8397768 100644
--- a/src/pages-humanResource/absence/add.vue
+++ b/src/pages-humanResource/absence/add.vue
@@ -11,12 +11,9 @@
 	<PageLayout navTitle="请假申请">
 		<wd-form ref="form" :model="model">
 			<wd-cell-group border>
-				<wd-input label="职工姓名" prop="username" v-model="userStore.userInfo.realname" readonly
-					:rules="[{ required: true, message: '请输入职工姓名' }]" />
-				<wd-input label="工作单位" prop="sysOrgCode" v-model="userStore.userInfo.department" readonly
-					:rules="[{ required: true, message: '请输入工作单位' }]" />
-				<wd-input label="联系方式" prop="phone" v-model="model.phone" readonly
-					:rules="[{ required: true, message: '请输入联系方式' }]" />
+				<wd-input label="职工姓名" prop="username" v-model="userStore.userInfo.realname" readonly/>
+				<wd-input label="工作单位" prop="sysOrgCode" v-model="depart.name" readonly/>
+				<wd-input label="联系方式" prop="phone" v-model="model.phone" readonly/>
 				<wd-col-picker label="请假类型" prop="type" v-model="model.type" :columns="typeData" @confirm="queryMinDate"
 					:column-change="columnChange" :display-format="displayFormat" :rules="[{
 					    validator: (val) => validateType(val),
@@ -60,6 +57,9 @@
 	import {
 		getCategoryItemsApi
 	} from '@/api/system'
+	import {
+		queryDepNameRealApi
+	} from '@/api/system/department'
 	import {
 		queryZwmcAndExaApi,
 		addApi,
@@ -80,6 +80,7 @@
 	const toast = useToast()
 	const appStore = useAppStore();
 	const userStore = useUserStore();
+	const depart = ref({})
 	const model = reactive({
 		contractNumber: userStore.userInfo.workNo,
 		sysOrgCode: userStore.userInfo.orgCode,
@@ -166,6 +167,7 @@
 			if (valid) {
 				const submitData = {
 					...model,
+					sysOrgCode: depart.value.code,
 					type: model.type[model.type.length - 1], // 取最后一级
 					begintime: formatDate(model.begintime),
 					endtime: formatDate(model.endtime),
@@ -182,6 +184,7 @@
 					})
 					.then(() => {
 						loading.value = true
+						console.log('*---',submitData)
 						addApi(submitData).then(res => {
 							if (res.success) {
 								startMutilProcess(res.message)
@@ -328,10 +331,10 @@
 		minEndtime.value = model.begintime
 	}
 
-	const getHrList = () => {
+	const getHrList = (code) => {
 		queryUserByOrgRoleApi({
 			roleId: '1554379432313397250',
-			orgCode: userStore.userInfo.orgCode
+			orgCode: code
 		}).then(res => {
 			if (res.result.length == 0) {
 				toast.warning('请切换工作单位!')
@@ -350,11 +353,21 @@
 		})
 	}
 
+	const queryDepName = () => {
+		queryDepNameRealApi().then(res => {
+			depart.value = res
+			/*获取劳资员*/
+			getHrList(depart.value.code)
+		})
+	}
+
 	onLoad(() => {
 		/*获取请假类别*/
 		getTypeList()
 		/*获取审批领导*/
 		getZwmcAndExa()
+		/*获取工作单位*/
+		queryDepName()
 		/*获取劳资员*/
 		getHrList()
 		/*获取*/
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index d1cbda1..72d8ac9 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