Merge remote-tracking branch 'origin/dev' into dev

packages/3.0.0/AppVillageActivity/AppVillageActivity.vue

@@ -1,12 +1,12 @@
 <template>
   <ai-list v-if="!isShowDetail">
     <template slot="title">
-      <ai-title title="居民活动" :isShowBottomBorder="false"></ai-title>
+      <ai-title title="居民活动" :isShowBottomBorder="false" :isShowArea="currIndex === '0'" v-model="areaId" :instance="instance" @change="onAreaChange"></ai-title>
     </template>
     <template slot="tabs">
       <el-tabs v-model="currIndex">
         <el-tab-pane v-for="(tab,i) in tabs" :key="i" :label="tab.label">
-          <component :ref="String(i)" v-if="currIndex == i" :is="tab.comp" @change="onChange" lazy :instance="instance" :dict="dict" :permissions="permissions"/>
+          <component :areaId="areaId" :ref="String(i)" v-if="currIndex == i" :is="tab.comp" @change="onChange" lazy :instance="instance" :dict="dict" :permissions="permissions"/>
         </el-tab-pane>
       </el-tabs>
     </template>
@@ -60,11 +60,13 @@
         currIndex: '0',
         componentName: '',
         params: {},
+        areaId: '',
         isShowDetail: false
       }
     },
 
     created () {
+      this.areaId = this.user.info.areaId
       if (this.$route.query.id) {
         this.componentName = this.$route.query?.type
         this.params = {id: this.$route.query?.id}
@@ -73,6 +75,14 @@
     },
 
     methods: {
+      onAreaChange () {
+        if (this.currIndex === '0') {
+          this.$nextTick(() => {
+            this.$refs[this.currIndex][0].getList()
+          })
+        }
+      },
+
       onChange (data) {
         if (data.type === 'list') {
           this.componentName = 'List'

packages/3.0.0/AppVillageActivity/components/List.vue

@@ -56,7 +56,8 @@
 
     props: {
       instance: Function,
-      dict: Object
+      dict: Object,
+      areaId: String
     },
 
     data () {
@@ -115,7 +116,8 @@
       getList() {
         this.instance.post(`/app/appvillageactivityinfo/list`, null, {
           params: {
-            ...this.search
+            ...this.search,
+            areaId: this.areaId
           }
         }).then(res => {
           if (res.code == 0) {

packages/3.0.0/AppVillageActivity/components/Statistics.vue

@@ -23,7 +23,7 @@
             node-key="id"
             :data="areaTree"
             highlight-current
-            :current-node-key="search.areaId"
+            :current-node-key="areaId"
             :default-expanded-keys="defaultExpanded"
             :default-checked-keys="defaultChecked"
             @current-change="onTreeChange">
@@ -44,6 +44,7 @@
             v-model="time1"
             type="month"
             size="small"
+            :clearable="false"
             @change="getInfo"
             value-format="yyyy-MM"
             placeholder="请选择月份">
@@ -87,19 +88,18 @@
         </template>
       </ai-card>
       <ai-card title="村民参与活动记录">
+        <template #right>
+          <el-date-picker
+            v-model="time2"
+            type="month"
+            size="small"
+            :clearable="false"
+            @change="getInfo"
+            value-format="yyyy-MM"
+            placeholder="请选择月份">
+          </el-date-picker>
+        </template>
         <template #content>
-          <ai-search-bar class="search-bar" bottomBorder>
-            <template slot="left">
-              <el-date-picker
-                v-model="time2"
-                type="month"
-                size="small"
-                @change="getInfo"
-                value-format="yyyy-MM"
-                placeholder="请选择月份">
-              </el-date-picker>
-            </template>
-          </ai-search-bar>
           <ai-table
             style="margin-top: 12px;"
             :border="true"
@@ -107,19 +107,9 @@
             :total="total"
             :tableData="list"
             :col-configs="colConfigs"
-            :current.sync="search.current"
-            :size.sync="search.size"
             :isShowPagination="false"
             :stripe="false"
             @getList="getInfo">
-            <el-table-column slot="options" width="220px" fixed="right" label="操作" align="center">
-              <template slot-scope="{ row }">
-                <div class="table-options">
-                  <el-button type="text" @click="id = row.id, form.categoryName = row.categoryName">编辑</el-button>
-                  <el-button type="text" @click="removeCate(row.id)">删除</el-button>
-                </div>
-              </template>
-            </el-table-column>
           </ai-table>
         </template>
       </ai-card>
@@ -154,24 +144,18 @@
         total: 0,
         colConfigs: [
           { prop: 'name',  label: '姓名', align: 'left' },
-          { prop: 'gender', label: '性别', align: 'center' },
+          { prop: 'gender', label: '性别', align: 'center', formart: v => this.dict.getLabel('sex', v) },
-          { prop: 'number1', label: '报名次数', align: 'center' },
+          { prop: 'num1', label: '报名次数', align: 'center' },
-          { prop: 'number2', label: '发布动态条数', align: 'center' }
+          { prop: 'num2', label: '发布动态条数', align: 'center' }
         ],
         time1: '',
         time2: '',
         chart2: '',
-        areaId: '',
         currIndex: -1,
         list: [],
         areaList: [],
         unitName: '',
-        search: {
+        areaId: ''
-          current: 1,
-          areaId: '',
-          size: 10,
-          name: ''
-        }
       }
     },
 
@@ -186,7 +170,9 @@
     },
 
     mounted () {
-      this.search.areaId = this.user.info.areaId
+      this.time1 = this.$moment(new Date()).format('YYYY-MM')
+      this.time2 = this.$moment(new Date()).format('YYYY-MM')
+      this.areaId = this.user.info.areaId
       this.areaName = this.user.info.areaName
       this.getTree()
       this.getAreaList()
@@ -195,7 +181,10 @@
         this.chart1 = echarts.init(document.querySelector('.chart1'))
         this.chart2 = echarts.init(document.querySelector('.chart2'))
         window.addEventListener('resize', this.onResize)
-        this.getInfo()
+
+        this.dict.load('sex').then(() => {
+          this.getInfo()
+        })
       })
     },
 
@@ -209,9 +198,8 @@
       },
 
       onTreeChange (e) {
-        this.search.areaId = e.id
+        this.areaId = e.id
         this.areaName = e.name
-        this.search.current = 1
 
         this.$nextTick(() => {
           this.getInfo()
@@ -234,7 +222,7 @@
             }).filter(e => !e.parentid)[0]
             this.defaultExpanded = [parent.id]
             this.defaultChecked = [parent.id]
-            this.search.areaId = parent.id
+            this.areaId = parent.id
             this.addChild(parent, res.data)
             this.areaTree = [parent]
 
@@ -267,7 +255,7 @@
 
       getInfo () {
         this.loading = true
-        this.instance.post(`/app/appvillageactivityinfo/statistic?time1=${this.time1}&time2=${this.time2}`).then(res => {
+        this.instance.post(`/app/appvillageactivityinfo/statistic?areaId=${this.areaId}&time1=${this.time1 || ''}&time2=${this.time2 || '-'}`).then(res => {
           if (res.code == 0) {
             this.info = res.data.total
             this.initChart1(res.data.twelve)