Merge remote-tracking branch 'remotes/origin/ldeyun' into yzqUniapp

# Conflicts:
#	api/renyuan.js
#	manifest.json
#	pages/views/renliziyuan/renyuanxinxi/detail.vue
#	pages/views/renliziyuan/renyuanxinxi/tongji.vue

api/pages.js

@@ -26,4 +26,14 @@ export function qjQueryByIdApi(config) { // 通过id查询请假数据 流程用
 		method: 'get',
 		data: config
 	})
+}
+
+export function queryHisDateApi(username) { // 根据username获取最新请假结束日期
+	return https({
+		url: '/CxcQxj/cxcQxj/queryHisDate',
+		method: 'get',
+		data: {
+			username
+		}
+	})
 }

api/renyuan.js

@@ -57,13 +57,14 @@ export function queryZyzgdjByRyLdhth(ldhth) { // 获取人员职业资格等级
 	})
 }
 
-// ryList: '/cxchrygxxtj/cxcHrYgxxtj/list',
-// ryByXb: '/cxcRyData/countByXb',
-// ryByNl: '/cxcRyData/countByNl',
-// ryByXbTotal: '/cxcRyData/countByXbTotal',
-// ryByNlTotal: '/cxcRyData/countByNlTotal',
-// bmList: '/sys/sysDepart/queryTreeList'
 
+export function queryJxkhByRyLdhth(ldhth) { // 绩效考核信息
+	return https({
+		url: '/cxc_rlzy.zb/cxcRlzyZb/listCxcRlzyJxkhByMainId',
+		method: 'get',
+		data: ldhth
+	})
+}
 
 export function cxcHrYgxxtj(parm) { // 获取员工信息统计
 	return https({
@@ -73,33 +74,9 @@ export function cxcHrYgxxtj(parm) { // 获取员工信息统计
 	})
 }
 
-export function cxcRyDatacountByXb(parm) { // 通过性别获取员工信息统计
+export function cxcRyDataTongji(url, parm) { // 员工信息统计
 	return https({
-		url: '/cxcRyData/countByXb',
+		url: url,
-		method: 'get',
-		data: parm
-	})
-}
-
-export function cxcRyDatacountByNl(parm) { // 通过年龄获取员工信息统计
-	return https({
-		url: '/cxcRyData/countByNl',
-		method: 'get',
-		data: parm
-	})
-}
-
-export function cxcRyDatacountByXbTotal(parm) { // 通过性别获取员工信息统计
-	return https({
-		url: '/cxcRyData/countByXbTotal',
-		method: 'get',
-		data: parm
-	})
-}
-
-export function cxcRyDatacountByNlTotal(parm) { // 通过年龄获取员工信息统计
-	return https({
-		url: '/cxcRyData/countByNlTotal',
 		method: 'get',
 		data: parm
 	})

bpm/leaveApplication/index.vue

@@ -182,6 +182,14 @@
 		}).then((res) => {
 			if (res.success) {
 				step.value = res.result.records
+				step.value = step.value.map(item => {
+					if (item.name === 'start') {
+						item.name = '开始';
+					} else if (item.name === 'end') {
+						item.name = '结束';
+					}
+					return item;
+				});
 			}
 		})
 	}

manifest.json

@@ -2,8 +2,8 @@
     "name" : "数智产销",
     "appid" : "__UNI__9F097F0",
     "description" : "",
-    "versionName" : "1.1.1",
+    "versionName" : "1.1.6",
-    "versionCode" : 20250106,
+    "versionCode" : 20250207,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

package-lock.json

@@ -0,0 +1,95 @@
+{
+  "name": "cxc-szcx-uniapp",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "dependencies": {
+        "@dcloudio/uni-ui": "^1.5.6",
+        "base-64": "^1.0.0",
+        "dayjs": "^1.11.13",
+        "echarts": "^5.6.0"
+      }
+    },
+    "node_modules/@dcloudio/uni-ui": {
+      "version": "1.5.6",
+      "resolved": "https://registry.npmjs.org/@dcloudio/uni-ui/-/uni-ui-1.5.6.tgz",
+      "integrity": "sha512-jmb98PasFvZkrIDXGh94GbdWg2/jyhgs1HUG+bU8eyL7Ltias/5XBz4q8w9RXyWUfqepJRqapPA2IIQpLCuTIg==",
+      "license": "Apache-2.0"
+    },
+    "node_modules/base-64": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/base-64/-/base-64-1.0.0.tgz",
+      "integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg=="
+    },
+    "node_modules/dayjs": {
+      "version": "1.11.13",
+      "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.13.tgz",
+      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
+    },
+    "node_modules/echarts": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.6.0.tgz",
+      "integrity": "sha512-oTbVTsXfKuEhxftHqL5xprgLoc0k7uScAwtryCgWF6hPYFLRwOUHiFmHGCBKP5NPFNkDVopOieyUqYGH8Fa3kA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "2.3.0",
+        "zrender": "5.6.1"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
+      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==",
+      "license": "0BSD"
+    },
+    "node_modules/zrender": {
+      "version": "5.6.1",
+      "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.6.1.tgz",
+      "integrity": "sha512-OFXkDJKcrlx5su2XbzJvj/34Q3m6PvyCZkVPHGYpcCJ52ek4U/ymZyfuV1nKE23AyBJ51E/6Yr0mhZ7xGTO4ag==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "tslib": "2.3.0"
+      }
+    }
+  },
+  "dependencies": {
+    "@dcloudio/uni-ui": {
+      "version": "1.5.6",
+      "resolved": "https://registry.npmjs.org/@dcloudio/uni-ui/-/uni-ui-1.5.6.tgz",
+      "integrity": "sha512-jmb98PasFvZkrIDXGh94GbdWg2/jyhgs1HUG+bU8eyL7Ltias/5XBz4q8w9RXyWUfqepJRqapPA2IIQpLCuTIg=="
+    },
+    "base-64": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/base-64/-/base-64-1.0.0.tgz",
+      "integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg=="
+    },
+    "dayjs": {
+      "version": "1.11.13",
+      "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.13.tgz",
+      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
+    },
+    "echarts": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.6.0.tgz",
+      "integrity": "sha512-oTbVTsXfKuEhxftHqL5xprgLoc0k7uScAwtryCgWF6hPYFLRwOUHiFmHGCBKP5NPFNkDVopOieyUqYGH8Fa3kA==",
+      "requires": {
+        "tslib": "2.3.0",
+        "zrender": "5.6.1"
+      }
+    },
+    "tslib": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
+      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+    },
+    "zrender": {
+      "version": "5.6.1",
+      "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.6.1.tgz",
+      "integrity": "sha512-OFXkDJKcrlx5su2XbzJvj/34Q3m6PvyCZkVPHGYpcCJ52ek4U/ymZyfuV1nKE23AyBJ51E/6Yr0mhZ7xGTO4ag==",
+      "requires": {
+        "tslib": "2.3.0"
+      }
+    }
+  }
+}

