From 43c78904f3041216d8b256f148786bd4744b7d8e Mon Sep 17 00:00:00 2001
From: yangzhq68909 <993367776@qq.com>
Date: Mon, 24 Feb 2025 15:28:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E5=81=87=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/api.js                                    |   2 +-
 api/{pages.js => leaveApi.js}                 |   9 +
 bpm/leaveApplication/index.vue                |   2 +-
 pages.json                                    |   8 +
 pages/document/index.vue                      |   6 +-
 pages/leave/application.vue                   |   5 +-
 pages/tab/index.vue                           |   4 +-
 .../views/renliziyuan/qingjiaxinxi/index.vue  | 200 ++++++++++++++++++
 8 files changed, 225 insertions(+), 11 deletions(-)
 rename api/{pages.js => leaveApi.js} (82%)
 create mode 100644 pages/views/renliziyuan/qingjiaxinxi/index.vue

diff --git a/api/api.js b/api/api.js
index 7fd5110..f910e8d 100644
--- a/api/api.js
+++ b/api/api.js
@@ -72,7 +72,7 @@ export function indexChartScdtDataApi(config) { // 首页
 		data: config
 	})
 }
-export function bpmlistApi(config) { // 公文
+export function gongwenlistApi(config) { // 公文
 	return https({
 		url: '/cxcoagwfb/cxcOaGwfb/bpmlist',
 		method: 'get',
diff --git a/api/pages.js b/api/leaveApi.js
similarity index 82%
rename from api/pages.js
rename to api/leaveApi.js
index eb755bb..34e3f2c 100644
--- a/api/pages.js
+++ b/api/leaveApi.js
@@ -10,6 +10,7 @@ export function qjAddApi(config) { // 发起请假流程申请
 	})
 }
 
+
 export function queryZwmcAndExaApi(username) { // 根据username获取职位名称和审批领导列表
 	return https({
 		url: '/CxcQxj/cxcQxj/queryZwmcByUsername',
@@ -36,4 +37,12 @@ export function queryHisDateApi(username) { // 根据username获取最新请假
 			username
 		}
 	})
+}
+
+export function queryLeaveListApi(params) { // 获取所有请假信息
+	return https({
+		url: '/CxcQxj/cxcQxj/list',
+		method: 'get',
+		data: params
+	})
 }
\ No newline at end of file
diff --git a/bpm/leaveApplication/index.vue b/bpm/leaveApplication/index.vue
index 4a79283..3f41b56 100644
--- a/bpm/leaveApplication/index.vue
+++ b/bpm/leaveApplication/index.vue
@@ -110,7 +110,7 @@
 	} from '@/api/api.js';
 	import {
 		qjQueryByIdApi
-	} from '@/api/pages.js';
+	} from '@/api/leaveApi.js';
 	import {
 		ref,
 		onBeforeMount,
diff --git a/pages.json b/pages.json
index 52fd167..fc89fb0 100644
--- a/pages.json
+++ b/pages.json
@@ -233,6 +233,14 @@
 				"navigationBarTitleText": "人员年龄分组统计信息",
 				"navigationBarTextStyle": "white"
 
+			}
+		},
+		{
+			"path": "pages/views/renliziyuan/qingjiaxinxi/index",
+			"style": {
+				"navigationBarTitleText": "请假信息",
+				"navigationBarTextStyle": "white"
+		
 			}
 		}
 	],
diff --git a/pages/document/index.vue b/pages/document/index.vue
index a45bacd..9b76af9 100644
--- a/pages/document/index.vue
+++ b/pages/document/index.vue
@@ -52,7 +52,7 @@
 		onLoad
 	} from '@dcloudio/uni-app';
 	import {
-		bpmlistApi,
+		gongwenlistApi,
 		faguiApi,
 		zhiduApi,
 		gonggaolistApi,
@@ -62,7 +62,7 @@
 		useStore
 	} from '@/store';
 	const store = useStore();
