From 7ccb24a47c5c85949f05ba3ba1cb0ef6cb3b376b Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Sat, 27 Jul 2024 17:47:37 +0800
Subject: [PATCH] bug

---
 .../dai_yunyingfenxi/tab/paym.vue             | 68 +++++++++++--------
 .../dai_yunyingfenxi/tab/paytype.vue          | 25 ++++---
 .../yunyingfenxi/tab/int.vue                  | 19 ++++--
 .../yunyingfenxi/tab/oil.vue                  | 19 ++++--
 .../yunyingfenxi/tab/store.vue                | 19 ++++--
 5 files changed, 98 insertions(+), 52 deletions(-)

diff --git a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue
index 0e7a6e942..5e8040c0f 100644
--- a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue
@@ -3,36 +3,41 @@
   <div style="margin-top: 0px">
     <el-card class="box-card" style="margin-top: 0px;">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px" >
-        <div class="d-s" style="margin-bottom: 15px">
-          <div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList"
-               :key="index" @click="editColor(index)">
-            {{ item }}
-          </div>
-          <el-date-picker
-            v-model="value2"
-            type="datetimerange"
-            style="height: 32px"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期" @click="handleQuery">
-          </el-date-picker>
-          <div style="margin-left: 15px;margin-top: 17px;width: 100%">
-            <el-form-item label="" prop="deptId" style="width: 180px">
-              <el-select
-                v-model="queryParams.deptId"
-                clearable
-                placeholder="所属机构"
-              >
-                <el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item class="" style="float: right;">
-              <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-            </el-form-item>
+        <div class="d-s" style="margin-bottom: 15px;justify-content: space-between">
+          <div class="d-s">
+            <div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList"
+                 :key="index" @click="editColor(index)">
+              {{ item }}
+            </div>
+            <el-date-picker
+              v-model="value2"
+              type="datetimerange"
+              style="height: 32px"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :disabled="disabled"
+              @click="handleQuery">
+            </el-date-picker>
+            <div style="margin-left: 15px;margin-top: 17px">
+              <el-form-item label="" prop="deptId" style="width: 180px">
+                <el-select
+                  v-model="queryParams.deptId"
+                  clearable
+                  placeholder="所属机构"
+                >
+                  <el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </div>
           </div>
+
+          <el-form-item class="" style="float: right;margin-top: 17px;">
+            <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
         </div>
       </el-form>
       <div class="wrap-boxs">
@@ -132,8 +137,10 @@ export default {
         "近一周",
         "近一月",
         "近一年",
+        "自定义",
       ],
       timeIndex: 0,