pages.json

@@ -230,7 +230,7 @@
 		{
 			"path": "pages/views/renliziyuan/renyuanxinxi/tongji",
 			"style": {
-				"navigationBarTitleText": "人员统计信息",
+				"navigationBarTitleText": "人员年龄分组统计信息",
 				"navigationBarTextStyle": "white"
 
 			}

pages/leave/application.vue

@@ -109,7 +109,8 @@
 	} from '@/api/api.js';
 	import {
 		qjAddApi,
-		queryZwmcAndExaApi
+		queryZwmcAndExaApi,
+		queryHisDateApi
 	} from '@/api/pages.js';
 	import {
 		queryDepByCode,
@@ -177,7 +178,7 @@
 	}
 	onLoad(() => {
 		loadData()
-		getTomorrowDate()
+		// getTomorrowDate()
 	})
 
 	const select = (e) => {
@@ -274,21 +275,39 @@
 				proxy.$toast(res.message);
 			}
 		})
+
+		queryHisDateApi(store.userinfo.username).then((res) => { // 最新请假结束日期
+			if (res) {
+				console.log('--0', res)
+				getTomorrowDate(res);
+			} else {
+				console.log('--1', res)
+				getTomorrowDate();
+			}
+		})
 	}
 
 	const bindType = (e) => {
 		typeIndex.value = e.detail.value
 	}
 
-	const getTomorrowDate = () => {
+	const getTomorrowDate = (e) => {
-		let today = new Date();
+		let tomorrow;
-		let tomorrow = new Date(today);
+		if (e) {
-		tomorrow.setDate(today.getDate() + 1);
+			// 将传入的日期字符串转换为Date对象
-		// 格式化日期为 yyyy-mm-dd
+			const dateParts = e.split('-').map(Number);
-		let year = tomorrow.getFullYear();
+			tomorrow = new Date(dateParts[0], dateParts[1] - 1, dateParts[2]);
-		let month = String(tomorrow.getMonth() + 1).padStart(2, '0'); // 月份从0开始，需要加1
+		} else {
-		let day = String(tomorrow.getDate()).padStart(2, '0');
+			// 如果没有提供日期，则使用当前日期
-		beginTime.value = year + '-' + month + '-' + day;
+			tomorrow = new Date();
+		}
+		// 设置为明天的日期
+		tomorrow.setDate(tomorrow.getDate() + 1);
+		// 格式化日期
+		const year = tomorrow.getFullYear();
+		const month = (tomorrow.getMonth() + 1).toString().padStart(2, '0');
+		const day = tomorrow.getDate().toString().padStart(2, '0');
+		beginTime.value = `${year}-${month}-${day}`;
 	}
 </script>
 

pages/task/handle.vue

@@ -20,7 +20,9 @@
 			</view>
 		</customNav>
 		<component :is="comp" :dataId="dataId"></component>
-		<view class="btn f-row aic jcb" v-if="type == 0">
+		<view v-if="ifShow" style="display: block; margin: 10px;">
+			温馨提示:目前APP暂不支持电子签章审批,请登录PC端厂综合管理平台(https://10.75.166.6),在个人办公-我的任务中审批。</view>
+		<view class="btn f-row aic jcb" v-if="type == 0 && !ifShow">
 			<view class="refuse" @click="openpop(1)">
 				拒绝
 			</view>
@@ -28,7 +30,6 @@
 				同意
 			</view>
 		</view>
-
 		<uni-popup ref="popup" type="center">
 			<view class="popup">
 				<view class="title">
@@ -110,6 +111,7 @@
 	}
 	const comp = ref(null)
 	const dataId = ref('')
+	const ifShow = ref(false) //20250122 判断是否是签章业务 提示文字
 	const getProcessNodeInfo = (taskId) => {
 		getProcessNodeInfoApi({
 			taskId
@@ -149,6 +151,7 @@
 			}
 		}
 	}
+	
 	/**流程办理接口*/
 	const processComplete = (params) => {
 		processCompleteApi({
@@ -165,7 +168,6 @@
 		})
 	}
 
-
 	/**审批流程节点*/
 	const stepNode = ref([])
 	/**当前选择的节点*/
@@ -185,6 +187,7 @@
 			}
 		})
 	}
+	
 	/**历史任务详情*/
 	const getHisProcessNodeInfo = (procInstId) => {
 		getHisProcessNodeInfoApi({
@@ -196,6 +199,18 @@
 			}
 		})
 	}
+	/**判断是否是电子签章节点任务，是则显示温馨提示并隐藏审批按钮*/
+	const getIfShow = () => {
+		if (taskInfo.value.taskId == 'task1705482211321' || taskInfo.value.taskId == 'task1705482639673' ||
+			taskInfo.value.taskId == 'task1714092890849' || taskInfo.value.taskId == 'task1714092955682' ||
+			taskInfo.value.taskId == 'task1689151174324' || taskInfo.value.taskId == 'task1677809773570' ||
+			taskInfo.value.taskId == 'task1689579219152') 
+		{ // 签章业务：非常规 承包商资质审查 招标采购 公务接待 房屋租赁
+			ifShow.value = true;
+		} else {
+			ifShow.value = false;
+		}
+	}
 	const taskInfo = ref(null)
 	let type = null
 	onLoad((options) => {
@@ -207,6 +222,8 @@
 		getProcessNodeInfo(taskInfo.value.id)
 		getProcessTaskTransInfo()
 
+		getIfShow()
+
 	})
 </script>
 <style>

pages/views/renliziyuan/renyuanxinxi/detail.vue

@@ -4,6 +4,45 @@
 			<view style="padding: 10px 10px 10px 10px;">
 				<uni-title title="基本信息" type="h1" color="blue"></uni-title>
 				<yjly-row-cell :cellData="cellData" :rowDataCount="3"></yjly-row-cell>
