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

packages/conv/neighbor2neighbor/AppHelp/components/List.vue

@@ -49,6 +49,7 @@
               <el-button type="text" @click="toDetail(row.id)">详情</el-button>
               <el-button type="text" @click="remove(row.id)">删除</el-button>
               <el-button type="text" @click="gag(row.createUserId, row.blacklist)">{{ row.blacklist ? '解除禁言' : '禁言' }}</el-button>
+              <el-button type="text" v-if="row.status<1" @click="admin(row)">审核</el-button>
             </div>
           </template>
         </el-table-column>
@@ -77,7 +78,7 @@
         },
         total: 0,
         colConfigs: [
-          { prop: 'content',  label: '内容', align: 'left' },
+          { prop: 'content',  label: '帖子内容', align: 'left' },
           { prop: 'createUserName',  label: '发帖人', align: 'center', width: '120' },
           { prop: 'createUserAreaName',  label: '所属地区', align: 'center' },
           { prop: 'createTime',  label: '创建时间', align: 'center' },
@@ -85,6 +86,7 @@
           { prop: 'appreciateCount',  label: '点赞数', align: 'center', width: '120' },
           { prop: 'sharedCount',  label: '分享数', align: 'center', width: '120' },
           { prop: 'blacklist',  label: '状态', align: 'center', format: v => v ? '禁言' : '正常' },
+          { prop: 'status',  label: '审核状态', align: 'center', width: '120', dict: 'auditStatus' },
           { slot: 'options'},
         ],
         tableData: [],
@@ -100,7 +102,9 @@
 
     created() {
       this.search.areaId = this.user.info.areaId
+      this.dict.load('auditStatus').then(() => {
         this.getList()
+      })
     },
 
     methods: {
@@ -172,6 +176,34 @@
             id: id || ''
           }
         })
+      },
+
+      admin(row) {
+        console.log(row)
+        this.$confirm('是否审核通过该条帖子？', {
+          distinguishCancelAndClose: true,
+          confirmButtonText: '通过',
+          closeOnClickModal: true,
+          cancelButtonText: '拒绝'
+        }).then((e) => {
+          this.instance.post(`/app/appneighborhoodassistance/examine?id=${row.id}&pass=1`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('审核成功！')
+              this.search.current = 1
+              this.getList()
+            }
+          })
+        }).catch((e) => {
+          if(e == 'cancel') {
+            this.instance.post(`/app/appneighborhoodassistance/examine?id=${row.id}&pass=0`).then(res => {
+              if (res.code == 0) {
+                this.$message.success('审核成功！')
+                this.search.current = 1
+                this.getList()
+              }
+            })
+          }
+        })
       }
     }
   }

project/biaopin/AppFormReview/AppFormReview.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="AppGridReview">
+  <div class="AppFormReview">
     <keep-alive :include="['List']">
       <component ref="component" :is="component" :permissions="permissions " @change="onChange" :params="params" :instance="instance" :dict="dict"></component>
     </keep-alive>
@@ -11,7 +11,7 @@
   import Detail from './components/Detail'
 
   export default {
-    name: 'AppGridReview',
+    name: 'AppFormReview',
     label: '网格动态',
 
     props: {
@@ -56,7 +56,7 @@
 </script>
 
 <style lang="scss">
-.AppGridReview {
+.AppFormReview {
   height: 100%;
   background: #F3F6F9;
   overflow: auto;

project/biaopin/AppFormReview/components/Detail.vue

@@ -114,8 +114,8 @@
             this.instance.post(`/app/appgirdnews/examine?id=${this.params.id}&pass=${this.form.status}&opinion=${this.form.opinion}`).then(res => {
               if (res?.code == 0) {
                 this.isShowExamine = false
-                this.getDetail()
                 this.$message.success('审核成功!')
+                this.cancel(true)
               }
             })
           }

project/biaopin/AppGridMemberScore/components/gridScoreRules.vue

@@ -17,8 +17,9 @@
           <el-table-column slot="scoringCycle" label="周期范围" align="center">
             <template slot-scope="{ row }">
               <span v-if="row.parentRuleName == '工单处理'">-</span>
-              <span v-else>{{row.numberLimit.length ? $dict.getLabel("integralRuleScoringCycle", row.scoringCycle)
+              <span v-if="row.parentRuleName != '工单处理' && row.numberLimit">{{row.numberLimit.length ? $dict.getLabel("integralRuleScoringCycle", row.scoringCycle)
                     : $dict.getLabel("integralRuleScoringCycle", row.scoringCycle) + row.numberLimit + "次"}}</span>
+              <span v-if="row.parentRuleName != '工单处理' && !row.numberLimit">{{$dict.getLabel("integralRuleScoringCycle", row.scoringCycle) + "不限次"}}</span>
             </template>
           </el-table-column>
           <el-table-column slot="integral" label="分值" align="center">