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/applyStatistics/index.vue | 58 +++++++++++-----------------------------------------------
1 files changed, 11 insertions(+), 47 deletions(-)
diff --git a/src/views/project/statistics/applyStatistics/index.vue b/src/views/project/statistics/applyStatistics/index.vue
index a4de14b..447eb92 100644
--- a/src/views/project/statistics/applyStatistics/index.vue
+++ b/src/views/project/statistics/applyStatistics/index.vue
@@ -2,6 +2,7 @@
<template>
<div class="app-container">
<el-form
+ class="opo-query-form"
:model="queryParams"
ref="queryForm"
:inline="true"
@@ -141,7 +142,6 @@
import AnnexUpload from "@/views/project/components/annexupload";
import { listDept } from "@/api/system/dept";
-
export default {
//import寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
components: {
@@ -161,7 +161,7 @@
selecttime: "",
reportervalue: "",
reportlist: [
- { label: "宸梾璐�", value: "1" },
+ { label: "宸梾璐�", value: "0" },
{ label: "涓撳璐�", value: "1" },
{ label: "浼︾悊涓撳璐�", value: "2" },
{ label: "鍖诲鎴愭湰", value: "3" },
@@ -266,48 +266,14 @@
this.queryParams.pabegtime = this.selecttime[0];
this.queryParams.paendtime = this.selecttime[1];
// if (this.queryParams.paendtime == this.queryParams.pabegtime) {
- let num = Number(this.queryParams.paendtime.slice(5, 7));
- if (num < 9) {
- let mon = Number(this.queryParams.paendtime.slice(6, 7));
- this.queryParams.paendtime =
- this.queryParams.paendtime.slice(0, 5) +
- "0" +
- (mon + 1) +
- "-" +
- "01" +
- " " +
- "00" +
- ":" +
- "00" +
- ":" +
- "00";
- }
- // this.queryParams.paendtime=this.queryParams.paendtime.slice(0,5)骞�
- else if (num >= 10) {
- this.queryParams.paendtime =
- this.queryParams.paendtime.slice(0, 5) +
- (num + 1) +
- "-" +
- "01" +
- " " +
- "00" +
- ":" +
- "00" +
- ":" +
- "00";
- } else {
- this.queryParams.paendtime =
- this.queryParams.paendtime.slice(0, 5) +
- "10" +
- "-" +
- "01" +
- " " +
- "00" +
- ":" +
- "00" +
- ":" +
- "00";
- }
+ // 缁撴潫鏃堕棿鍙�"鎵�閫夌粨鏉熸湀鐨勬鏈� 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";
// }
@@ -359,9 +325,7 @@
this.reportervalue = "";
-
- this.queryParams = {
- };
+ this.queryParams = {};
this.selecttime = [];
this.getTimeList();
this.searchAddress = {
--
Gitblit v1.9.3