+
+				<uni-title title="年度绩效考核" type="h1" color="blue"></uni-title>
+				<uni-row>
+					<uni-col :span="4">
+						<view class="titleStyle">
+							序号
+						</view>
+					</uni-col>
+					<uni-col :span="10">
+						<view class="titleStyle">
+							绩效考核年份
+						</view>
+					</uni-col>
+					<uni-col :span="10">
+						<view class="titleStyle">
+							绩效考核成绩
+						</view>
+					</uni-col>
+
+
+				</uni-row>
+				<uni-row>
+					<view v-for="(item,index) in jxkhxxList">
+						<uni-col :span="4">
+							<view class="dataStyle">
+								{{index+1}}
+							</view>
+						</uni-col>
+						<uni-col :span="10">
+							<view class="dataStyle">
+								{{item.nf}}
+							</view>
+						</uni-col><uni-col :span="10">
+							<view class="dataStyle">
+								{{item.khcj+"---"+item.khcj_dictText}}
+							</view>
+						</uni-col>
+					</view>
+				</uni-row>
 				<uni-title title="工作简历" type="h1" color="blue"></uni-title>
 				<uni-row>
 					<uni-col :span="4">
@@ -248,7 +287,8 @@
 		queryJtzycyByRyLdhth,
 		queryXlxxByRyLdhth,
 		queryGbxxByRyLdhth,
