commit

src/main/resources/static/components/activity/school/AddActivity.vue

@@ -166,7 +166,7 @@
                                :max="1000000000"></el-input-number>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+<!--          <el-col :span="8">
             <el-form-item prop="xlFlag" label="活动提醒">
               <el-switch
                   v-model="form.xlFlag"
@@ -174,7 +174,7 @@
                   inactive-color="#ff4949">
               </el-switch>
             </el-form-item>
-          </el-col>
+          </el-col>-->
           <el-col v-if="form.activityLevel===40003||(form.activityLevel===40001&&is_club)"
                   :span="8">
             <el-form-item prop="belongClubId" label="活动所属协会">
@@ -1191,12 +1191,6 @@ module.exports = {
       keys.forEach(key => {
         $("#" + key).html("")
         editors[key] = new E('#' + key)
-        editors[key].config.excludeMenus = [
-          'video',
-          'image',
-          'link',
-          'code',
-        ]
         editors[key].config.onchange = (html) => {
           this.form[key] = html
         }
@@ -1293,4 +1287,4 @@ module.exports = {
 .restrictTotalTeam .el-form-item__label {
   color: red;
 }
-</style>
+</style>

src/main/resources/static/components/activity/school/DeleteInfo.vue

@@ -116,7 +116,7 @@ module.exports = {
         {prop: 'identity', label: '身份', sortable: true},
         // {prop: 'divisionLevelLeadership', label: '是否处级领导', sortable: true},
         {prop: 'status', label: '状态', sortable: true},
-        {prop: 'awardsMode', label: '项目类型'},
+        // {prop: 'awardsMode', label: '项目类型'},
         {prop: 'allName', label: '报名项目'},
       ],
     }

src/main/resources/static/components/activity/school/tissueInfo.vue

@@ -4,7 +4,9 @@
       <el-form label-suffix=":" style="padding: 20px 0" label-width="120px">
         <el-form-item class="item-center">{{ viewData.name }}</el-form-item>
 
+
         <el-row gutter="60">
+
           <el-col :span="12">
             <el-form-item label="联系人">
               <span v-if="viewData.username">
@@ -60,7 +62,18 @@
           </el-col>
 
           <el-col :span="24">
-            <el-form-item label="活动内容">{{ viewData.activityContent }}</el-form-item>
+            <el-form-item label="活动内容">
+              <span style="white-space: pre-line">
+                {{ viewData.activityContent }}
+              </span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="!viewData.isEnrollSystem">
+            <el-form-item label="活动考核内容">
+              <span style="white-space: pre-line">
+                {{ viewData.activityExamineContent }}
+              </span>
+            </el-form-item>
           </el-col>
 
           <el-col :span="24">
@@ -197,32 +210,7 @@
       </el-form>
 
     </el-tab-pane>
-
-    <el-tab-pane label="新闻稿件" name="4" v-if="!viewData.isEnrollSystem">
-      <el-descriptions class="margin-top" :column="3" border>
-        <el-descriptions-item span="3">
-          <template slot="label">新闻稿件说明</template>
-          {{ viewData.newsRemark }}
-        </el-descriptions-item>
-        <el-descriptions-item span="3">
-          <template slot="label">图片</template>
-          <file-upload v-if="viewData.picFiles && viewData.picFiles.length > 0"
-                       :files="viewData.picFiles"
-                       :view="true"></file-upload>
-          <span v-else>暂无</span>
-        </el-descriptions-item>
-        <el-descriptions-item span="3">
-          <template slot="label">附件</template>
-          <file-upload v-if="viewData.newsFiles && viewData.newsFiles.length > 0"
-                       :files="viewData.newsFiles"
-                       :view="true"></file-upload>
-          <span v-else>暂无</span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </el-tab-pane>
-
-
-    <el-tab-pane label="活动总结" name="5" v-if="!viewData.isEnrollSystem">
+    <el-tab-pane label="活动总结" name="4" v-if="!viewData.isEnrollSystem">
       <el-form ref="form" label-width="120px">
         <el-form-item prop="activitySummary" label="活动总结">
           {{ viewData.activitySummary }}
@@ -320,8 +308,6 @@ module.exports = {
         data.billFiles = JSON.parse(data.billFiles)
         data.photoFiles = JSON.parse(data.photoFiles)
         data.otherFiles = JSON.parse(data.otherFiles)
-        data.picFiles = JSON.parse(data.picFiles)
-        data.newsFiles = JSON.parse(data.newsFiles)
         this.userData = clone(data.tissuePersonList)
         data.unionUserNumberLimit = JSON.parse(data.unionUserNumberLimit)
         data.location = JSON.parse(data.location)

src/main/resources/static/components/welfare/CourierNumberInfo.vue

@@ -53,7 +53,6 @@ module.exports = {
   },
   methods: {
     async openView(welfareId, userId) {
-      this.dialogVisible = true
       this.loading = true
       const {
         code,
@@ -67,6 +66,12 @@ module.exports = {
           this.$message.warning('您还没有选择福利套餐')
           return
         }
+        if (Object.keys(data).length === 0){
+          this.dialogVisible = false
+          this.$message.warning('暂无物流信息')
+          return
+        }
+        this.dialogVisible = true
         this.courierNumberInfoData = data
         const keys = Object.keys(this.courierNumberInfoData)
         this.activeName = keys && keys[0]