From 7c44f4d13d540242c0651cd153d2d2763c7d5d33 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 31 Aug 2022 17:04:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityParty/calendar/index.vue |  5 +--
 .../activivityList/yearplanList.vue           | 35 +++++++++++++++----
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/communityParty/calendar/index.vue b/src/views/modules/communityParty/calendar/index.vue
index a46a6a95a..dc3df019a 100644
--- a/src/views/modules/communityParty/calendar/index.vue
+++ b/src/views/modules/communityParty/calendar/index.vue
@@ -135,7 +135,7 @@
               <div class="hd-btn">
                 <el-button type="primary"
                            size="small"
-                           @click="handleAddYearPlan">批量生成年度报表</el-button>
+                           @click="handleAddYearPlan">生成年度活动计划</el-button>
               </div>
             </div>
             <calendar :currentYear="currentYear"
@@ -230,7 +230,8 @@
     </div>
 
     <div v-if="showType === 'yearplan'">
-      <yearplan-list @handleOk="handleAddPlanOk"
+      <yearplan-list :currentYearStr="currentYearStr"
+                     @handleOk="handleAddPlanOk"
                      @handleClose="handleAddPlanClose"></yearplan-list>
     </div>
 
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue b/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue
index e526b8d25..f7993d734 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue
@@ -5,22 +5,29 @@
         <el-form :inline="true"
                  :model="formData"
                  ref="ref_searchform"
-                 :label-width="'80px'">
+                 :label-width="'150px'">
           <div>
 
-            <el-form-item label="活动类型"
+            <el-form-item label="选择计划年度"
                           prop="serviceCategoryKey">
-              <el-select v-model="formData.yearId"
+              <el-date-picker v-model="formData.yearId"
+                              value-format="yyyy"
+                              type="year"
+                              placeholder="选择年"
+                              size="small"
+                              style="width: 150px">
+              </el-date-picker>
+
+              <!-- <el-select v-model="formData.yearId"
                          placeholder="请选择"
                          size="small"
-                         clearable
                          class="item_width_2">
                 <el-option v-for="item in yearArray"
                            :key="item.value"
                            :label="item.label"
                            :value="item.value">
                 </el-option>
-              </el-select>
+              </el-select> -->
             </el-form-item>
 
             <el-button style="margin-left:30px"
@@ -257,7 +264,13 @@ export default {
     this.yearArray = []
     let now = new Date()
     let year = now.getFullYear()
-    this.formData.yearId = year + ''
+
+    if (this.currentYearStr) {
+
+      this.formData.yearId = this.currentYearStr
+    } else {
+      this.formData.yearId = year + ''
+    }
     for (let i = 0; i < 5; i++) {
       let obj = {
         value: (year - i) + '',
@@ -485,6 +498,16 @@ export default {
 
 
   },
+
+  props: {
+
+    currentYearStr: { //年份
+      type: String,
+      required: ''
+    },
+
+
+  }
 };
 </script>