-	import customNav from '../../bpm/customNav.vue';
+	import customNav from '@/bpm/customNav.vue';
 	import {
 		beforeJump,
 		opendocument
@@ -76,7 +76,7 @@
 	/**公文接口*/
 	const bpmlist = () => {
 		loading = true
-		bpmlistApi({
+		gongwenlistApi({
 			pageNo,
 			pageSize,
 			fwbt: formatSearchkey()
diff --git a/pages/leave/application.vue b/pages/leave/application.vue
index 97aa9ce..2819b41 100644
--- a/pages/leave/application.vue
+++ b/pages/leave/application.vue
@@ -111,7 +111,7 @@
 		qjAddApi,
 		queryZwmcAndExaApi,
 		queryHisDateApi
-	} from '@/api/pages.js';
+	} from '@/api/leaveApi.js';
 	import {
 		queryDepByCode,
 		queryZbDepByLdhth
@@ -178,7 +178,6 @@
 	}
 	onLoad(() => {
 		loadData()
-		// getTomorrowDate()
 	})
 
 	const select = (e) => {
@@ -278,10 +277,8 @@
 
 		queryHisDateApi(store.userinfo.username).then((res) => { // 最新请假结束日期
 			if (res) {
-				console.log('--0', res)
 				getTomorrowDate(res);
 			} else {
-				console.log('--1', res)
 				getTomorrowDate();
 			}
 		})
diff --git a/pages/tab/index.vue b/pages/tab/index.vue
index a6fdff6..e8751c9 100644
--- a/pages/tab/index.vue
+++ b/pages/tab/index.vue
@@ -135,7 +135,7 @@
 		// onReachBottom
 	} from '@dcloudio/uni-app';
 	import {
-		bpmlistApi,
+		gongwenlistApi,
 		gonggaolistApi,
 		zhibanApi,
 		faguiApi,
@@ -261,7 +261,7 @@
 	/**公文接口*/
 	const bpmlist = () => {
 		loading = true
-		bpmlistApi({
+		gongwenlistApi({
 			pageNo,
 			pageSize
 		}).then((res) => {
diff --git a/pages/views/renliziyuan/qingjiaxinxi/index.vue b/pages/views/renliziyuan/qingjiaxinxi/index.vue
new file mode 100644
index 0000000..c5a2846
--- /dev/null
+++ b/pages/views/renliziyuan/qingjiaxinxi/index.vue
@@ -0,0 +1,200 @@
+<template>
+	<view :class="['content',{'gray':store.isgray==1}]">
+		<uni-card>
+			<!-- <view style="maring: 0 30rpx;"> -->
+			<!-- 				<uni-row>
+					<uni-col :span="11">
+						<uni-title title="姓名" align="left" type="h5"></uni-title>
+					</uni-col> -->
+			<!-- 				<uni-col :span="11" :push="2">
+						<uni-title title="请假类别" align="left" type="h5"></uni-title>
+					</uni-col> -->
+			<!-- 				</uni-row>
+				<uni-row>
+					<uni-col :span="11">
+						<uni-easyinput v-model="xm" suffixIcon="search" clearable placeholder="姓名模糊查询" @change="Search"
+							@iconClick="Search" />
+					</uni-col>
+					<uni-col :span="11" :push="2"> -->
+			<!-- <tree-select :dataSource="dataSource" v-model="type" dataValue="name" /> -->
+			<!-- <uni-easyinput v-model="ldhth" suffixIcon="search" clearable 
+							@change="Search" @iconClick="Search" /> -->
+			<!-- 					</uni-col>
+				</uni-row>
+			</view> -->
+			<view style="maring: 0 30rpx;">
+				<uni-row>
+					<uni-col :span="24"><uni-title title="所属单位" align="left" type="h5"></uni-title></uni-col>
+				</uni-row>
+				<uni-row>
+					<uni-col :span="24">
+						<trq-depart-select v-model="orgCode" returnCodeOrID="orgCode"
+							@change="departChange"></trq-depart-select>
+					</uni-col>
+				</uni-row>
+			</view>
+		</uni-card>
+		<view class="list">
+			<view class="item" v-for="item,i in list" :key="i" @click="">
+				<view class="title">
+					{{item._sysOrgCode}}的{{item._username}}{{item._type}}申请
+				</view>
+				<view class="time_box f-row aic">
+					<view class="time">
+						{{item._begintime}}至{{item._endtime}}
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref
+	} from 'vue';
+	import {
+		onReachBottom,
+		onPullDownRefresh,
+		onLoad
+	} from '@dcloudio/uni-app';
+	import {
+		queryLeaveListApi
+	} from '@/api/leaveApi.js';
+	import {
+		getCategoryItemsApi
+	} from '@/api/api.js';
+	import {
+		useStore
+	} from '@/store';
+	// import treeSelect from "@/components/treeSelect/treeSelect.vue"
+	import {
+		beforeJump,
+		opendocument
+	} from '@/utils/index.js';
+	const orgCode = ref("") //部门树选中的orgCode
+	const store = useStore();
+	const list = ref([])
+	const dataSource = ref([])
+	const type = ref([])
+	let pageNo = 1
+	let pageSize = 15
+	let loading = false
+
+	onLoad(() => {
+		queryLeaveList()
+	})
+
+	const queryLeaveList = (params = {}) => {
+		list.value = []
+		loading = true
+		queryLeaveListApi({
+			...params,
+			pageNo,
+			pageSize
+		}).then((res) => {
+			if (res.success) {
+				list.value = [...list.value, ...formatObj(res.result.records, 'username_dictText', 'type',
+					'begintime', 'endtime', 'sysOrgCode_dictText')]
+			}
+			loading = false
+		}).catch((err) => {
+			console.log('err', err);
+		})
+	}
+	const formatObj = (arr, username, type, begintime, endtime, sysOrgCode) => {
+		arr.map((item) => {
+			item['_username'] = item[username]
+			item['_type'] = item[type]
+			item['_begintime'] = item[begintime]
+			item['_endtime'] = item[endtime]
+			item['_sysOrgCode'] = item[sysOrgCode]
+		})
+		return arr
+	}
+
+	function departChange(e) {
+		let params = {
+			sysOrgCode: e
+		}
+
+		queryLeaveList(params)
+	}
+
+	const back = () => {
+		uni.navigateBack()
+	}
+
+	onPullDownRefresh(() => {
+		pageNo = 1
+		loading = false
+		list.value = []
+		queryLeaveList()
+		uni.stopPullDownRefresh()
+	})
+
+	onReachBottom(() => {
+		if (loading) return
+		pageNo++
+		queryLeaveList()
+	})
+</script>
+
+<style>
+	page {
+		background-color: #f8f8f8;
+	}
+</style>
+<style lang="scss" scoped>
+	.content {
+		padding-top: v-bind(cusnavbarheight);
+		padding-bottom: 24rpx;
+
+	}
+
+	.list {
+		padding: 0 30rpx;
+
+		.item {
+			background: #FFFFFF;
+			box-shadow: 0rpx 2rpx 4rpx 0rpx rgba(0, 0, 0, 0.5);
+			border-radius: 16rpx;
+			padding: 30rpx;
+			margin-top: 24rpx;
+			position: relative;
+
+			.dot {
+				width: 12rpx;
+				height: 12rpx;
+				background: #ED361D;
+				position: absolute;
+				border-radius: 50%;
+				left: 9rpx;
+				top: 44rpx;
+			}
+
+			.title {
+				margin-bottom: 20rpx;
+				font-size: 28rpx;
+				color: #333333;
+			}
+
+			.time_box {
+				font-size: 24rpx;
+				color: #888888;
+			}
+
+			image {
+				width: 28rpx;
+				height: 22rpx;
+				margin-left: 62rpx;
+				margin-right: 8rpx;
+			}
+		}
+	}
+
+
+	.back {
+		padding: 0 30rpx;
+	}
+</style>
\ No newline at end of file