From c31eb17b148957826f76008377884f8d579f5764 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Tue, 18 Jan 2022 11:51:04 +0800
Subject: [PATCH] 26719

---
 .../AppMeetingChinaunion.vue                  | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue b/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue
index daf52dbc..1a477212 100644
--- a/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue
+++ b/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue
@@ -134,22 +134,22 @@
     <el-dialog :visible.sync="dialogTableVisible" title="会议数据统计" width="520px" class="mask label-110"
                :close-on-click-modal='false'>
       <div class="content input-240">
-        <el-row :gutter="8">
-          <el-col style="width: 100px;">
-            <el-select v-model="searchYear" placeholder="年份" size="mini" clearable class="timeSelect"
-                       @change="getMeetStatistics">
-              <el-option v-for="(op,j) in dict.getDict('meetingChangeYear')" :key="j" :label="op.dictName"
-                         :value="op.dictValue"/>
-            </el-select>
-          </el-col>
-          <el-col style="width: 100px;">
-            <el-select v-model="searchMonth" placeholder="全部" size="mini" clearable class="timeSelect"
-                       @change="getMeetStatistics">
-              <el-option v-for="(op,j) in dict.getDict('monthList')" :key="j" :label="op.dictName"
-                         :value="op.dictValue"/>
-            </el-select>
-          </el-col>
-        </el-row>
+        <div class="flex">
+          <el-date-picker
+            v-model="searchYear"
+            type="year"
+            size="small"
+            style="width: 200px; margin-right: 10px;"
+            value-format="yyyy"
+            @change="getMeetStatistics"
+            placeholder="选择年份">
+          </el-date-picker>
+          <el-select style="width: 200px" v-model="searchMonth" placeholder="全部" size="small" clearable class="timeSelect"
+                      @change="getMeetStatistics">
+            <el-option v-for="(op,j) in dict.getDict('monthList')" :key="j" :label="op.dictName"
+                        :value="op.dictValue"/>
+          </el-select>
+        </div>
         <ul class="totalTitle">
           <li v-for="(item,index) in totalTitleList" :key="index">
             <span>{{ item.num }}</span>
@@ -238,7 +238,7 @@ export default {
       topOrgId: '',
       stuTime: "",
       searchMonth: "",
-      searchYear: new Date().getFullYear(),
+      searchYear: String(new Date().getFullYear()),
       colorList: ["#FF4466", "#37A62B", "#4B87FE", "#FFAA44"],
       totalTitleList: [],
       pieData: {},
@@ -267,7 +267,7 @@ export default {
      * 获取统计
      * */
     getMeetStatistics() {
-      this.instance.post(`/app/appthreemeetinginfo/statistics-branch-Per-month?month=${this.searchMonth}&year=${this.searchYear}&partyOrgId=${this.partyId}`).then(res => {
+      this.instance.post(`/app/appthreemeetinginfo/statistics-branch-Per-month?month=${this.searchMonth}&year=${this.searchYear || ''}&partyOrgId=${this.partyId}`).then(res => {
         if (res && res.data) {
           const {type0, type1, type2, type3, total} = res.data;
           let chartData = [];