推送精选

project/fengdu/app/AppIntegratingAudit/components/Detail.vue

@@ -16,7 +16,7 @@
             <ai-info-item label="手机号" :value="info.detail"></ai-info-item>
             <ai-info-item label="所属地区" :value="info.areaName"></ai-info-item>
             <ai-info-item label="所属网格" :value="info.girdName"></ai-info-item>
-            <ai-info-item label="审核时间" :value="info.auditTime"></ai-info-item>
+            <ai-info-item label="审核时间" v-if="info.auditTime" :value="info.auditTime"></ai-info-item>
             <ai-info-item label="状态" :value="dict.getLabel('appIntegralApplyEventStatus', info.status)"></ai-info-item>
             <ai-info-item label="事件描述" isLine :value="info.content"></ai-info-item>
             <ai-info-item label="活动图片" isLine>
@@ -121,6 +121,4 @@
 </script>
 
 <style scoped lang="scss">
-.detail {
-}
 </style>

project/fengdu/app/AppIntegratingAudit/components/List.vue

@@ -40,18 +40,18 @@
             :ops="{ label: 'girdName' }"
             pageTitle="网格"
             action="/app/appgirdinfo/girdList"
-            v-model="search.filterCriteria"
-            @change="search.current = 1, getList()">
+            v-model="userList"
+            @pick="onGridChange">
             <div class="userSelcet">
-              <span style="color: #606266;" v-if="search.createUserId">{{ name }}</span>
-              <span v-else>创建人</span>
-              <i class="el-icon-arrow-up"  v-if="!search.createUserId"></i>
-              <i class="el-icon-circle-close" v-if="search.createUserId" @click.stop="user = [], search.createUserId = '', name = '', search.current = 1, getList()"></i>
+              <span style="color: #606266;" v-if="search.girdId">{{ search.girdName }}</span>
+              <span v-else>请选择网格</span>
+              <i class="el-icon-arrow-up"  v-if="!search.girdId"></i>
+              <i class="el-icon-circle-close" v-if="search.girdId" @click.stop="userList = [], search.girdId = '', search.girdName = '', search.current = 1, getList()"></i>
             </div>
           </ai-picker>
           <ai-select
             v-model="search.status"
-            @change="(page.current = 1), getList()"
+            @change="(search.current = 1), getList()"
             placeholder="请选择状态"
             :selectList="$dict.getDict('appIntegralApplyEventStatus')">
           </ai-select>
@@ -109,8 +109,10 @@
           size: 10,
           areaId: '',
           ids: '',
-          gridId: ''
+          girdId: '',
+          girdName: ''
         },
+        userList: [],
         rulesProps: {
           label: 'ruleName',
           value: 'id',
@@ -160,6 +162,15 @@
         })
       },
 
+      onGridChange (e) {
+        if (e.length) {
+          this.search.girdId = e[0].id
+          this.search.girdName = e[0].girdName
+          this.search.current = 1
+          this.getList()
+        }
+      },
+
       toTree (data) {
         let result = []
         if (!Array.isArray(data)) {