From d601b1d4c2515321e3c33d2ffb58a53919f2581c Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 30 Jun 2022 15:46:49 +0800
Subject: [PATCH] 30406

---
 .../apps/AppPartyIntegralAudit/components/Detail.vue   |  2 +-
 .../AppPartyScoreRules/components/applyForIntegral.vue | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/project/sanjianxi/apps/AppPartyIntegralAudit/components/Detail.vue b/project/sanjianxi/apps/AppPartyIntegralAudit/components/Detail.vue
index 5573af44..90c698ed 100644
--- a/project/sanjianxi/apps/AppPartyIntegralAudit/components/Detail.vue
+++ b/project/sanjianxi/apps/AppPartyIntegralAudit/components/Detail.vue
@@ -27,7 +27,7 @@
           <ai-wrapper label-width="120px">
             <ai-info-item label="审核结果" :value="info.auditStatus === '1' ? '通过' : '拒绝'"></ai-info-item>
             <!-- 通过 -->
-            <ai-info-item label="积分调整" v-if="integralInfo.ruleType == '1'" :value="'+' +  info.auditIntegral + '分'"></ai-info-item>
+            <ai-info-item label="积分调整" v-if="integralInfo.ruleType == '1'" :value="'+' +  info.auditIntegral + '分' + ''"></ai-info-item>
             <!-- 未通过（阶梯状态下显示加分项） -->
             <ai-info-item label="积分调整" v-else :value="'+' + info.auditIntegral + '分' "></ai-info-item>
             <ai-info-item label="审核人" :value="info.auditUserName"></ai-info-item>
diff --git a/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue b/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue
index a451b8ed..fa7672ee 100644
--- a/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue
+++ b/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue
@@ -162,9 +162,9 @@ export default {
       search: {status: "", eventName: ""},
       page: {current: 1, size: 10, total: 0},
       colConfigs: [
-        {prop: "eventName", label: "事件名称", dict: "integralRuleEvent", align: "center"},
+        {prop: "eventName", label: "事件名称", dict: "integralRuleEvent", align: "center", "show-overflow-tooltip": true},
         {prop: "eventDesc", label: "简介", dict: "integralRuleEventType", align: "center", "show-overflow-tooltip": true},
-        {prop: "ruleType", label: "规则", dict: "integralRuleRuleType", align: "center"},
+        {prop: "ruleType", label: "规则", dict: "partyIntegralRuleRuleType", align: "center"},
         {prop: "scoringCycle", label: "周期范围", dict: "integralRuleScoringCycle", align: "center"},
         {prop: "status", label: "状态", align: "center", width: 96, dict: "integralRuleStatus"},
         {slot: "options", label: "操作", align: "center"},
@@ -210,7 +210,7 @@ export default {
     };
   },
   created() {
-    this.dict.load("integralRuleStatus", "integralRuleRuleType", 'integralRuleScoringCycle', 'integralRuleEvent', 'integralRuleEventType').then(() => {
+    this.dict.load("integralRuleStatus", "partyIntegralRuleRuleType", 'integralRuleScoringCycle', 'integralRuleEvent', 'integralRuleEventType').then(() => {
       this.getList();
     });
   },
@@ -226,7 +226,7 @@ export default {
       });
     },
     addIntegral() {
-      this.form.ladderIntegral.push({ viewCount: null, integral: null })
+      this.form.ladderIntegral?.push({ viewCount: null, integral: null })
     },
     toEdit(row) {
       this.instance.post(`/app/apppartyintegralrule/queryDetailById?id=${row.id}`).then((res) => {
@@ -289,7 +289,7 @@ export default {
     changeStatus(id, status) {
       let text = status == 1 ? '启用' : '停用'
       this.$confirm(`确定${text}该条规则？`).then(() => {
-        this.instance.post(`/app/appvillagerintegralrule/enableOrDisable?id=${id}`).then((res) => {
+        this.instance.post(`/apppartyintegralrule/enableOrDisable?id=${id}`).then((res) => {
           if (res.code == 0) {
             this.$message.success(`${text}成功！`)
             this.getList();