yahyahy 3 năm trước cách đây
mục cha
commit
5dfb629207

+ 11 - 0
src/api/system/config.js

@@ -36,6 +36,17 @@ export function listIndextherr(query) {
   })
 }
 
+// 统计
+export function tjList(query) {
+  return request({
+    url: '/boman-web-core/vaccination/statisticYmjz',
+    method: 'get'
+    // params: query listIndextherr
+  })
+}
+
+
+
 // 查询参数详细
 export function getConfig(id) {
   return request({

+ 23 - 2
src/api/system/dept.js

@@ -8,6 +8,8 @@ export function listDept(query) {
     params: query
   })
 }
+
+
 // 查询部门列表
 export function listDeptri(query) {
   return request({
@@ -17,6 +19,15 @@ export function listDeptri(query) {
   })
 }
 
+// 查询部门列表
+export function listDeptrity(query) {
+  return request({
+    url: '/system/dept/deptList',
+    method: 'get',
+    params: query
+  })
+}
+
 
 // 查询部门列表(排除节点)
 export function listDeptExcludeChild(id) {
@@ -35,10 +46,20 @@ export function getDept(id) {
 }
 
 // 查询部门下拉树结构
-export function treeselect() {
+export function treeselect(query) {
   return request({
     url: '/system/dept/treeselect',
-    method: 'get'
+    method: 'get',
+	params: query
+  })
+}
+
+// 查询部门下拉树结构
+export function treeselectdepts(query) {
+  return request({
+    url: '/system/dept/depts',
+    method: 'get',
+	params: query
   })
 }
 

+ 21 - 21
src/router/index.js

@@ -71,27 +71,27 @@ export const constantRoutes = [
         name: '首页',
         meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
       },
-      {
-        path: 'index/approval',
-        hidden: false,
-        component: approval,
-        name: '待我审批',
-        meta: { title: '待我审批', icon: 'dashboard', noCache: false},
-      },
-      {
-        path: 'index/handled',
-        hidden: false,
-        component: handled,
-        name: '已办理',
-        meta: { title: '已办理', icon: 'dashboard', noCache: false},
-      },
-      {
-        path: 'index/tongj',
-        hidden: false,
-        component: tongj,
-        name: '打卡记录',
-        meta: { title: '打卡记录', icon: 'dashboard', noCache: false},
-      },
+      // {
+      //   path: 'index/approval',
+      //   hidden: false,
+      //   component: approval,
+      //   name: '待我审批',
+      //   meta: { title: '待我审批', icon: 'dashboard', noCache: false},
+      // },
+      // {
+      //   path: 'index/handled',
+      //   hidden: false,
+      //   component: handled,
+      //   name: '已办理',
+      //   meta: { title: '已办理', icon: 'dashboard', noCache: false},
+      // },
+      // {
+      //   path: 'index/tongj',
+      //   hidden: false,
+      //   component: tongj,
+      //   name: '打卡记录',
+      //   meta: { title: '打卡记录', icon: 'dashboard', noCache: false},
+      // },
       // {
       //   path: '',
       //   name: '流程工作台',

+ 2 - 2
src/settings.js

@@ -1,8 +1,8 @@
 module.exports = {
   title: '潜山市防疫数据平台',
   // urls: `http://118.178.139.79:7090`,
-  // urls: `http://192.168.101.11:8090`,
-   urls: `https://qsfy.qs163.cn`,
+  urls: `http://192.168.101.11:8090`,
+   // urls: `https://qsfy.qs163.cn`,
 
   /**
    * 侧边栏主题 深色主题theme-dark,浅色主题theme-light

+ 81 - 93
src/views/index.vue

@@ -2,106 +2,78 @@
 	<div class="app-container home">
 		<el-row :gutter="5">
 			<el-col :sm="24" :lg="17">
-				<div class="index_heade">
-					<img src="../assets/images/icon_more.png" alt="" class="index_headerImg" />
-					<p class="index_headetab">
-						<span :class="[num == index ? ' spanto' : '']" v-for="(item, index) in editableTabs" :key="index" @click="tabSbu(item.dictValue)">
-							{{ item.dictLabel }}
-						</span>
-					</p>
-					<div style="height: 87%;">
-						<ul class="index_headerUl">
-							<li v-for="(item, index) in configList" :key="index" @click="headerCld(item)">
-								<img src="../assets/images/icon_list_sj.png" alt="" />
-								<p>{{ item.notice_title }}</p>
-								<span>{{ item.create_time }}</span>
-							</li>
-						</ul>
+				<div class="index_heade index_headeNav" v-show="true">
+					<div  style="padding-top: 20px;">
+						<el-table height="500" max-height="500" :data="tjsli" style="width: 100%;margin-top: 10px;" :stripe="true">
+							<el-table-column  fixed prop="xz" label="乡镇" align="center" ></el-table-column>
+							<el-table-column   label="18岁以上第一针完成情况" align="center">
+								<el-table-column fixed  prop="zrws" label="总任务数"  align="center"></el-table-column>
+								<!-- <el-table-column label="地址"> -->
+									<el-table-column  prop="zjzs" label="总接种数" align="center"></el-table-column>
+									<el-table-column  prop="wcl1" label="完成率" align="center"></el-table-column>
+									<el-table-column  prop="wwcs" label="未完成数 " align="center"></el-table-column>
+									<el-table-column  prop="drjzs" label="当日接种数" align="center"></el-table-column>
+									
+								<!-- </el-table-column> -->
+							</el-table-column>
+							<el-table-column label="第二针当日完成情况" align="center">
+								<el-table-column  prop="drrws" label="当日任务数" align="center"></el-table-column>
+								<el-table-column label="接种数" align="center">
+									<el-table-column  prop="dez" label="第二针" align="center" ></el-table-column>
+									<el-table-column  prop="dsz" label="第三针" align="center" ></el-table-column>
+									<el-table-column  prop="hj" label="合计" align="center" ></el-table-column>
+									
+								
+								</el-table-column>
+								<el-table-column  prop="wcl2" label="完成率" align="center" ></el-table-column>
+							</el-table-column>
+						</el-table>
 						<div class="index_haderPagin">
-							<el-pagination
-								v-show="total > 0"
+							<!-- <el-pagination
 								@size-change="handleSizeChange"
 								@current-change="handleCurrentChange"
 								:current-page.sync="currentPage3"
-								:page-size="queryParams.pageSize"
+								:page-size="pageSize"
 								layout="prev, pager, next, jumper"
-								:total="total"
+								:total="1000"
 							></el-pagination>
-							<span>共 {{ total }} 条 每页显示 10 条</span>
+							<span>共 85 条 每页显示 5 条 当前 1/17 页</span> -->
 						</div>
 					</div>
 				</div>
 				<!-- 列表 -->
-				<!-- <el-col :sm="24" :lg="24"  style="margin-top: 20px;" >
-               <div class="index_heade index_headeNav" v-show="true">
-                 <img src="../assets/images/icon_more.png" alt="" class="index_headerImg">
-                 <p class="index_headetab">
-                   <span :class="[numlist == index ? ' spanto' : '']" v-for="(item,index) in attendance" :key="index" @click="tabList(index)">{{item}} <p class="tab_i">3</p></span></span>
-                 </p>
-
-                         <div v-if="num == 0">
-                           <el-table :data="tableDataalid" style="width: 100%;margin-top: 10px;"  :stripe="true"   >
-                                  <el-table-column label="序号" align="center" prop="noticeId" width="60" height="53" max-height="53" />
-                                  <el-table-column
-                                    label="申请人"
-                                    align="center"
-                                    prop="name"
-                                    :show-overflow-tooltip="true"
-                                    width="70"
-                                  />
-                                  <el-table-column
-                                    label="部门"
-                                    align="center"
-                                    prop="name"
-
-                                    width="70"
-                                  />
-                                  <el-table-column
-                                    label="请假类型"
-                                    align="center"
-                                    prop="status"
-
-                                    width="75"
-                                  />
-                                  <el-table-column label="请假事由" align="center" prop="createBy" width="100"  :show-overflow-tooltip="true"/>
-                                  <el-table-column label="请假时间" align="center" prop="date" width="150"/>
-                                  <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-                                    <template slot-scope="scope">
-                                      <el-button
-                                        size="small"
-                                        type="success"
-                                        @click="handleUpdate(scope.row)"
-                                        v-hasPermi="['system:notice:edit']"
-                                      >详情</el-button>
-                                      <el-button
-                                        size="small"
-                                        type="primary"
-                                        @click="handleDelete(scope.row)"
-                                        v-hasPermi="['system:notice:remove']"
-                                      >同意</el-button>
-                                      <el-button
-                                        size="small"
-                                        type="danger"
-                                        @click="handleDelete(scope.row)"
-                                        v-hasPermi="['system:notice:remove']"
-                                      >驳回</el-button>
-                                    </template>
-                                  </el-table-column>
-                                 </el-table>
-                           <div class="index_haderPagin">
-                             <el-pagination
-                                  @size-change="handleSizeChange"
-                                  @current-change="handleCurrentChange"
-                                  :current-page.sync="currentPage3"
-                                  :page-size="pageSize"
-                                  layout="prev, pager, next, jumper"
-                                  :total="1000">
-                             </el-pagination>
-                             <span>共 85 条  每页显示 5 条  当前 1/17 页</span>
-                           </div>
-                         </div>
-               </div>
-          </el-col> -->
+				<el-col :sm="24" :lg="24" style="margin-top: 20px; ">
+					<div class="index_heade">
+						<img src="../assets/images/icon_more.png" alt="" class="index_headerImg" />
+						<p class="index_headetab">
+							<span :class="[num == index ? ' spanto' : '']" v-for="(item, index) in editableTabs" :key="index" @click="tabSbu(item.dictValue)">
+								{{ item.dictLabel }}
+							</span>
+						</p>
+						<div style="height: 87%;">
+							<ul class="index_headerUl">
+								<li v-for="(item, index) in configList" :key="index" @click="headerCld(item)">
+									<img src="../assets/images/icon_list_sj.png" alt="" />
+									<p>{{ item.notice_title }}</p>
+									<span>{{ item.create_time }}</span>
+								</li>
+							</ul>
+							<div class="index_haderPagin">
+								<el-pagination
+									v-show="total > 0"
+									@size-change="handleSizeChange"
+									@current-change="handleCurrentChange"
+									:current-page.sync="currentPage3"
+									:page-size="queryParams.pageSize"
+									layout="prev, pager, next, jumper"
+									:total="total"
+								></el-pagination>
+								<span>共 {{ total }} 条 每页显示 10 条</span>
+							</div>
+						</div>
+					</div>
+					
+				</el-col>
 				<!-- </el-row> -->
 				<!-- 公司概况 -->
 				<!-- <el-col :sm="24" :lg="24">
@@ -312,7 +284,8 @@ import {
 	clearCache,
 	delIndexnabd,
 	listIndexber,
-	getTableQuery
+	getTableQuery,
+	tjList
 } from '@/api/system/config';
 import Editor from '@/components/Editor';
 export default {
@@ -441,6 +414,7 @@ export default {
 			getLisaillie: [],
 			alendarList: [],
 			calendarData: [],
+			tjsli:[],
 			ary: [],
 			tieku: '',
 			comg: '',
@@ -521,6 +495,8 @@ export default {
 		this.getLisail(); //通讯录
 		this.getLisailtwo();
 		this.init();
+		// 统计列表
+		this.tiheyu()
 	},
 	computed: {
 		// 时间高亮的数组
@@ -688,7 +664,7 @@ export default {
 								if (typeof route[item] == 'object') {
 									route[item] = route[item].value;
 								}
-							}
+							}tableDataalid
 						});
 					}
 
@@ -902,6 +878,12 @@ export default {
 			// this.resetForm("queryParamsail");
 			console.log(this.queryParamsail);
 			this.getLisail();
+		},
+		// 统计列表
+		tiheyu(){
+			tjList().then(response => {
+				this.tjsli = response.data;
+			});
 		}
 	}
 };
@@ -975,7 +957,13 @@ export default {
 	}
 	.el-table th.is-leaf,
 	.el-table td {
-		border: 0 !important;
+		// border: 0 !important;
+	}
+	.el-table thead.is-group th{
+		background-color: #f8f8f8 !important;
+	}
+	.el-table--medium td{
+		padding: 12px 0 !important;
 	}
 	.el-calendar__title {
 		font-size: 12px;

+ 31 - 7
src/views/system/dept/index.vue

@@ -44,9 +44,12 @@
       v-loading="loading"
       :data="deptList"
       row-key="id"
+	  lazy
+	  :load="load"
       :default-expand-all="false"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
+	<!-- deptName -->
       <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
       <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
       <el-table-column prop="status" label="状态" :formatter="statusFormat" width="100"></el-table-column>
@@ -139,7 +142,7 @@
 </template>
 
 <script>
-import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild, listDeptri } from "@/api/system/dept";
+import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild, listDeptri,listDeptrity } from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
@@ -202,6 +205,9 @@ export default {
     this.getDicts("sys_normal_disable").then(response => {
       this.statusOptions = response.data;
     });
+	listDeptrity().then(response => {
+	      this.deptOptions = this.handleTree(response.data, "id");
+	});
   },
   methods: {
     /** 查询部门列表 */
@@ -212,6 +218,19 @@ export default {
         this.loading = false;
       });
     },
+	// 列表懒加载
+	load(row, treeNode, resolve){
+		console.log(row, treeNode, resolve)
+		this.resetForm("queryForm");
+		this.queryParams.id = row.id
+		listDept(this.queryParams).then(response => {
+		  // this.deptList = this.handleTree(response.data, "id");
+		  resolve(response.data)
+		  this.loading = false;
+		});
+		 
+	},
+		
     /** 转换部门数据结构 */
     normalizer(node) {
       if (node.children && !node.children.length) {
@@ -248,11 +267,13 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+		this.queryParams.id = undefined
       this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+	  
       this.handleQuery();
     },
     /** 新增按钮操作 */
@@ -263,21 +284,24 @@ export default {
       }
       this.open = true;
       this.title = "添加部门";
-      listDept().then(response => {
-	        this.deptOptions = this.handleTree(response.data, "id");
-      });
+      
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+	  console.log(row)
       getDept(row.id).then(response => {
         this.form = response.data;
+		if(this.form.parentId == undefined){
+			this.form.parentId = 0
+		}
+		console.log(this.form.parentId)
         this.open = true;
         this.title = "修改部门";
       });
-      listDeptExcludeChild(row.id).then(response => {
-	        this.deptOptions = this.handleTree(response.data, "id");
-      });
+      // listDeptExcludeChild(row.id).then(response => {
+	     //    this.deptOptions = this.handleTree(response.data, "id");
+      // });
     },
     /** 提交按钮 */
     submitForm: function() {

+ 35 - 19
src/views/system/time/index.vue

@@ -325,10 +325,12 @@
 										placeholder="点击选择户籍地址"
 										:options="options"
 										:filterable="true"
+										separator=","
 										@change="chahe"
 										v-model="villageTownshy"
 										:props="optionProps"
 										style="width: 100%;"
+										ref="myCascader"
 									></el-cascader>
 								</el-form-item>
 							</el-col>
@@ -700,7 +702,7 @@ export default {
 						vaccinationPlace: '',
 						jici: '',
 						progress: '',
-						url:''
+						url:null
 					}
 				]
 			},
@@ -711,7 +713,7 @@ export default {
 				userName: [{ required: true, message: '姓名不能为空', trigger: 'blur' }]
 			},
 			selected: ['安徽省', '安庆市', '潜山市'],
-			selectedtwo: ['安徽省', '安庆市', '潜山市'],
+			selectedtwo: [],
 			statusOptions: [
 				{
 					dictValue: '女',
@@ -787,7 +789,7 @@ export default {
 					dictLabel: '3'
 				},
 				{
-					dictValue: '4',
+					dictValue: '加强针',
 					dictLabel: '加强针'
 				}
 			],
@@ -842,11 +844,14 @@ export default {
 		this.form.province = this.selected[0];
 		this.form.city = this.selected[1];
 		this.form.region = this.selected[2];
-		this.queryParams.province = this.selectedtwo[0];
-		this.queryParams.city = this.selectedtwo[1];
-		this.queryParams.region = this.selectedtwo[2];
+		// this.queryParams.province = this.selectedtwo[0];
+		// this.queryParams.city = this.selectedtwo[1];
+		// this.queryParams.region = this.selectedtwo[2];
 		// this.naiseurya = this.form.province + this.form.city + this.form.region;
 	},
+	mounted() {
+		console.log(136)
+	},
 	methods: {
 		onSelected(data) {
 			console.log(data, 125);
@@ -992,7 +997,7 @@ export default {
 						vaccinationPlace: '',
 						jici: '',
 						progress: '',
-						url:[]
+						url:null
 					}
 				]
 				}
@@ -1052,7 +1057,7 @@ export default {
 		},
 		upImageFn(res, file) {
 			if (res.code !== 200) {
-				this.msgSuccess('上传失败');
+				this.msgInfo('上传失败');
 				return false;
 			} else {
 				this.msgSuccess('上传成功');
@@ -1070,7 +1075,7 @@ export default {
 			console.log(res.data.name.substr(-4));
 		},
 		err() {
-			this.msgSuccess('上传失败');
+			this.msgInfo('上传失败');
 			console.log(35);
 		},
 		reseImage(file, fileList) {
@@ -1132,8 +1137,9 @@ export default {
 		},
 		upImageFntwo(res, file) {
 			this.comfietg = []
+			
 			if (res.code !== 200) {
-				this.msgSuccess('上传失败');
+				this.msgInfo('上传失败');
 				return false;
 			} else {
 				this.msgSuccess('上传成功');
@@ -1142,6 +1148,7 @@ export default {
 					router.name = '附件'
 				})
 				console.log(this.comfietg); 
+				this.form.vaccineInfoUserList[this.nameutaiL].url = []
 				console.log(res.data.name.substr(0, res.data.name.length - 4));
 				console.log(this.nameutaiL)
 				this.form.vaccineInfoUserList[this.nameutaiL].url = this.comfietg
@@ -1169,7 +1176,7 @@ export default {
 				}
 			}
 			if (this.comfietg.length == 0) {
-				this.form.vaccineInfoUserList[this.nameutaiL].url = [];
+				this.form.vaccineInfoUserList[this.nameutaiL].url = null;
 			} else {
 				this.form.vaccineInfoUserList[this.nameutaiL].url = JSON.stringify(this.form.vaccineInfoUserList[this.nameutaiL].url);
 			}
@@ -1217,7 +1224,7 @@ export default {
 		upImageFnther(res, file) {
 			this.configther = []
 			if (res.code !== 200) {
-				this.msgSuccess('上传失败');
+				this.msgInfo('上传失败');
 				return false;
 			} else {
 				this.msgSuccess('上传成功');
@@ -1383,7 +1390,7 @@ export default {
 						vaccinationPlace: '',
 						jici: '',
 						progress: '',
-						url:[]
+						url:null
 					}
 				]
 			};
@@ -1410,8 +1417,10 @@ export default {
 		handleAdd() {
 			this.reset();
 			this.open = true;
-			(this.naneme = false), (this.shouwes = false);
-			(this.selected = ['安徽省', '安庆市', '潜山市']), (this.form.province = this.selected[0]);
+			(this.naneme = false), 
+			(this.shouwes = false);
+			// this.selected = ['安徽省', '安庆市', '潜山市'], 
+			this.form.province = this.selected[0];
 			this.villageTownshy = '';
 			this.naiseurya = '';
 			this.hsuej = '';
@@ -1464,13 +1473,15 @@ export default {
 								vaccinationPlace: '',
 								jici: '',
 								progress: '',
-								url:[]
+								url:null
 							}
 						];
 					}else {
 						this.form.vaccineInfoUserList.filter(router =>{
 							if(router.url == undefined){
-								router.url = []
+								router.url = null
+							}else if(router.url == []){
+								router.url = null
 							}
 						})
 					}
@@ -1487,6 +1498,9 @@ export default {
 		},
 		chahe(data) {
 			console.log(data);
+			// let labelValue = this.$refs['myCascader'].inputValue
+			// console.log(labelValue)
+			console.log(this.$refs['myCascader'])
 			this.form.villageTowns = data[1];
 			this.form.village = data[2];
 			this.form.villagerGroup = data[3];
@@ -1617,14 +1631,16 @@ export default {
 				vaccinationPlace: '',
 				jici: '',
 				progress: '',
-				url:[]
+				url:null
 			});
 		},
 		// 点击删除
 		naeyrfakjf(index, item) {
+			
 			if (this.form.vaccineInfoUserList.length == 1) {
 				return false;
 			}
+			
 			if (this.jdourdjoaj == true) {
 				// 新增
 				this.form.vaccineInfoUserList.splice(index, 1);
@@ -1636,7 +1652,7 @@ export default {
 				console.log(ide);
 				if (ide !== undefined) {
 					console.log(234);
-					delInfort(this.ide).then(response => {
+					delInfort(ide).then(response => {
 						this.msgSuccess('操作成功');
 					});
 				}

+ 44 - 8
src/views/system/user/index.vue

@@ -19,8 +19,10 @@
             :props="defaultProps"
             :expand-on-click-node="false"
             :filter-node-method="filterNode"
+			 node-key="id"
             ref="tree"
-            default-expand-all
+			:load="loadNode"
+			lazy
             @node-click="handleNodeClick"
           />
         </div>
@@ -214,7 +216,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+              <treeselect v-model="form.deptId" :options="deptOptionsyu" :show-count="true" placeholder="请选择归属部门" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -345,7 +347,7 @@
 <script>
 import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus } from "@/api/system/user";
 import { getToken } from "@/utils/auth";
-import { treeselect } from "@/api/system/dept";
+import { treeselect,treeselectdepts } from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
@@ -372,6 +374,7 @@ export default {
       title: "",
       // 部门树选项
       deptOptions: undefined,
+	  deptOptionsyu:undefined,
       // 是否显示弹出层
       open: false,
       // 部门名称
@@ -488,8 +491,8 @@ export default {
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
-      treeselect().then(response => {
-        this.deptOptions = response.data;
+      treeselectdepts().then(response => {
+        this.deptOptionsyu = response.data;
       });
     },
     // 筛选节点
@@ -502,6 +505,37 @@ export default {
       this.queryParams.deptId = data.id;
       this.getList();
     },
+	// 懒加载事件
+	loadNode(node, resolve){
+		console.log(node.key)
+		 if (node.level === 0) {
+			 treeselect().then(response => {
+			   // this.deptOptions = response.data;
+			   return resolve(
+			   response.data
+			   );
+			   // resolve();
+			 });
+		          
+		}
+		if (node.level >= 1) { // 点击之后触发
+		treeselect({id:node.key}).then(response => {
+		  // this.deptOptions = response.data;
+		  return resolve(response.data);
+		  // resolve(response.data);
+		});
+		                    
+		                }
+		  //       if (node.level > 1) return resolve([]);
+				// if(node.level == 1){
+					
+				// }
+		// treeselect(node.id).then(response => {
+		//   // this.deptOptions = response.data;
+		//   resolve(response.data);
+		// });
+		 
+	},
     // 用户状态修改
     handleStatusChange(row) {
       let text = row.status === "0" ? "启用" : "停用";
@@ -542,13 +576,15 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.page = 1;
+      // this.queryParams.page = 1;
       this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
       this.dateRange = [];
+	  this.queryParams.deptId = undefined
       this.resetForm("queryForm");
+	  // this.queryForm.page = undefined
       this.handleQuery();
     },
     // 多选框选中数据
@@ -560,7 +596,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      this.getTreeselect();
+      // this.getTreeselect();
       getUser().then(response => {
         this.postOptions = response.posts;
         this.roleOptions = response.roles;
@@ -572,7 +608,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      this.getTreeselect();
+      // this.getTreeselect();
       const id = row.id || this.ids;
       getUser(id).then(response => {
         this.form = response.data;