-		queryZyzgdjByRyLdhth
+		queryZyzgdjByRyLdhth,
+		queryJxkhByRyLdhth
 	} from '@/api/renyuan.js'
 	import {
 		useStore
@@ -268,10 +308,22 @@
 	const xlxxList = ref([]) // 人员其他子表信息-学历证书
 	const gbxxList = ref([]) // 人员其他子表信息-干部信息
 	const zyzgdjList = ref([]) // 人员其他子表信息-职业资格等级
+	const jxkhxxList = ref([]) // 人员其他子表信息-绩效考核信息
 
 
 	function getChildTable() {
 		console.log(ldhth.value)
+
+		queryJxkhByRyLdhth({
+			"ldhth": ldhth.value
+		}).then((res) => {
+			// console.log(res);
+			jxkhxxList.value = res.result.records
+			// console.log(jxkhxxList.value)
+		}).catch((err) => {
+			console.log(err);
+		})
+
 		queryGbxxByRyLdhth({
 			"ldhth": ldhth.value
 		}).then((res) => {
@@ -327,20 +379,29 @@
 				xlxxList.value = []
 				if (res.result.records.length > 0) {
 					var rress = res.result.records
+					// console.log(rress);
 					for (let i = 0; i < rress.length; i++) {
-						if (rress[i].onexl == 1) {
+						if (rress[i].onexl == 1 & rress[i].zgxl == 1) {
+							rress[i].xllb = "第一学历"
+							xlxxList.value.push(JSON.parse(JSON.stringify(rress[i])))
+							// console.log(xlxxList.value)
+							rress[i].xllb = "最高学历"
+							xlxxList.value.push(JSON.parse(JSON.stringify(rress[i])))
+							// console.log(xlxxList.value)
+						}
+						if (rress[i].onexl == 1 & rress[i].zgxl != 1) {
 							rress[i].xllb = "第一学历"
 							xlxxList.value.push(rress[i])
+
 						}
-						if (rress[i].zgxl == 1) {
+						if (rress[i].onexl != 1 & rress[i].zgxl == 1) {
 							rress[i].xllb = "最高学历"
 							xlxxList.value.push(rress[i])
 						}
-
 					}
-				}
 
-				console.log(xlxxList.value);
+
+				}
 			}
 		}).catch((err) => {
 			console.log(err);
@@ -517,7 +578,9 @@
 		vertical-align: middle;
 		border-bottom: 1px solid #919191;
 		border-left: 1px solid #919191;
-		text-overflow: ellipsis;
+		text-align: center;
+		word-wrap: break-word;
+		overflow-wrap: break-word;
 
 	}
 </style>

pages/views/renliziyuan/renyuanxinxi/taizhang.vue

@@ -1,8 +1,7 @@
 <template>
 	<view>
-		<scroll-view :scroll-y="true">
+		<scroll-view :scroll-y="true" style="height: 100vh;">
 			<uni-card>
-				<uni-title title="" type="h1" align="center"></uni-title>
 				<view>
 					<uni-row>
 						<uni-col :span="11"><uni-title title="姓名 " align="left" type="h5"></uni-title></uni-col>
@@ -10,10 +9,10 @@
 								type="h5"></uni-title></uni-col>
 					</uni-row>
 					<uni-row>
-						<uni-col :span="11"><uni-easyinput v-model="xm" focus suffixIcon="search" clearable
+						<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">
-							<uni-easyinput v-model="ldhth" focus suffixIcon="search" clearable placeholder="劳动合同号模糊查询"
+							<uni-easyinput v-model="ldhth" suffixIcon="search" clearable placeholder="劳动合同号模糊查询"
 								@change="Search" @iconClick="Search" />
 						</uni-col>
 					</uni-row>
@@ -24,7 +23,8 @@
 					</uni-row>
 					<uni-row>
 						<uni-col :span="24">
-							<trq-depart-select returnCodeOrID="orgCode" @change="departChange"></trq-depart-select>
+							<trq-depart-select v-model="departID" returnCodeOrID="orgCode"
+								@change="departChange"></trq-depart-select>
 						</uni-col>
 					</uni-row>
 				</view>
@@ -34,6 +34,9 @@
 					:border="true" :data="ryDataList" @detail="detail"></zb-table>
 				<uni-pagination :current="current" :pagerCount="pages" :total="total" prev-text="前一页" next-text="后一页"
 					:show-icon="false" @change="pagechange" />
+				<view>
+					<text class="example-info">当前页：{{ current }}，数据总量：{{ total }}条，每页数据：{{ pageSize }}</text>
+				</view>
 			</uni-card>
 		</scroll-view>
 
@@ -97,12 +100,6 @@
 			width: 70,
 			align: 'center'
 		},
-		// {
-		// 	name: 'gzdw',
-		// 	label: '单位',
-		// 	align: 'center',
-		// 	width: 150
-		// },
 		{
 			name: 'xb_dictText',
 			label: '性别',
@@ -118,6 +115,7 @@
 		{
 			name: 'operation',
 			type: 'operation',
+			width: 60,
 			fixed: true,
 			label: '操作',
 			align: 'center',
@@ -139,7 +137,6 @@
 
 	function detail(record) {
 		// console.log(record)
-
 		uni.navigateTo({
 			url: "/pages/views/renliziyuan/renyuanxinxi/detail?data=" + encodeURIComponent(JSON.stringify(record))
 		})
@@ -148,29 +145,47 @@
 	function pagechange(e) {
 		current.value = e.current
 		pageNo.value = e.current
-		getRenyuanByDepID()
+		let params = {
-	}
-
-	function departChange(e) {
-		departID.value = e
-		getRenyuanByDepID()
-	}
-
-	function getRenyuanByDepID() {
-		ryDataList.value = []
-		let queryParm = {
 			pageNo: pageNo.value,
 			pageSize: pageSize.value,
 			current: current.value
 		};
-		queryParm.orgCode = departID.value
+		if (departID.value.length <= 9) {
+			params.orgCode = departID.value
+		} else {
+			params.jcxd_code = departID.value
+		}
+
+		getRenyuanByDepID(params)
+	}
+
+	function departChange(e, data) {
+		departID.value = e
+		let params = {
+			pageNo: pageNo.value,
+			pageSize: pageSize.value,
+			current: current.value
+		};
+		console.log(e)
+		if (e.length <= 9) {
+			params.orgCode = departID.value
+		} else {
+			params.jcxd_code = departID.value
+		}
+
+		getRenyuanByDepID(params)
+	}
+
+	function getRenyuanByDepID(queryParm) {
+		ryDataList.value = []
+		console.log(queryParm)
 		queryRenyuanByDepartID(queryParm).then((res) => {
+			console.log(res)
 			if (res.success) {
 				ryDataList.value = res.result.records
 				total.value = res.result.total
 				pages.value = res.result.pages
-
+				current.value = res.result.current
-
 			}
 		}).catch((err) => {
 			console.log(err);
@@ -192,6 +207,7 @@
 		if (ldhth.value !== '') {
 			queryParm.ldhth = '*' + ldhth.value + '*';
 		}
+		console.log(queryParm)
 		queryRenyuanByDepartID(queryParm).then((res) => {
 			if (res.success) {
 				ryDataList.value = res.result.records

pages/views/renliziyuan/renyuanxinxi/tongji.vue

@@ -1,273 +1,563 @@
 <template>
 	<view>
-		<uni-card>
+		<view class="container" id="top1">
-			<uni-forms>
+			<uni-row style="margin-bottom: 10rpx;margin-left: 30rpx;margin-right: 30rpx;">
-				<uni-forms-item>
+				<uni-col :span="24"><uni-title :title="'所选单位ID:'+orgCode" align="left" type="h4"></uni-title></uni-col>
+			</uni-row>
+			<uni-row style="margin-bottom: 20rpx;margin-left: 30rpx;margin-right: 30rpx;">
+				<uni-col :span="24">
+					<trq-depart-select v-model="orgCode" returnCodeOrID="orgCode"
+						@change="departChange"></trq-depart-select>
+				</uni-col>
+			</uni-row>
+			<!-- 概览统计 -->
+			<view class="stats-box" v-if="summary.total">
+				<view class=" stat-item">
+					<text class="label">总人数</text>
+					<text class="value">{{ summary.total }}</text>
+				</view>
+				<view class="stat-item">
+					<text class="label">平均年龄</text>
+					<text class="value">{{ summary.avgAge.toFixed(1) }}</text>
+				</view>
+			</view>
+		</view>
+		<!-- ECharts图表 -->
+		<view class="chart-container">
+			<l-echart ref="chart" @finished="initChart" />
+		</view>
 
-				</uni-forms-item>
-			</uni-forms>
-			<uni-title title="所属单位 " align="center"></uni-title>
 
-			<trq-depart-select returnCodeOrID="orgCode" @change="departChange"></trq-depart-select>
+		<!-- 数据表格 -->
+
+		<uni-row style="margin-top: 10px; margin-left: 30rpx;margin-right: 30rpx;" v-if="tableData.length>0">
+			<uni-col :span="3">
+				<view class="titleStyle">
+					序号
+				</view>
+			</uni-col>
+			<uni-col :span="5">
+				<view class="titleStyle">
+					姓名
+				</view>
+			</uni-col>
+			<uni-col :span="5">
+				<view class="titleStyle">
+					性别
+				</view>
+			</uni-col>
+			<uni-col :span="5">
+				<view class="titleStyle">
+					年龄
+				</view>
+			</uni-col>
+			<uni-col :span="6">
+				<view class="titleStyle">
+					操作
+				</view>
+			</uni-col>
+		</uni-row>
+
+		<scroll-view scroll-y :style="{height: bottomHeight + 'px' }">
+			<uni-row style="margin-bottom: 10rpx;margin-left: 30rpx;margin-right: 30rpx;">
+				<view v-for="(item,index) in tableData">
+					<uni-col :span="3">
+						<view class="dataStyle">
+							{{index+1}}
+						</view>
+					</uni-col>
+					<uni-col :span="5">
+						<view class="dataStyle">
+							{{item.xm}}
+						</view>
+					</uni-col><uni-col :span="5">
+						<view class="dataStyle">
+							{{item.xb_dictText}}
+						</view>
+					</uni-col><uni-col :span="5">
+						<view class="dataStyle">
+							{{item.nl}}
+						</view>
+					</uni-col>
+					<uni-col :span="6">
+						<view class="dataStyle">
+							<button size="mini" type="primary" @click="detail(item)">详情</button>
+						</view>
+					</uni-col>
+
+				</view>
 
-			<uni-row>
-				<uni-col :span="6"><button @click="getRyByxb(0)" type="primary" size="mini"
-						style="margin: 10px 10px 10px 10px;">性别分组统计</button></uni-col>
-				<uni-col :span="6"><button @click="getRyBynl(0)" type="primary" size="mini"
-						style="margin: 10px 10px 10px 10px;">年龄分组统计</button></uni-col>
-				<uni-col :span="6"><button @click="getRyByxb(1)" type="primary" size="mini"
-						style="margin: 10px 10px 10px 10px;">性别总统计</button></uni-col>
-				<uni-col :span="6"><button @click="getRyBynl(1)" type="primary" size="mini"
-						style="margin: 10px 10px 10px 10px;">年龄总统计</button></uni-col>
 			</uni-row>
 
-			<view style="width:750rpx; height:750rpx"><l-echart ref="myChart" @finished="init"></l-echart></view>
+		</scroll-view>
-		</uni-card>
 	</view>
 </template>
 
-
 <script setup>
-	import * as echarts from 'echarts'
 	import {
-		onReady,
-		onLoad
-
-	} from '@dcloudio/uni-app';
-	import {
-		reactive,
 		ref,
+		reactive,
 		onMounted
 	} from 'vue';
+	import * as echarts from 'echarts'
+
 	import {
-		useStore
+		queryRenyuanByDepartID
-	} from '@/store';
-	import {
-		cxcRyDatacountByXb,
-		cxcRyDatacountByNl,
-		cxcRyDatacountByXbTotal,
-		cxcRyDatacountByNlTotal
 	} from '@/api/renyuan.js'
 
-	const ryCountData = ref([])
+	// 存储下方组件的高度
-	const departID = ref("")
+	const bottomHeight = ref(0);
-	const option = ref({
+	// 新增加载状态
-		notMerge: true,
+	const isLoading = ref(false);
-		backgroundColor: '#F8FAFF',
+	const orgCode = ref('');
-		tooltip: {
+	const rawData = ref([]);
-			trigger: 'axis',
+	const tableData = ref([]);
-			showContent: this.showContent,
+	const summary = reactive({
-			axisPointer: {
+		total: 0,
-				type: 'shadow',
+		avgAge: 0
-				label: {
-					show: true
-				}
-			}
-		},
-		title: {
-			text: '人员统计图表'
-		},
-		toolbox: {
-			padding: [0, 20, 20, 20],
-			show: true,
-			feature: {
-				//工具配置项
-				mark: {
-					show: true
-				},
-				dataView: {
-					show: true
-				},
-				magicType: {
-					show: true, //是否显示该工具
-					type: ['line', 'bar'] //启用的动态类型
-				},
-				dataZoom: {
-					yAxisIndex: 'none'
-				},
-				restore: {
-					show: true //是否显示该工具
-				},
-				saveAsImage: {
-					show: true //是否显示该工具
-				}
-			}
-		},
-		calculable: false, //是否显示拖拽的手柄
-		// itemHeight: 0,
-		legend: {
-			//图例组件
-			data: [],
-			itemGap: 24,
-			padding: [5, 15, 10, 15],
-			// y: 'bottom',
-			itemHeight: 8, //高
-			itemWidth: 8, //宽
-			type: 'scroll',
-			top: 40,
-		},
-		grid: {
-			top: '15%',
-			left: '4%',
-			right: '4%',
-			bottom: '6%',
-			containLabel: true
-		},
-		xAxis: [{
-			show: true,
-			type: 'category', //坐标轴类型
-			// boundaryGap:false, //解决数据与线不对应问题
-			data: [],
-			// offset:50,
-			//['7.1', '7.2', '7.3', '7.4', '7.5', '7.6', '7.7', '7.8', '7.9', '7.10','7.11', ], //this.xList, //obama_budget_2012.names
-			axisLabel: {
-				color: '#7F84B5',
-				fontWeight: 300,
-				interval: 0,
-				rotate: 70
-			},
-			axisTick: {
-				show: false //刻度线
-			},
-			axisLine: {
-				show: false //不显示坐标轴线
-			}
-		}],
-		yAxis: [{
-			show: true,
-			boundaryGap: false, //解决数据与线不对应问题
-			type: 'value',
-			// name: 'Budget (million USD)',
-			// data: this.yList,
-			minInterval: 1,
-			axisLabel: {
-				interval: 0
-			},
-			splitLine: {
-				show: true,
-				lineStyle: {
-					//背景网格线
-					type: 'dashed'
-				}
-			},
-
-			axisTick: {
-				show: true //刻度线
-			},
-			axisLine: {
-				show: false //不显示坐标轴线
-			}
-		}],
-		dataZoom: [{
-				show: true,
-				start: 80,
-				end: 100,
-				handleSize: 10
-			},
-			{
-				type: 'inside',
-				start: 0,
-				end: 50
-			},
-			{
-				show: false,
-				yAxisIndex: 0,
-				filterMode: 'empty',
-				width: 12,
-				height: '80%',
-				showDataShadow: false,
-				left: '93%',
-				handleSize: 8
-			}
-		],
-		series: []
 	});
+	const chart = ref(null);
+	const chartOption = ref({});
+	const drillPopup = ref(null);
+	const drillList = ref([]);
+	const drillTitle = ref('');
 
-	const xData = ref([])
+	function detail(record) {
-	const ySeries = ref([])
+		// console.log(record)
-	const legData = ref([])
+		uni.navigateTo({
-
+			url: "/pages/views/renliziyuan/renyuanxinxi/detail?data=" + encodeURIComponent(JSON.stringify(record))
-	function departChange(e) {
+		})
-		departID.value = e
 	}
+	// 计算年龄initChart
+	const calculateAge = (birthDate) => {
+		const today = new Date();
+		const birth = new Date(birthDate);
+		let age = today.getFullYear() - birth.getFullYear();
+		const monthDiff = today.getMonth() - birth.getMonth();
+		if (monthDiff < 0 || (monthDiff === 0 && today.getDate() < birth.getDate())) {
+			age--;
+		}
+		return age;
+	};
+	// 加载数据
+	const departChange = async (e, data) => {
 
-	function getRyByxb(val) {
+		tableData.value = []
-		ryCountData.value = []
+		console.log(e)
-		let queryParm = {};
+		orgCode.value = e;
-		queryParm.orgCode = departID.value
+		try {
-		cxcRyDatacountByXb(queryParm).then((res) => {
+			// 显示加载状态
-			console.log(res);
-			if (res.success) {
-				xData.value = [];
-				ySeries.value = [];
-				legData.value = [];
-				let serie = {
-					name: '',
-					type: 'bar',
-					data: [],
-					itemStyle: {
-						normal: {
-							label: {
-								show: true, //开启显示
-								position: 'top', //在上方显示
-								textStyle: {
-									//数值样式
-									color: 'black',
-									fontSize: 16
-								}
-							}
-						}
-					}
-				};
 
-				let serieMan = JSON.parse(JSON.stringify(serie));
+			isLoading.value = true;
-				let serieTotal = JSON.parse(JSON.stringify(serie));
+			if (orgCode.value.length <= 6) {
-				serieTotal.name = '总数';
+
-				serieMan.name = '男';
+				console.log(123242353)
-				let serieWoman = JSON.parse(JSON.stringify(serie));
+				uni.showLoading({
-				serieWoman.name = '女';
+					title: '全厂数据较多，耐心等待数据加载中...',
-				ryData.map(item => {
+					mask: true
-					xData.value.push(item.depart_name);
+				});
-					serieMan.data.push(item.man);
+			} else {
-					serieWoman.data.push(item.woman);
+				uni.showLoading({
-					serieTotal.data.push(item.total);
+					title: '数据加载中...',
+					mask: true
 				});
-				ySeries.value.push(serieTotal);
-				ySeries.value.push(serieMan);
-				ySeries.value.push(serieWoman);
-
-				legData = ['总数', '男', '女'];
-				option.value.legend.data = legData.value;
-				option.value.xAxis[0].data = xData.value;
-				option.value.series = ySeries.value;
-				option.value.title.text = bmText + '人员性别统计';
-
 			}
 
-			setTimeout(async () => {
+			let params = {
-				if (!chartRef.value) return
+				pageSize: 3000,
-				const myChart = await chartRef.value.init(echarts)
+				fields: ['xm', 'nl', 'xb', 'xb_dictText', 'orgCode', 'jcdw', 'jcxd', 'jcxdCode']
-				myChart.setOption(option.value)
+			};
-			}, 300)
+			if (orgCode.value.length <= 9) {
-		}).catch((err) => {
+				params.orgCode = orgCode.value
-			console.log(err);
+			} else {
+				params.jcxd_code = orgCode.value
+
+			}
+			queryRenyuanByDepartID(params).then((res) => {
+				if (res.success) {
+					processData(res.result.records);
+
+					// 隐藏加载状态
+					isLoading.value = false;
+					uni.hideLoading();
+
+				}
+			}).catch((err) => {
+				console.log(err)
+				uni.showToast({
+					title: '数据加载失败',
+					icon: 'none'
+				});
+			})
+
+
+		} catch (error) {
+			console.log(error)
+			uni.showToast({
+				title: '数据加载失败',
+				icon: 'none'
+			});
+		} finally {
+			// 隐藏加载状态
+			isLoading.value = false;
+			uni.hideLoading();
+		}
+	};
+
+
+	// 数据处理
+	const processData = (data) => {
+
+		// 添加年龄字段并过滤有效数据
+		const validData = data.map(item => ({
+			...item,
+			nl: calculateAge(item.cssj)
+		})).filter(item => item.nl >= 21 && item.nl <= 64);
+		// 计算概览数据
+		summary.total = validData.length;
+		summary.avgAge = validData.reduce((sum, cur) => sum + cur.nl, 0) / summary.total || 0;
+		// 生成表格数据
+		// tableData.value = validData;
+
+		groupsData(validData);
+		// 生成图表数据
+		generateChartData(validData);
+
+	};
+
+	// 计算统计信息...
+	const subOrgStaffs = ref({}); // 按下级单位存储所有人员
+	const ageGroupStaffs = ref({}); // 按年龄段存储所有人员
+
+
+	const groupsData = (data) => {
+		// 清空旧数据
+		subOrgStaffs.value = {};
+		ageGroupStaffs.value = {};
+		data.reduce((acc, cur) => {
+			// console.log(cur)
+			let subOrg = "";
+			let ageRange = getAgeRange(cur.nl);
+			// console.log(cur.orgCode, cur.jcxdCode)
+			if (cur.orgCode <= 6) {
+				subOrg = cur.orgCode
+			} else {
+				subOrg = cur.jcxdCode
+			}
+
+			// 存储到subOrgStaffs
+			if (!subOrgStaffs.value[subOrg]) {
+				subOrgStaffs.value[subOrg] = [];
+			}
+			subOrgStaffs.value[subOrg].push(cur);
+
+			// 存储到ageGroupStaffs
+			if (!ageGroupStaffs.value[ageRange]) {
+				ageGroupStaffs.value[ageRange] = [];
+			}
+			ageGroupStaffs.value[ageRange].push(cur);
 		})
 	}
 
-	function getRyBynl(val) {
+
-		ryCountData.value = []
+	// 新增年龄范围计算方法
-		let queryParm = {};
+	const getAgeRange = (age) => {
-		queryParm.orgCode = departID.value
+		const ranges = ['21-30岁', '31-40岁', '41-50岁', '51-60岁', '61-64岁'];
-		cxcRyDatacountByNl(queryParm).then((res) => {
+		const index = Math.floor((age - 21) / 10);
-			console.log(res);
+		return ranges[index] || '其他';
-			if (res.success) {
+	};
-				ryCountData.value = res.result.records
+
+	// 修改后的显示人员列表方法
+	const showStaffList = (subOrg, ageRange) => {
+		// 从结构化数据中直接获取
+		const targetStaffs = subOrgStaffs.value[subOrg].filter(staff =>
+			getAgeRange(staff.nl) === ageRange
+		);
+
+		staffList.value = targetStaffs;
+		popupTitle.value = `${subOrg} ${ageRange}人员列表（共${targetStaffs.length}人）`;
+		popup.value.open();
+	};
+
+	// 新增获取指定单位人员的方法
+	const getSubOrgStaffs = (subOrgCode) => {
+		return subOrgStaffs.value[subOrgCode] || [];
+	};
+
+	// 新增获取指定年龄段人员的方法
+	const getAgeGroupStaffs = (ageRange) => {
+		return ageGroupStaffs.value[ageRange] || [];
+	};
+
+	// 生成图表数据（修改部分）
+	const generateChartData = (data) => {
+		// 按基层单位分组
+		const ageRanges = ['21-30岁', '31-40岁', '41-50岁', '51-60岁', '61-64岁'];
+		const jcdwGroups = data.reduce((acc, cur) => {
+			if (!acc[cur.jcdw]) {
+				acc[cur.jcdw] = {
+					ageGroups: [0, 0, 0, 0, 0] // 21-30,31-40,41-50,51-60,61-64
+				};
 			}
-		}).catch((err) => {
+			const ageGroup = Math.floor((cur.nl - 21) / 10);
-			console.log(err);
+			// console.log(ageGroup, cur.jcdw)
-		})
+			if (ageGroup >= 0 && ageGroup <= 4) {
-	}
+				acc[cur.jcdw].ageGroups[ageGroup]++;
+			}
+			return acc;
+		}, {});
+
+
+		// 生成分组柱状图配置
+		const xData = Object.keys(jcdwGroups);
+
+		const seriesData = ageRanges.map((range, index) => ({
+			name: range,
+			type: 'bar',
+			data: xData.map(jcdw => jcdwGroups[jcdw].ageGroups[index] || 0),
+			itemStyle: {
+				color: ['#5470C6', '#91CC75', '#FAC858', '#EE6666', '#73C0DE'][index]
+			},
+			// 显示数值标签
+			label: {
+				show: true,
+				position: 'top'
+			},
+			// 设置柱宽为 20 像素
+			// barWidth: 20
+		}))
+		chartOption.value = {
+			title: {
+				text: '人员年龄分组统计',
+				padding: [0, 0, 0, 30],
+			},
+			toolbox: {
+				padding: [0, 30, 0, 0],
+				show: true,
+				feature: {
+					//工具配置项
+
+					restore: {
+						show: true //是否显示该工具
+					},
+					saveAsImage: {
+						show: true //是否显示该工具
+					}
+				}
+			},
+			// tooltip: {
+			// 	trigger: 'axis',
+			// 	axisPointer: {
+			// 		type: 'shadow',
+			// 		label: {
+			// 			show: false
+			// 		}
+			// 	}
+			// },
+			grid: {
+				top: '15%',
+				left: '4%',
+				right: '4%',
+				bottom: '10%',
+				containLabel: true
+			},
+			legend: {
+				data: ageRanges,
+				itemGap: 5,
+				padding: [0, 15, 0, 15],
+				y: 'bottom',
+				itemHeight: 8, //高
+				itemWidth: 8, //宽
+				type: 'scroll'
+			},
+			xAxis: {
+				type: 'category',
+				data: xData,
+				axisLabel: {
+					color: '#7F84B5',
+					fontWeight: 300,
+					interval: 0,
+					rotate: 0,
+				},
+				padding: [0, 10, 0, 10],
+				axisTick: {
+					show: false //刻度线
+				},
+				axisLine: {
+					show: false //不显示坐标轴线
+				}
+			},
+			yAxis: [{
+				show: true,
+				boundaryGap: false, //解决数据与线不对应问题
+				type: 'value',
+				// name: 'Budget (million USD)',
+				// data: this.yList,
+				minInterval: 1,
+				axisLabel: {
+					interval: 0
+				},
+				splitLine: {
+					show: true,
+					lineStyle: {
+						//背景网格线
+						type: 'dashed'
+					}
+				},
+
+				axisTick: {
+					show: true //刻度线
+				},
+				axisLine: {
+					show: false //不显示坐标轴线
+				}
+			}],
+
+			series: seriesData,
+
+		};
+
+		// 初始化图表
+		setTimeout(async () => {
+			if (!chart.value) return
+			const myChart = await chart.value.init(echarts)
+			myChart.setOption(chartOption.value)
+			myChart.on('click', (params) => {
+				console.log(params.seriesName)
+				tableData.value = getAgeGroupStaffs(params.seriesName)
+
+			})
+		}, 300)
+
+
+		// #ifdef APP
+		getHeight();
+		// #endif
+
+	};
+
+	onMounted(() => {
+
+		// #ifdef APP
+		getHeight();
+		// #endif
+	})
+	// #ifdef APP
+
+	const getHeight = () => {
+		// 获取屏幕高度
+		const systemInfo = uni.getSystemInfoSync();
+		const screenHeight = systemInfo.screenHeight;
+		// 创建选择器查询对象
+		const query = uni.createSelectorQuery();
+		// 获取上方组件的高度
+		query
+			.select('#top1')
+			.boundingClientRect((rect1) => {
+				// 计算上方组件高度总和
+				const topComponentsHeight = rect1.height
+				// 计算下方组件的高度
+				bottomHeight.value = screenHeight - topComponentsHeight - 415;
+			})
+			.exec();
+	};
+
+	// #endif
+	// 初始化图表
+	const initChart = () => {
+		setTimeout(async () => {
+			if (!chart.value) return
+			const myChart = await chart.value.init(echarts)
+			myChart.setOption(chartOption.value)
+		}, 300)
+	};
 </script>
 
-<style>
+<style scoped>
+	.container {
+		margin: 20, 20, 20, 20rpx;
+	}
+
+	.input-group {
+		display: flex;
+		gap: 20rpx;
+		margin-bottom: 30rpx;
+	}
+
+	.input {
+		flex: 1;
+		border: 1rpx solid #ddd;
+		padding: 15rpx;
+		border-radius: 8rpx;
+	}
+
+	.query-btn {
+		background: #007AFF;
+		color: white;
+		padding: 0 40rpx;
+		border-radius: 8rpx;
+	}
+
+	.stats-box {
+		display: flex;
+		justify-content: space-around;
+		margin: 30rpx 0;
+		padding: 20rpx;
+		background: #f8f8f8;
+		border-radius: 12rpx;
+	}
+
+	.stat-item {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.label {
+		font-size: 24rpx;
+		color: #666;
+	}
+
+	.value {
+		font-size: 36rpx;
+		font-weight: bold;
+		color: #0000ff;
+	}
+
+	.chart-container {
+		height: 400rpx;
+		margin-top: 20rpx;
+	}
+
+	.titleStyle {
+		font-size: 12px;
+		color: #747474;
+		line-height: 30px;
+		height: 30px;
+		background: #F2F9FC;
+		text-align: center;
+		vertical-align: middle;
+		border-left: 1px solid #919191;
+		border-bottom: 1px solid #919191;
+		;
+	}
+
+	/* 内容样式 */
+	.dataStyle {
+		max-font-size: 14px;
+		/* 最大字体限制 */
+		min-font-size: 10px;
+		/* 最小字体限制 */
+		font-size: 12px;
+		color: #00007f;
+		line-height: 30px;
+		height: 30px;
+		font-weight: 500;
+		text-align: center;
+		vertical-align: middle;
+		border-bottom: 1px solid #919191;
+		border-left: 1px solid #919191;
+		text-overflow: ellipsis;
+
+	}
 </style>

pages/views/zhongheguanli/zhiban/index.vue

@@ -1,40 +1,54 @@
 <template>
-	<view :class="['f-col','aic',{'gray':store.isgray==1}]">
+	<view :class="[{'gray':store.isgray==1}]">
-		<picker fields="month" mode="date" @change="bindPickerChange" :value="index">
+		<view style="margin-top: 10px;margin-bottom: 10px;">
-			<view class="date">{{index}} 点击选择月份</view>
+			<picker fields="month" mode="date" @change="bindPickerChange" :value="index">
-		</picker>
+				<view class="date">{{index}} 点击选择月份</view>
-		<view class="info">
+			</picker>
-			<view class="info_title f-row aic">
+		</view>
-				<view class="">
+		<uni-row>
+			<uni-col :span="7">
+				<view class="titleStyle">
 					日期
 				</view>
-				<view class="">
+			</uni-col>
+			<uni-col :span="4">
+				<view class="titleStyle">
 					带班领导
 				</view>
-				<view class="">
+			</uni-col>
+			<uni-col :span="4">
+				<view class="titleStyle">
 					值班领导
 				</view>
-				<view class="">
+			</uni-col>
+			<uni-col :span="9">
+				<view class="titleStyle">
 					值班干部
 				</view>
-			</view>
+			</uni-col>
-			<view class="data_box">
+		</uni-row>
-				<view class="data f-row aic" v-for="item,i in zhibanArr">
+		<uni-row>
-					<view class="">
+			<view v-for="(item,index) in zhibanArr">
+				<uni-col :span="7">
+					<view class="dataStyle">
 						{{item.date}}
 					</view>
-					<view class="">
+				</uni-col>
+				<uni-col :span="4">
+					<view class="dataStyle">
 						{{item.dbld_dictText}}
 					</view>
-					<view class="">
+				</uni-col><uni-col :span="4">
+					<view class="dataStyle">
 						{{item.zbld_dictText}}
 					</view>
-					<view class="">
+				</uni-col><uni-col :span="9">
+					<view class="dataStyle">
 						{{item.zbgbrealname}}
 					</view>
-				</view>
+				</uni-col>
 			</view>
-		</view>
+		</uni-row>
 	</view>
 </template>
 
@@ -53,6 +67,36 @@
 	} from '@/store';
 	const store = useStore()
 	import dayjs from 'dayjs';
+
+
+	let column = ref([{
+			name: 'date',
+			label: '日期',
+			width: 70,
+			align: 'center'
+		},
+
+		{
+			name: 'dbld_dictText',
+			label: '带班领导',
+			align: 'center',
+			width: 60
+		},
+		{
+			name: 'zbld_dictText',
+			label: '值班领导',
+			align: 'center',
+			width: 60
+		},
+		{
+			name: 'zbgbrealname',
+			label: '值班干部',
+			align: 'center',
+			width: 150
+		}
+
+	])
+
 	const zhibanArr = ref([])
 	onLoad(() => {
 		zhibanQuery()
@@ -83,36 +127,36 @@
 		color: #333333;
 	}
 
-	.info {
+
-		background: #F8F8F8;
+	.titleStyle {
-		border-radius: 8rpx;
+		font-size: 12px;
+		color: #747474;
+		line-height: 25px;
+		height: 25px;
+		background: #F2F9FC;
 		text-align: center;
-		width: 690rpx;
+		vertical-align: middle;
-		margin-top: 23rpx;
+		border-left: 1px solid #919191;
+		border-bottom: 1px solid #919191;
+		;
+	}
 
-		.info_title {
+	/* 内容样式 */
-			font-size: 24rpx;
+	.dataStyle {
-			color: #333333;
+		max-font-size: 14px;
-			padding: 24rpx 0;
+		/* 最大字体限制 */
-			border-bottom: 1px solid #EFEFEF;
+		min-font-size: 10px;
+		/* 最小字体限制 */
+		font-size: 12px;
+		color: #00007f;
+		line-height: 25px;
+		height: 25px;
+		font-weight: 500;
+		text-align: center;
+		vertical-align: middle;
+		border-bottom: 1px solid #919191;
+		border-left: 1px solid #919191;
+		text-overflow: ellipsis;
 
-			view {
-				flex: 1;
-			}
-		}
-
-		.data_box {
-			font-size: 24rpx;
-			padding-bottom: 24rpx;
-			color: #888888;
-
-			.data {
-				margin-top: 23rpx;
-
-				view {
-					flex: 1;
-				}
-			}
-		}
 	}
 </style>

store/update.js

@@ -37,12 +37,6 @@ export const useUpdateApp = defineStore('updateApp', () => {
 				} = res
 				result.apkUrl = baseUrl + result.apkUrl;
 				result.wgtUrl = baseUrl + result.wgtUrl
-				// res = {
-				// 	"update": "wgt",
-				// 	"wgtUrl": "D:\\opt\\AppUpdate\\wgt\\2.2.34.wgt",
-				// 	"apkUrl": null,
-				// 	"versionCode": "1.0.0"
-				// }
 				// updateOptions.force = res.is_force === 1
 				// updateOptions.content = res.update_content
 				updateOptions.wgtUrl = result.wgtUrl

uni_modules/trq-depart-select/components/trq-depart-select/trq-depart-select.vue

@@ -2,12 +2,12 @@
 	<view v-if="returnCodeOrID === 'orgCode'">
 		<uni-data-picker v-model="selectDepartID" ref="depart" :openSearch="true" :ellipsis="true"
 			placeholder="请选择单位code" popup-title="请选择单位" :localdata="departList" @nodeclick="onnodeclick"
-			@popupclosed="onpopupclosed" :map="{'text':'title','value':'orgCode'}"></uni-data-picker>
+			@popupclosed="onpopupclosed" @change="onchange" :map="{'text':'title','value':'orgCode'}"></uni-data-picker>
 	</view>
 	<view v-else>
 		<uni-data-picker v-model="selectDepartID" ref="depart" :openSearch="true" :ellipsis="true" placeholder="请选择单位id"
 			popup-title="请选择单位" :localdata="departList" @nodeclick="onnodeclick" @popupclosed="onpopupclosed"
-			:map="{'text':'title','value':'id'}"></uni-data-picker>
+			@change="onchange" :map="{'text':'title','value':'id'}"></uni-data-picker>
 	</view>
 
 </template>
@@ -46,6 +46,8 @@
 	let selectDepartIDS = ref([]) //选中的级联单位ID数组
 	let tempSelectDepartID = ref("") //临时选择的单位ID
 
+	let departInfo = ref({}) //"单位的全部信息"
+
 	let $emit = defineEmits(['change']);
 
 	const getDepartList = () => {
@@ -59,17 +61,22 @@
 		})
 	}
 	const onnodeclick = ((e) => {
-		// console.log(e)
+		departInfo.value = e;
 		if (props.returnCodeOrID = "orgCode") {
 			tempSelectDepartID.value = e.orgCode
 		} else {
 			tempSelectDepartID.value = e.value
 		}
+
+	})
+
+	const onchange = ((e) => {
+		$emit('change', e.detail.value[e.detail.value.length - 1].value, {})
 	})
 
 	const onpopupclosed = ((e) => {
 		selectDepartID.value = tempSelectDepartID.value
-		$emit('change', selectDepartID.value)
+		$emit('change', selectDepartID.value, departInfo)
 	})
 	onLoad((e) => {
 		getDepartList();

uni_modules/trq-depart-select/readme.md

@@ -1,5 +1,25 @@
 # trq-depart-select
+# 1.0.1
+更新，添加返回值，将整个机构对象返回父组件
+```javascript
+const onpopupclosed = ((e) => {
+	selectDepartID.value = tempSelectDepartID.value
+	$emit('change', selectDepartID.value, departInfo)
+})
+```
+增加选择到最后层级触发的change时间，返回数据到父组件的功能
 
+```javascript
+const onchange = ((e) => {
+	$emit('change', e.detail.value[e.detail.value.length - 1].value, {})
+})
+
+```
+
+ 
+
+ # 1.0
+ 
 属性  returnCodeOrID   默认值 orgCode，  组件返回单位的orgCode，  不设置属性或设置为其他，组件返回 单位ID
 
 事件：change 选择内容发生变化时发生，通过emit 返回给父组件 选择单位的ID或code