From c75027743ea7c3ecc2d0885f01d11d2ad78679a3 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 23 十月 2026 14:23:26 +0800
Subject: [PATCH] Merge branch 'yxh' of http://116.62.18.175:6699/r/~yxh/opo-web

---
 src/views/project/statistics/chargeStatistics/index.vue |   46 ++++++++++++++++++++++++++++++++++------------
 1 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/views/project/statistics/chargeStatistics/index.vue b/src/views/project/statistics/chargeStatistics/index.vue
index fbfd775..9046ff8 100644
--- a/src/views/project/statistics/chargeStatistics/index.vue
+++ b/src/views/project/statistics/chargeStatistics/index.vue
@@ -2,6 +2,7 @@
 <template>
   <div class="app-container">
     <el-form
+      class="opo-query-form"
       :model="queryParams"
       ref="queryForm"
       :inline="true"
@@ -17,19 +18,19 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="缁熻绫诲瀷">
-            <el-select
-              v-model="queryParams.pachageflag"
-              placeholder="璇烽�夋嫨妗堜緥鐘舵��"
+        <el-col :span="12">
+          <el-form-item label="缁熻鏃ユ湡">
+            <el-date-picker
+              style="width: 100%"
+              v-model="selecttime"
+              type="monthrange"
+              range-separator="鑷�"
+              start-placeholder="寮�濮嬫湀浠�"
+              end-placeholder="缁撴潫鏈堜唤"
+              value-format="yyyy-MM-dd"
+              @change="getTimeList"
             >
-              <el-option
-                v-for="item in reportlist"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
+            </el-date-picker>
           </el-form-item>
         </el-col>
       </el-row>
@@ -284,6 +285,27 @@
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    getTimeList(e) {
+      if (this.selecttime != 0) {
+        this.queryParams.pabegtime = this.selecttime[0];
+        this.queryParams.paendtime = this.selecttime[1];
+        // if (this.queryParams.paendtime == this.queryParams.pabegtime) {
+        // 缁撴潫鏃堕棿鍙�"鎵�閫夌粨鏉熸湀鐨勬鏈� 1 鍙�"锛屼互鍖呭惈鏁翠釜缁撴潫鏈堛��
+        // 鍘熷疄鐜版妸鏈堜唤 +1 鍚庣洿鎺ユ嫾瀛楃涓诧紝12 鏈堜細寰楀埌 13 鏈堬紙2026-13-01锛夛紝
+        // MySQL 鎶� Incorrect datetime value锛屽瓨鍌ㄨ繃绋嬬洿鎺� 500銆�
+        this.queryParams.paendtime = this.$moment(this.queryParams.paendtime)
+          .startOf("month")
+          .add(1, "month")
+          .format("YYYY-MM")
+          .concat("-01 00:00:00");
+        this.queryParams.pabegtime =
+          this.queryParams.pabegtime + " " + "00" + ":" + "00" + ":" + "00";
+        // }
+      } else {
+        // this.queryParams.pabegtime = "1998-01-01 00:00:00";
+        // this.queryParams.paendtime = "2998-01-01 00:00:00";
+      }
+    },
     getSummaries(param) {
       const { columns, data } = param;
       const sums = [];

--
Gitblit v1.9.3