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

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">