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

packages/3.0.0/AppShowProduce/components/List.vue

@@ -60,9 +60,9 @@
         colConfigs: [
           { type: 'selection' },
           { prop: 'name', label: '标题' },
-          { prop: 'createUserName', align: 'center', label: '类型' },
-          { prop: 'description', align: 'center', label: '描述' },
           { prop: 'status', align: 'center', label: '状态', formart: v => v === '1' ? '已开启' : '未开启' },
+          { prop: 'description', align: 'center', label: '联系电话' },
+          { prop: 'description', align: 'center', label: '发布人' },
           { prop: 'createTime', align: 'center', label: '创建时间' }
         ],
         ids: [],
@@ -82,7 +82,7 @@
 
     methods: {
       getList () {
-        this.instance.post(`/app/appdiylargescreen/allLargeScreenProjectByPage`, null, {
+        this.instance.post(`/app/appshowagriculturalproduce/list`, null, {
           params: {
             ...this.search
           }

packages/3.0.0/AppVillageActivity/components/List.vue

@@ -7,17 +7,17 @@
           <ai-select
             v-model="search.isRealName"
             @change="search.current = 1, getList()"
-            placeholder="是否实名"
+            placeholder="活动状态"
-            :selectList="dict.getDict('wxCustomerAddWay')">
+            :selectList="dict.getDict('villageActivityStatus')">
           </ai-select>
         </template>
         <template slot="right">
           <el-input
-            v-model="search.name"
+            v-model="search.title"
             class="search-input"
             size="small"
             @keyup.enter.native="search.current = 1, getList()"
-            placeholder="请输入备注、昵称、姓名"
+            placeholder="请输入活动名称"
             clearable
             @change="getList"
             @clear="search.current = 1, search.name = '', getList()"
@@ -64,10 +64,7 @@
         search: {
           current: 1,
           size: 10,
-          name: '',
+          title: ''
-          tagId: '',
-          wxUserId: '',
-          isRealName: ''
         },
         isLoading: false,
         ids: [],
@@ -85,7 +82,7 @@
             prop: 'status', label: '活动状态', align: 'center', 
             render: (h, params) => {
               return h('span', {
-              }, params.row.status ? '是' : '否')
+              }, this.dict.getLabel('villageActivityStatus', params.row.status))
             }
           },
           { prop: 'realNum', label: '报名人数', align: 'center' },
@@ -108,7 +105,7 @@
 
     created () {
       this.isLoading = true
-      this.dict.load(['wxCustomerAddWay']).then(() => {
+      this.dict.load(['villageActivityStatus']).then(() => {
         this.getList()
       })
     },

packages/3.0.0/AppWeddingsFunerals/components/List.vue

@@ -5,19 +5,19 @@
       <div class="statistics-top">
         <div class="statistics-top__item">
           <span>活动登记数量</span>
-          <h2 style="color: #2266FF;">11</h2>
+          <h2 style="color: #2266FF;">{{ info['丧礼登记数量'] }}</h2>
         </div>
         <div class="statistics-top__item">
           <span>干部参与和操办登记数量</span>
-          <h2 style="color: #22AA99;">11</h2>
+          <h2 style="color: #22AA99;">{{ info['干部参与和操办登记数量'] }}</h2>
         </div>
         <div class="statistics-top__item">
           <span>婚礼登记数量</span>
-          <h2 style="color: #F8B425">11</h2>
+          <h2 style="color: #F8B425">{{ info['婚礼登记数量'] }}</h2>
         </div>
         <div class="statistics-top__item">
           <span>丧礼登记数量</span>
-          <h2 style="color: red">11</h2>
+          <h2 style="color: red">{{ info['丧礼登记数量'] }}</h2>
         </div>
       </div>
       <div class="content">
@@ -77,13 +77,15 @@
           size: 10,
           title: ''
         },
+        info: {},
         colConfigs: [
           { type: 'selection' },
-          { prop: 'name', label: '标题' },
+          { prop: 'name', label: '事主姓名' },
-          { prop: 'createUserName', align: 'center', label: '类型' },
+          { prop: 'createUserName', align: 'center', label: '联系电话' },
-          { prop: 'description', align: 'center', label: '描述' },
+          { prop: 'description', align: 'center', label: '类型' },
           { prop: 'status', align: 'center', label: '状态', formart: v => v === '1' ? '已开启' : '未开启' },
-          { prop: 'createTime', align: 'center', label: '创建时间' }
+          { prop: 'description', align: 'center', label: '人员性质' },
+          { prop: 'createTime', align: 'center', label: '发布时间' }
         ],
         ids: [],
         tableData: [],
@@ -94,6 +96,7 @@
 
     created () {
       this.getList()
+      this.getTotalInfo()
     },
 
     mounted () {
@@ -102,7 +105,7 @@
 
     methods: {
       getList () {
-        this.instance.post(`/app/appdiylargescreen/allLargeScreenProjectByPage`, null, {
+        this.instance.post(`/app/appmarriagefuneralinfo/list`, null, {
           params: {
             ...this.search
           }
@@ -119,9 +122,23 @@
         })
       },
 
+      getTotalInfo () {
+        this.instance.post(`/app/appmarriagefuneralinfo/queryDataStatistics`).then(res => {
+          if (res.code == 0) {
+            let info = {}
+
+            res.data.forEach(v => {
+              info[v.name] = v.v1
+            })
+
+            this.info = info
+          }
+        })
+      },
+
       remove (id) {
         this.$confirm('确定删除该数据？').then(() => {
-          this.instance.post(`/app/appapplicationinfo/delete?ids=${id}`).then(res => {
+          this.instance.post(`/app/appmarriagefuneralinfo/delete?ids=${id}`).then(res => {
             if (res.code == 0) {
               this.$message.success('删除成功！')
               this.getList()