Merge branch 'dev-heart0629' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-heart0629

src/views/modules/communityParty/heart/heartFinish.vue

@@ -3,9 +3,10 @@
     <div>
       <el-form ref="ref_form"
                :inline="false"
+               :label-position="'left'"
                :model="formData"
                :rules="dataRule"
-               class="div_form ">
+               class="div_form mgl10">
         <el-form-item label="实际活动时间"
                       label-width="150px"
                       style="display: block"
@@ -98,7 +99,7 @@
                              header-align="center"
                              align="center"
                              label="理由"
-                             min-width="350">
+                             min-width="320">
 
               <template slot-scope="scope">
 
@@ -359,10 +360,17 @@ export default {
 
 .div_table {
   display: flex;
-  justify-content: center;
+  justify-content: flex-start;
   .m_table {
     flex: 0 0 1200px;
     // padding: 20px;
   }
 }
+.div_form {
+  width: 90%;
+  margin-top: 20px;
+}
+.mgl10 {
+  margin-left: 20px;
+}
 </style>

src/views/modules/communityParty/heart/heartForm.vue

@@ -50,6 +50,7 @@
                          :action="uploadUlr"
                          list-type="picture-card"
                          :on-exceed="exceedPic"
+                         :before-upload="beforeAvatarUpload"
                          :on-remove="removePic"
                          :file-list="replayImgList"
                          :on-change="handleEditChange"
@@ -85,6 +86,7 @@
                           style="display: block"
                           label-width="150px">
               <el-input-number class="item_width_2"
+                               :min="0"
                                v-model="formData.actQuota"
                                label="活动人数"></el-input-number>
             </el-form-item>
@@ -94,6 +96,7 @@
                           style="display: block"
                           label-width="150px">
               <el-input-number class="item_width_2"
+                               :min="0"
                                v-model="formData.reward"
                                label="活动积分"></el-input-number>
             </el-form-item>
@@ -102,7 +105,7 @@
                           label-width="150px"
                           style="display: block">
               <el-input class="item_width_6"
-                        maxlength="10"
+                        maxlength="20"
                         placeholder="请输入联系人"
                         v-model="formData.sponsorContacts">
               </el-input>
@@ -115,7 +118,7 @@
                           label-width="150px"
                           style="display: block">
               <el-input class="item_width_6"
-                        maxlength="10"
+                        maxlength="20"
                         placeholder="请输入联系电话"
                         v-model="formData.sponsorTel">
               </el-input>
@@ -158,7 +161,7 @@
                         type="textarea"
                         maxlength="200"
                         show-word-limit
-                        :rows="5"
+                        :rows="7"
                         placeholder="请输入报名条件，不超过200字"
                         v-model="formData.requirement"></el-input>
             </el-form-item>
@@ -188,6 +191,7 @@
                           style="display: block"
                           label-width="150px">
               <el-input-number class="item_width_2"
+                               :min="0"
                                v-model="formData.signInRadius"
                                label="签到有效范围"></el-input-number>
             </el-form-item>
@@ -407,7 +411,7 @@ export default {
         actId: "",
         actLatitude: null,
         actLongitude: null,
-        actQuota: undefined,
+        actQuota: 0,
         actStartTime: "",
         actType: "heart",
 
@@ -418,7 +422,7 @@ export default {
 
         noticePassedPeople: false,
         requirement: "",
-        reward: undefined,
+        reward: 0,
 
         signInAddress: "",
         signInEndTime: "",
@@ -457,7 +461,6 @@ export default {
       },
 
       //图片相关  oss/file/uploadvariedfile
-      dialogImageUrl: 'oss/file/uploadvariedfile',
       uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
       //  upload_url: '', // 上传URL
       upload_name: '', // 图片或视频名称
@@ -703,6 +706,16 @@ export default {
       this.$message.warning("只能上传1张封面图")
 
     },
+    beforeAvatarUpload (file) {
+      const isJPG = file.type === 'image/jpeg';
+      const isLt2M = file.size / 1024 / 1024 < 10;
+
+
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 10MB!');
+      }
+      return isLt2M;
+    },
     handleSuccess (response, file, fileList) {
       this.replayImgList.push(file)
       this.formData.coverPic = response.data.url
@@ -901,7 +914,7 @@ export default {
         actId: "",
         actLatitude: null,
         actLongitude: null,
-        actQuota: undefined,
+        actQuota: 0,
         actStartTime: "",
         actType: "heart",
 
@@ -912,7 +925,7 @@ export default {
 
         noticePassedPeople: false,
         requirement: "",
-        reward: undefined,
+        reward: 0,
 
         signInAddress: "",
         signInEndTime: "",

src/views/modules/communityParty/heart/heartList.vue

@@ -266,7 +266,7 @@
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="'报名审核'"
-               width="1450px"
+               width="90%"
                top="5vh"
                class="dialog-h"
                @closed="auditDiaClose">
@@ -278,7 +278,7 @@
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="'查看人员'"
-               width="1550px"
+               width="90%"
                top="5vh"
                class="dialog-h"
                @closed="personDiaClose">
@@ -292,7 +292,7 @@
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="'活动结束'"
-               width="1350px"
+               width="1250px"
                top="5vh"
                class="dialog-h"
                @closed="finishDiaClose">
@@ -309,7 +309,7 @@
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="'活动回顾'"
-               width="1350px"
+               width="1150px"
                top="5vh"
                class="dialog-h"
                @closed="reviewDiaClose">