From cee2eca9c3e40b48c40a8fe80f938a777f03d463 Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期二, 10 六月 2025 17:57:11 +0800
Subject: [PATCH] 1

---
 src/views/team/reportresults/index.vue |   31 ++++++++++++++++++++++---------
 1 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/views/team/reportresults/index.vue b/src/views/team/reportresults/index.vue
index 4eb5c10..c01ecfb 100644
--- a/src/views/team/reportresults/index.vue
+++ b/src/views/team/reportresults/index.vue
@@ -7,7 +7,7 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="鏃堕棿" prop="applicationTime">
+      <el-form-item label="鏃堕棿" prop="createTimeList">
         <el-date-picker
           clearable
           v-model="createTimeList"
@@ -97,6 +97,7 @@
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
+          style="margin: 0 15px;"
           >鏌ヨ</el-button
         >
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
@@ -107,7 +108,7 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" size="mini" @click="tongji"
+        <el-button type="primary" size="mini" @click="tongji"  style="margin: 0 15px;"
           >缁熻缁撴灉</el-button
         >
       </el-col>
@@ -403,7 +404,7 @@
   created() {
     this.getdate();
     this.getNowTime();
-    this.getList();
+    
     this.getcomp();
     this.getData();
     this.datekey = Date.now();
@@ -420,7 +421,7 @@
           moment(res.data).format("YYYY-MM-DD 00:00:00"),
           moment(res.data).format("YYYY-MM-DD 23:59:00"),
         ];
-        console.log(this.createTimeList, 111);
+        this.getList();
       });
     },
     filterNode(value, data) {
@@ -433,6 +434,11 @@
       /** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
       projectGetList().then((response) => {
         this.Treedata = response.data.list;
+        this.Treedata.forEach(item => {
+          if(item.proParentId == "0"){
+            item.disabled = true
+          }
+        })
         this.loading = false;
       });
     },
@@ -483,8 +489,14 @@
     },
     // 鍥㈡鐥呯椤甸潰鏌ヨ浜哄憳鍒楄〃
     getList() {
-      this.queryParams.beginTime = this.createTimeList[0];
+      if(this.createTimeList){
+        this.queryParams.beginTime = this.createTimeList[0];
       this.queryParams.endTime = this.createTimeList[1];
+      }else if(this.createTimeList == null){
+        this.queryParams.beginTime = null;
+      this.queryParams.endTime = null;
+      }
+     
       getPeopleList(this.queryParams).then((res) => {
         this.tableData = res.data.voList;
         this.total = res.data.total;
@@ -493,11 +505,11 @@
 
     handleSizeChange(val) {
       this.queryParam.pageSize = val;
-      this.geticd();
+      // this.geticd();
     },
     handleCurrentChange(val) {
       this.queryParam.page = val;
-      this.geticd();
+      // this.geticd();
     },
     /** 鏌ヨ浣撴鍗曚綅淇℃伅缁存姢鍒楄〃 */
     getcomp() {
@@ -533,11 +545,12 @@
     handleQuery() {
       this.queryParams.page = 1;
       this.getList();
-      this.queryParam.page = 1;
-      this.geticd();
+      // this.queryParam.page = 1;
+      // this.geticd();
     },
     /** 閲嶇疆鎸夐挳鎿嶄綔 */
     resetQuery() {
+      this.createTimeList = []
       this.resetForm("queryForm");
       this.handleQuery();
       this.loading = true;

--
Gitblit v1.8.0