From 15e356b2ce05e85eafa718a9777cd76812688b4f Mon Sep 17 00:00:00 2001
From: yangzhq68909 <993367776@qq.com>
Date: Fri, 23 May 2025 18:09:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E5=81=87=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env/.env.development                    |  4 ++--
 src/api/system/user.ts                  | 11 +++++++++-
 src/pages-humanResource/absence/add.vue | 28 +++++++++++++++++++++++--
 3 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/env/.env.development b/env/.env.development
index 4451dc4..44dd13a 100644
--- a/env/.env.development
+++ b/env/.env.development
@@ -4,5 +4,5 @@ NODE_ENV = 'development'
 VITE_DELETE_CONSOLE = false
 # 是否开启sourcemap
 VITE_SHOW_SOURCEMAP = true
-#VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot'
-VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot'
\ No newline at end of file
+VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot'
+#VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot'
\ No newline at end of file
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index f1fe650..fecb88a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -20,10 +20,19 @@ export function queryPostByUserIdApi(userid : string) {
  * @param config 用户信息
  * @returns
  */
-export function editUserApi(config) {
+export function editUserApi(config : object) {
 	return http({
 		url: '/sys/user/appEdit',
 		method: 'PUT',
 		data: config
 	});
+}
+
+/*根据部门Cod和角色Id查询用户信息*/
+export function queryUserByOrgRoleApi(config : object) { 
+	return http({
+		url: '/cxcChangesInPersonnel/cxcChangesInPersonnel/queryByDepCodRoleId',
+		method: 'GET',
+		data: config
+	})
 }
\ No newline at end of file
diff --git a/src/pages-humanResource/absence/add.vue b/src/pages-humanResource/absence/add.vue
index 7a44c43..69388f6 100644
--- a/src/pages-humanResource/absence/add.vue
+++ b/src/pages-humanResource/absence/add.vue
@@ -27,6 +27,8 @@
 					: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="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"
 					:rules="[{ required: true, message: '请输入出发地' }]" />
 				<wd-input label="目的地" prop="destination" v-model="model.destination"
@@ -64,7 +66,8 @@
 		queryHisDateApi
 	} from '@/api/humanResource/absence'
 	import {
-		queryPostByUserIdApi
+		queryPostByUserIdApi,
+		queryUserByOrgRoleApi
 	} from '@/api/system/user'
 	import {
 		getEnvBaseUrl
@@ -86,6 +89,8 @@
 		begintime: null,
 		endtime: null,
 		examineleader: '',
+		hr: '',
+		teamleader: '',
 		departure: appStore.location,
 		destination: '',
 		reason: '',
@@ -95,6 +100,7 @@
 	const data = ref([])
 	const typeData = ref([])
 	const examineleaderData = ref([])
+	const hrData = ref([])
 	/**判断显示审批 / 分管领导*/
 	const examineleader = ref('')
 	const zwmc = ref('')
@@ -161,6 +167,7 @@
 			errors
 		}) => {
 			if (valid) {
+				console.log('----',model)
 				const submitData = {
 					...model,
 					type: model.type[model.type.length - 1], // 取最后一级
@@ -196,7 +203,7 @@
 
 	const startMutilProcess = (id) => {
 		startMutilProcessApi({
-			flowCode: "dev_cxc_qxj",
+			flowCode: "dev_cxc_qxj_new",
 			id,
 			formUrl: "modules/qxj/modules/CxcQxjBpmModel",
 			formUrlMobile: "leaveApplication"
@@ -330,11 +337,28 @@
 		minEndtime.value = model.begintime
 	}
 
+	const getHrList = () => {
+		queryUserByOrgRoleApi({
+			roleId: '1554379432313397250',
+			orgCode: userStore.userInfo.orgCode
+		}).then(res => {
+			model.hr = res.result[0].username
+			hrData.value = res.result.map(item => {
+				return {
+					label: item.realname,
+					value: item.username
+				}
+			})
+		})
+	}
+
 	onLoad(() => {
 		/*获取请假类别*/
 		getTypeList()
 		/*获取审批领导*/
 		getZwmcAndExa()
+		/*获取劳资员*/
+		getHrList()
 		/*获取*/
 		queryHisDate()
 	});