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

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: {

project/pingchang/apps/AppCommunityMember/Detail.vue

@@ -19,7 +19,7 @@
               <ai-info-item isLine label="参与名额">{{ info.total }}</ai-info-item>
               <ai-info-item label="报名状态">{{ dict.getLabel('partyReportSignupStatus', info.signupStatus) }}</ai-info-item>
               <ai-info-item label="活动状态">{{ dict.getLabel('activityStatus', info.actionStatus) }}</ai-info-item>
-              <ai-info-item label="活动时间">{{ info.beginTime.substring(0, 10) }} 至 {{ info.endTime.substring(0, 10) }}</ai-info-item>
+              <ai-info-item label="活动时间">{{ info.beginTime }} 至 {{ info.endTime }}</ai-info-item>
               <ai-info-item label="截至时间">{{ info.stopSignupTime }}</ai-info-item>
               <ai-info-item label="联系人">{{ info.contactPerson }}</ai-info-item>
               <ai-info-item label="联系电话">{{ info.contactPhone }}</ai-info-item>
@@ -34,8 +34,9 @@
         <ai-card title="报名情况">
           <template #content>
             <ai-table
+              :dict="dict"
               :border="true"
-              :tableData="info.introducerList"
+              :tableData="userList"
               :isShowPagination="false"
               :col-configs="colConfigs"
               >
@@ -43,20 +44,35 @@
                 <template slot-scope="{ row }">
                   <div class="table-options">
                     <p>{{row.partyName}}-{{row.phone}}</p>
-                    <p class="color-999">{{partyOrgName}}</p>
+                    <p class="color-999">{{row.partyOrgName}}</p>
                   </div>
                 </template>
               </el-table-column>
               <el-table-column slot="options" width="120px" fixed="right" label="操作" align="center">
                 <template slot-scope="{ row }">
                   <div class="table-options">
-                    <el-button type="text" @click="toDetail(row.id)">查看日志</el-button>
+                    <el-button type="text" @click="viewUser(row)">查看日志</el-button>
                   </div>
                 </template>
               </el-table-column>
             </ai-table>
           </template>
         </ai-card>
+        <ai-dialog :visible.sync="showDialog" title="查看活动日志" @closed="showDialog=false">
+          <ai-wrapper label-width="120px">
+            <ai-info-item label="提交人">{{ userInfo.userName }}</ai-info-item>
+            <ai-info-item label="提交时间">{{ userInfo.submitTime }}</ai-info-item>
+            <ai-info-item isLine label="活动总结">{{ userInfo.content }}</ai-info-item>
+            <ai-info-item isLine label="活动照片">
+              <ai-uploader
+                :instance="instance"
+                disabled
+                v-model="userInfo.files"
+                >
+              </ai-uploader>
+            </ai-info-item>
+          </ai-wrapper>
+        </ai-dialog>
       </div>
     </template>
   </ai-detail>
@@ -87,7 +103,9 @@ export default {
         {prop: "logStatus", label: "活动日志", align: "center", dict: 'partyReportSignupLogStatus'},
         {slot: "options"},
       ],
-      userList: []
+      userList: [],
+      showDialog: false,
+      userInfo: {}
     }
   },
 
@@ -106,7 +124,7 @@ export default {
     getInfo() {
       this.instance.post(`/app/apppartyreport/queryDetailById?id=${this.id}`).then((res) => {
         if (res?.data) {
-          this.info = res.data;
+          this.info = res.data
           if (this.info.birthday) {
             this.info.birthday = this.info.birthday.substring(0, 10);
           }
@@ -117,8 +135,20 @@ export default {
       this.instance.post(`/app/apppartyreport/signup-info?id=${this.id}`).then((res) => {
         if (res?.data) {
           res.data.map((item) => {
-            item.signupTime = item.signupTime.substring(0, 10)
+            if(item.signupTime) {
+              item.signupTime = item.signupTime.substring(0, 10)
+            }
           })
+          this.userList = res.data
+        }
+      });
+    },
+    viewUser(row) {
+      this.instance.post(`app/apppartyreport/log?id=${row.id}`).then((res) => {
+        if (res.code == 0) {
+          this.userInfo = {...res.data}
+          this.userInfo.userName = row.partyName
+          this.showDialog = true
         }
       });
     },

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 },
       ],
     };
   },