涉密人员统计更改地区选择方式

10 months ago · 43664c0548
parent ee07dfda15
commit 43664c0548
2 changed files with 84 additions and 10 deletions
--- a/ruoyi-admin/src/main/resources/templates/system/usernum/print.html
+++ b/ruoyi-admin/src/main/resources/templates/system/usernum/print.html
@ -1766,7 +1766,7 @@
 <body link=blue vlink=purple >

 <table border=0 cellpadding=0 cellspacing=0 width=1048 style='border-collapse:
- collapse;table-layout:fixed;width:786pt;margin: auto;'>
+ collapse;table-layout:fixed;width:786pt;margin: auto;' id="app">
    <col width=131 span=8 style='mso-width-source:userset;width:98.25pt'>
    <tr height=56 style='mso-height-source:userset;height:42pt' id='r0'>
        <td colspan=8 height=56 class=x69 width=1048 style='height:42pt;'>[[${dept.deptName}]]人员信息表</td>
@ -1779,11 +1779,11 @@
    </tr>
    <tr height=56 style='mso-height-source:userset;height:42pt' id='r2'>
        <td height=54 class=x78 style='font-weight: bold;height:40.5pt;'>所属地市</td>
-        <td colspan=3 class=x79 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>
+        <td colspan=3 class='x79 framework' style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>
            [[${dept.framework}]]
        </td>
        <td class=x82 style="font-weight: bold">所属区县</td>
-        <td class=x82>[[${dept.area}]]</td>
+        <td class='x82 area'>[[${dept.area}]]</td>
        <td class=x82 style="font-weight: bold">下属部门</td>
        <td class=x82></td>
    </tr>
@ -1831,6 +1831,15 @@
    function printPage() {
        window.print();
    }
+    $.ajax({
+        url: ctx + "system/area/getAllList",
+        type: 'GET',
+        data:{parentId:''} ,
+        success:((res)=>{
+            document.querySelector('.framework').innerHTML = getCity(res.data,[[${dept.framework}]])
+            document.querySelector('.area').innerHTML = getCity(res.data,[[${dept.area}]])
+        }) ,
+    });
    var list = [[${list}]]
    document.querySelector('.userNum').innerHTML = list.length
    function conversionDate(date){
--- a/ruoyi-admin/src/main/resources/templates/system/usernum/usernum.html
+++ b/ruoyi-admin/src/main/resources/templates/system/usernum/usernum.html
@ -6,7 +6,7 @@
 	<th:block th:include="include :: ztree-css" />
 </head>
 <body class="gray-bg">
-	<div class="ui-layout-center">
+	<div class="ui-layout-center" id="app">
 		<div class="container-div">
 			<div class="row">
 				<div class="col-sm-12 search-collapse">
@ -21,11 +21,21 @@
 								</li>
 								<li>
 									<label>所属市州：</label>
-									<input type="text" name="framework"/>
+									<select id="City" name="framework" @change="getAreaList()" v-model="City">
+										<option value="">请选择</option>
+										<option v-for="option in CityList" :value="option.id" :key="option.id">
+											{{ option.name }}
+										</option>
+									</select>
 								</li>
 								<li>
 									<label>所属区县：</label>
-									<input type="text" name="area"/>
+									<select id="Area" name="area" v-model="Area">
+										<option value="">请选择</option>
+										<option v-for="option in AreaList" :value="option.id" :key="option.id">
+											{{ option.name }}
+										</option>
+									</select>
 								</li>
 								<li>
 									<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
@ -57,7 +67,15 @@
 		var shemichengdu = [[${@dict.getType('sys_user_shemi')}]];
 		var examineState = [[${@dict.getType('sys_examine_state')}]];
 		var prefix = ctx + "system/usernum";
-
+		let datas = []
+		$.ajax({
+			url: ctx + "system/area/getAllList",
+			type: 'GET',
+			data:{parentId:''} ,
+			success:((res)=>{
+				datas = res.data
+			}) ,
+		});
 		$(function() {
 		    var panehHidden = false;
 		    if ($(this).width() < 769) {
@ -95,11 +113,17 @@
 				},
 				{
 					field: 'dept.framework',
-					title: '所属市州'
+					title: '所属市州',
+					formatter: function(value, row, index) {
+						return getCity(datas, value)
+					}
 				},
 				{
 					field: 'dept.area',
-					title: '所属区县'
+					title: '所属区县',
+					formatter: function(value, row, index) {
+						return getCity(datas, value)
+					}
 				},
 				{
 					field: 'dept.deptName',
@ -130,7 +154,48 @@
 			$(".curSelectedNode").removeClass("curSelectedNode");
 			$.table.search();
 		}
-
+		var app = new Vue({
+			el: '#app',
+			data: {
+				CityList: [],
+				AreaList:[],
+				City:'',
+				Area:'',
+				params:{
+					parentId:'',
+				}
+			},
+			mounted(){
+				// 初始化地市列表
+				this.getCityList();
+				if (this.City){
+					this.getAreaList()
+				}
+			},
+			methods:{
+				getCityList(){
+					$.ajax({
+						url: ctx + "system/area/getSysAreaList",
+						type: 'GET',
+						data:this.params ,
+						success:((res)=>{
+							this.CityList = res.data
+						}) ,
+					});
+				},
+				getAreaList(){
+					this.params.parentId = this.City
+					$.ajax({
+						url: ctx + "system/area/getSysAreaList",
+						type: 'GET',
+						data:this.params,
+						success:((res)=>{
+							this.AreaList = res.data
+						}) ,
+					});
+				}
+			}
+		})
 		/* 用户管理-部门 */
 		function dept() {
 			var url = ctx + "system/dept";