+      disabled:true,
       value2: [],
       // 查询参数
       queryParams: {
@@ -181,6 +188,7 @@ export default {
   methods: {
     editColor(index) {
       this.timeIndex = index
+      this.disabled = true
       if (this.timeList[index] == '今日') {
         let start = new Date();
         start.setHours(0)
@@ -200,6 +208,8 @@ export default {
         let nowDate = new Date();
         let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate())
         this.value2 = [parseTime(oneWeekAgo), parseTime(nowDate)]
+      }else if (this.timeList[index]=='自定义'){
+        this.disabled = false
       }
       this.handleQuery()
     },
diff --git a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
index 81a6a36ec..b2e62d0cc 100644
--- a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
@@ -3,7 +3,8 @@
   <div style="margin-top: 0px">
     <el-card class="box-card">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
-        <div class="d-s">
+        <div class="d-s" style="justify-content: space-between">
+          <div class="d-s">
           <div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList"
                :key="index" @click="editColor(index)">
             {{ item }}
@@ -12,12 +13,14 @@
             v-model="value2"
             type="datetimerange"
             range-separator="至"
-            style="height: 32px"
+            style="height: 32px;"
             value-format="yyyy-MM-dd HH:mm:ss"
             start-placeholder="开始日期"
-            end-placeholder="结束日期" @click="handleQuery">
+            end-placeholder="结束日期"
+            :disabled="disabled"
+            @click="handleQuery">
           </el-date-picker>
-          <div style="margin-left: 15px;margin-top: 17px;width: 100%">
+          <div style="margin-left: 15px;margin-top: 17px;">
             <el-form-item label="" prop="deptId" style="width: 180px">
               <el-select
                 v-model="queryParams.deptId"
@@ -28,11 +31,12 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item class="" style="float: right;">
-              <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-            </el-form-item>
           </div>
+          </div>
+          <el-form-item class="" style="margin-top: 17px;">
+            <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
         </div>
 
       </el-form>
@@ -118,8 +122,10 @@ export default {
         "近一周",
         "近一月",
         "近一年",
+        "自定义",
       ],
       timeIndex: 0,
+      disabled:true,
       value2: [],
       // 日期范围
       dateRange: [],
@@ -180,6 +186,7 @@ export default {
   methods: {
     editColor(index) {
       this.timeIndex = index
+      this.disabled = true
       if (this.timeList[index] == '今日') {
         let start = new Date();
         start.setHours(0)
@@ -199,6 +206,8 @@ export default {
         let nowDate = new Date();
         let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate())
         this.value2 = [parseTime(oneWeekAgo), parseTime(nowDate)]
+      }else if (this.timeList[index]=='自定义'){
+        this.disabled = false
       }
       this.handleQuery()
     },
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
index e79d082fd..d650bc353 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
@@ -3,7 +3,8 @@
   <div style="margin-top: 0px;margin-right: 40px">
     <el-card class="box-card">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
-        <div class="d-s">
+        <div class="d-s"  style="justify-content: space-between;width: 100%">
+          <div class="d-s">
           <div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList"
                :key="index" @click="editColor(index)">
             {{ item }}
@@ -15,9 +16,11 @@
             value-format="yyyy-MM-dd HH:mm:ss"
             style="height:32px"
             start-placeholder="开始日期"
-            end-placeholder="结束日期" @click="handleQuery">
+            end-placeholder="结束日期"
+            :disabled="disabled"
+            @click="handleQuery">
           </el-date-picker>
-          <div style="margin-left: 15px;margin-top: 17px;width: 100%">
+          <div style="margin-left: 15px;margin-top: 17px;">
             <el-form-item label="" prop="deptId" style="width: 180px">
               <el-select
                 v-model="queryParams.deptId"
@@ -28,11 +31,12 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item class="" style="float: right;">
+          </div>
+          </div>
+            <el-form-item class="" style="float: right;margin-top: 17px;">
               <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
               <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
             </el-form-item>
-          </div>
         </div>
       </el-form>
       <div class="wrap-box">
@@ -116,8 +120,10 @@ export default {
         "近一周",
         "近一月",
         "近一年",
+        "自定义",
       ],
       timeIndex: 0,
+      disabled:true,
       value2: [],
       // 日期范围
       dateRange: [],
@@ -175,6 +181,7 @@ export default {
   methods: {
     editColor(index){
       this.timeIndex = index
+      this.disabled = true
       if (this.timeList[index]=='今日'){
         let start = new Date();
         start.setHours(0)
@@ -194,6 +201,8 @@ export default {
         let nowDate = new Date();
         let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate())
         this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
+      }else if (this.timeList[index]=='自定义'){
+        this.disabled = false
       }
       this.handleQuery()
     },
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
index 2cac67c44..3a9447178 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
@@ -3,7 +3,8 @@
   <div style="margin-top: 0px; margin-right: 40px">
     <el-card class="box-card">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
-        <div class="d-s">
+        <div class="d-s" style="justify-content: space-between;width: 100%">
+          <div class="d-s">
           <div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList" :key="index" @click="editColor(index)">
             {{item}}
           </div>
@@ -15,9 +16,11 @@
             range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
             start-placeholder="开始日期"
-            end-placeholder="结束日期" @click="handleQuery">
+            end-placeholder="结束日期"
+            :disabled="disabled"
+            @click="handleQuery">
           </el-date-picker>
-          <div style="margin-left: 15px;margin-top: 17px;width: 100%">
+          <div style="margin-left: 15px;margin-top: 17px;">
             <el-form-item label="" prop="deptId" style="width: 180px">
               <el-select
                 v-model="queryParams.deptId"
@@ -29,11 +32,12 @@
               </el-select>
             </el-form-item>
 
-            <el-form-item class="" style="float: right;">
+          </div>
+          </div>
+            <el-form-item class="" style="margin-top: 17px;">
               <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
               <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
             </el-form-item>
-          </div>
         </div>
 
       </el-form>
@@ -152,8 +156,10 @@ import {parseTime} from "@/utils/fuint";
           "近一周",
           "近一月",
           "近一年",
+          "自定义",
         ],
         timeIndex:0,
+        disabled:true,
         value2: [],
         // 查询参数
         queryParams: {
@@ -203,6 +209,7 @@ import {parseTime} from "@/utils/fuint";
     methods:{
       editColor(index){
         this.timeIndex = index
+        this.disabled = true
         if (this.timeList[index]=='今日'){
           let start = new Date();
           start.setHours(0)
@@ -222,6 +229,8 @@ import {parseTime} from "@/utils/fuint";
           let nowDate = new Date();
           let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate())
           this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
+        }else if (this.timeList[index]=='自定义'){
+          this.disabled = false
         }
         this.handleQuery()
       },
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
index e63b6200b..0502e4c33 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
@@ -3,7 +3,8 @@
   <div style="margin-top: 0px; margin-right: 40px">
     <el-card class="box-card">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px" >
-        <div class="d-s">
+        <div class="d-s" style="justify-content: space-between;width: 100%">
+          <div class="d-s">
           <div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList" :key="index" @click="editColor(index)">
             {{item}}
           </div>
@@ -14,9 +15,11 @@
             range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
             start-placeholder="开始日期"
-            end-placeholder="结束日期" @click="handleQuery">
+            end-placeholder="结束日期"
+            :disabled="disabled"
+            @click="handleQuery">
           </el-date-picker>
-          <div  style="margin-left: 15px;margin-top: 17px;width: 100%">
+          <div  style="margin-left: 15px;margin-top: 17px;">
             <el-form-item label="" prop="deptId" style="width: 180px;">
               <el-select
                 v-model="queryParams.deptId"
@@ -28,11 +31,12 @@
               </el-select>
             </el-form-item>
 
-            <el-form-item class="" style="float: right;">
+          </div>
+          </div>
+            <el-form-item class="" style="float: right;margin-top: 17px">
               <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
               <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
             </el-form-item>
-          </div>
         </div>
 
       </el-form>
@@ -128,8 +132,10 @@ import {parseTime} from "@/utils/fuint";
           "近一周",
           "近一月",
           "近一年",
+          "自定义",
         ],
         timeIndex:0,
+        disabled:true,
         value2: [],
         // 日期范围
         dateRange: [],
@@ -187,6 +193,7 @@ import {parseTime} from "@/utils/fuint";
     methods:{
       editColor(index){
         this.timeIndex = index
+        this.disabled = true
         if (this.timeList[index]=='今日'){
           let start = new Date();
           start.setHours(0)
@@ -206,6 +213,8 @@ import {parseTime} from "@/utils/fuint";
           let nowDate = new Date();
           let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate())
           this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
+        }else if (this.timeList[index]=='自定义'){
+          this.disabled = false
         }
         this.handleQuery()
       },