From bad2bc143be3f8ddb93a1c9f984127b3ccf43e8f Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期一, 31 三月 2025 17:47:14 +0800
Subject: [PATCH] 11

---
 src/views/team/reportresults/index.vue |   46 ++++++++++++++++++++++++++++++++++++----------
 1 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/src/views/team/reportresults/index.vue b/src/views/team/reportresults/index.vue
index 91a168d..c01ecfb 100644
--- a/src/views/team/reportresults/index.vue
+++ b/src/views/team/reportresults/index.vue
@@ -7,13 +7,14 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="鏃堕棿" prop="applicationTime">
+      <el-form-item label="鏃堕棿" prop="createTimeList">
         <el-date-picker
           clearable
           v-model="createTimeList"
           @change="dateChangebirthday1"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
+          :default-time="['00:00:00', '23:00:00']"
+              format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
           type="daterange"
           range-separator="-"
           start-placeholder="寮�濮嬫棩鏈�"
@@ -96,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"
@@ -106,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>
@@ -307,6 +309,8 @@
 require("echarts/lib/component/tooltip");
 require("echarts/lib/component/legend");
 require("echarts/lib/chart/pie");
+import { getNewDateList } from "@/api/hosp/order";
+import moment from "moment";
 import VTreeTransfer from "../../system/tijian/TreeTransfer.vue";
 import { projectGetList } from "@/api/system/tijian";
 import {
@@ -398,8 +402,9 @@
     };
   },
   created() {
+    this.getdate();
     this.getNowTime();
-    this.getList();
+    
     this.getcomp();
     this.getData();
     this.datekey = Date.now();
@@ -410,6 +415,15 @@
     },
   },
   methods: {
+    getdate() {
+      getNewDateList().then((res) => {
+        this.createTimeList = [
+          moment(res.data).format("YYYY-MM-DD 00:00:00"),
+          moment(res.data).format("YYYY-MM-DD 23:59:00"),
+        ];
+        this.getList();
+      });
+    },
     filterNode(value, data) {
       if (!value) return true;
       return data.proName.indexOf(value) !== -1;
@@ -420,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;
       });
     },
@@ -470,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;
@@ -480,11 +505,11 @@
 
     handleSizeChange(val) {
       this.queryParam.pageSize = val;
-      this.geticd();
+      // this.geticd();
     },
     handleCurrentChange(val) {
       this.queryParam.page = val;
-      this.geticd();
+      // this.geticd();
     },
     /** 鏌ヨ浣撴鍗曚綅淇℃伅缁存姢鍒楄〃 */
     getcomp() {
@@ -520,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