From 1fa3081b08156d97d4c273d82b644d40502baee5 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 20 Oct 2022 16:35:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=9A=8F=E6=89=8B=E6=8B=8D=E6=94=B9?=
 =?UTF-8?q?=E9=80=A0=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/conv/AppReportAiWill/components/Detail.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/conv/AppReportAiWill/components/Detail.vue b/packages/conv/AppReportAiWill/components/Detail.vue
index c0504260..ff3e3171 100644
--- a/packages/conv/AppReportAiWill/components/Detail.vue
+++ b/packages/conv/AppReportAiWill/components/Detail.vue
@@ -32,7 +32,7 @@
               </ai-wrapper>
             </template>
           </ai-card>
-          <ai-evaluation :bid="form.id" :info.sync="evaluation"/>
+          <ai-evaluation :bid="detail.id" :info.sync="evaluation"/>
         </div>
         <div class="rightZone">
           <ai-card title="办理进度">
@@ -200,11 +200,11 @@ export default {
 
   computed: {
     ...mapState(['user']),
-    process: v => [v.processList, v.evaluation.id ? {
+    process: v => [v.evaluation.id ? {
       systemExplain: `${v.evaluation.createUserName}完成评价 (${v.evaluation.score}星评价)`,
       doTime: v.evaluation.createTime,
       doExplain: v.evaluation.rateText
-    } : null].flat().filter(Boolean)
+    } : null, v.processList].flat().filter(Boolean)
   },
 
   created() {

From d3036b3b89323a77f1ef3442257454803b6e0dec Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 20 Oct 2022 17:01:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=9C=A8=E8=81=8C=E5=85=9A=E5=91=98?=
 =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E6=8A=A5=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/pingchang/apps/AppCommunityMember/Add.vue        | 6 +++---
 project/pingchang/apps/AppCommunityMember/Statistics.vue | 7 +------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/project/pingchang/apps/AppCommunityMember/Add.vue b/project/pingchang/apps/AppCommunityMember/Add.vue
index 88ee9b76..2a0db606 100644
--- a/project/pingchang/apps/AppCommunityMember/Add.vue
+++ b/project/pingchang/apps/AppCommunityMember/Add.vue
@@ -79,7 +79,7 @@
                 ></el-input>
               </el-form-item>
               <el-form-item label="活动介绍" prop="content" style="width: 100%">
-                <ai-editor v-model="form.content" :instance="instance" @validate="v=>valid=!v"/>
+                <ai-editor v-model="form.content" :instance="instance" />
               </el-form-item>
             </div>
           </template>
@@ -130,7 +130,7 @@ export default {
         stopSignupTime: [{ required: true, message: '请选择截止时间', trigger: 'change' }],
         contactPerson: [{ required: true, message: '请输入联系人', trigger: 'change' }],
         contactPhone: [{ required: true, message: '请输入联系电话', trigger: 'change' }],
-        content: [{ required: true, message: '请输入活动介绍', trigger: 'change' }],
+        content: [{ required: true, message: '请输入活动介绍', trigger: 'blur' }],
       },
       form: {
         areaId: '',
@@ -149,7 +149,7 @@ export default {
   created() {
     console.log(this.user)
     this.dict.load("education", "sex", "nation", "developStatus")
-    this.disabledLevel = this.user.info.areaList.length - 1
+    this.disabledLevel = this.user.info.areaList.length
     this.form.areaId = this.user.info.areaId
   },
   methods: {
diff --git a/project/pingchang/apps/AppCommunityMember/Statistics.vue b/project/pingchang/apps/AppCommunityMember/Statistics.vue
index da7400b3..79383a11 100644
--- a/project/pingchang/apps/AppCommunityMember/Statistics.vue
+++ b/project/pingchang/apps/AppCommunityMember/Statistics.vue
@@ -168,12 +168,7 @@ export default {
         { prop: "sex", label: "性别", align: "center", dict: "sex" },
         { prop: "partyOrg", label: "所属组织", align: "center" },
         { prop: "signupCount", label: "报名次数", align: "center", width: 150 },
-        {
-          prop: "partakeCount",
-          label: "参与次数",
-          align: "center",
-          width: 150,
-        },
+        { prop: "partakeCount", label: "参与次数", align: "center", width: 150 },
       ],
     };
   },