修改

src/App.vue

@@ -74,6 +74,9 @@ export default {
 }
 </script>
 <style>
+.el-card__body{
+    padding: 0 10px !important;
+}
 .el-dialog__body{
   padding-top: 0px !important;
 }

src/api/allApi.js

@@ -1,5 +1,14 @@
 import request from '@/utils/request'
 
+//获取培训上传备注
+export function remarkHtml(query) {
+  return request({
+    url: '/news/mall/getNotice',
+    method: 'get',
+    params: query
+  })
+}
+
 //员工互动记录列表
 export function postList(query) {
   return request({

src/views/HomeView/EarnPoints.vue

@@ -121,6 +121,19 @@
             </el-table-column>
             <el-table-column align="center" prop="endTime" min-width="150" label="结束时间">
             </el-table-column>
+            <el-table-column min-width="100" align="center" label="状态">
+              <template slot-scope="props">
+                <el-popover trigger="hover">
+                  <el-table :data="props.row.trainLogs" border size="mini">
+                    <el-table-column min-width="120" align="center" prop="auditor" label="处理人"></el-table-column>
+                    <el-table-column min-width="160" align="center" prop="comment" label="处理结果"></el-table-column>
+                    <!-- <el-table-column min-width="120" align="center" prop="statusName" label="状态"></el-table-column> -->
+                    <el-table-column min-width="180" align="center" prop="createTime" label="处理时间"></el-table-column>
+                  </el-table>
+                  <span style="color: #1e80ff;cursor: pointer;" slot="reference">{{ props.row.statusName }}</span>
+                </el-popover>
+              </template>
+            </el-table-column>
             <el-table-column align="center" prop="lecturerName" min-width="150" label="培训讲师">
             </el-table-column>
             <el-table-column align="center" min-width="100" label="参加人员">
@@ -166,19 +179,7 @@
               </template>
             </el-table-column>
             <el-table-column min-width="150" align="center" prop="createTime" label="上传时间"></el-table-column>
-            <el-table-column min-width="100" align="center" label="状态">
-              <template slot-scope="props">
-                <el-popover trigger="hover">
-                  <el-table :data="props.row.trainLogs" border size="mini">
-                    <el-table-column min-width="120" align="center" prop="auditor" label="处理人"></el-table-column>
-                    <el-table-column min-width="160" align="center" prop="comment" label="处理结果"></el-table-column>
-                    <!-- <el-table-column min-width="120" align="center" prop="statusName" label="状态"></el-table-column> -->
-                    <el-table-column min-width="180" align="center" prop="createTime" label="处理时间"></el-table-column>
-                  </el-table>
-                  <span style="color: #1e80ff;cursor: pointer;" slot="reference">{{ props.row.statusName }}</span>
-                </el-popover>
-              </template>
-            </el-table-column>
+            
             
             <el-table-column fixed="right" align="center" label="操作" width="160px" class-name="small-padding fixed-width">
               <template slot-scope="scope">
@@ -232,7 +233,7 @@
           </el-select>
         </el-form-item>
         <el-form-item v-if="dataFormCite.type == '1'" label="集体人员:" prop="groupIds">
-          <el-select :disabled="dialogStatus=='view'?true:false" size="small" v-model="dataFormCite.groupIds" multiple filterable placeholder="请选择"
+          <el-select :disabled="dialogStatus=='view'?true:false" size="small" v-model="dataFormCite.groupIds" multiple filterable placeholder="请选择(支持输入姓名检索)"
             style="width: 95%;">
             <el-option :key="item.loginId" v-for="item in recipientsList"
               :label="item.deptName + '_' + item.userName + '_' + item.employeNo" :value="item.loginId">
@@ -281,14 +282,14 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="培训讲师:" prop="lecturer">
-          <el-select :disabled="dialogStatus=='view'?true:false" size="small" v-model="dataFormTrain.lecturer" filterable placeholder="请选择" style="width: 95%;">
+          <el-select :disabled="dialogStatus=='view'?true:false" size="small" v-model="dataFormTrain.lecturer" filterable placeholder="请选择(支持输入姓名检索)" style="width: 95%;">
             <el-option :key="item.loginId" v-for="item in recipientsList"
               :label="item.deptName + '_' + item.userName + '_' + item.employeNo" :value="item.loginId">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="参加人员:" prop="traineeIds">
-          <el-select :disabled="dialogStatus=='view'?true:false" size="small" v-model="dataFormTrain.traineeIds" multiple filterable placeholder="请选择"
+          <el-select :disabled="dialogStatus=='view'?true:false" size="small" v-model="dataFormTrain.traineeIds" multiple filterable placeholder="请选择(支持输入姓名检索)"
             style="width: 95%;">
             <el-option :key="item.loginId" v-for="item in recipientsList"
               :label="item.deptName + '_' + item.userName + '_' + item.employeNo" :value="item.loginId">
@@ -306,7 +307,7 @@
             <el-button size="small" type="primary">点击上传</el-button>
           </el-upload>
         </el-form-item>
-        <el-form-item label="签到表照片:" prop="signPhotos">
+        <el-form-item label="签到表:" prop="signPhotos">
           <el-upload :disabled="dialogStatus=='view'?true:false" :action="fileUrl" :file-list="dataFormTrain.signPhotoFiles" :on-success="handleAvatarSuccessTrain1"
             :before-upload="beforeUploadFileTrain" :on-remove="handleRemoveTrain1">
             <el-button size="small" type="primary">点击上传</el-button>
@@ -318,6 +319,11 @@
             <el-button size="small" type="primary">点击上传</el-button>
           </el-upload>
         </el-form-item>
+        <el-form-item v-if="dialogStatus!='view'" label="备注:">
+          <el-card shadow="never" style="width: 95%;padding: 0;min-height: 100px;line-height: normal;">
+            <div v-html="remarkHtml"></div>
+          </el-card>
+        </el-form-item>
         <el-table v-if="dialogStatus=='create'?false:true" :data="trainLogsList" border size="mini">
                     <el-table-column min-width="120" align="center" prop="auditor" label="处理人"></el-table-column>
                     <el-table-column min-width="160" align="center" prop="comment" label="处理结果"></el-table-column>
@@ -331,11 +337,12 @@
   </div>
 </template>
 <script scoped>
-import { certificatePage, certificateUpload, notice, certificatType, dictList, allUserList, citeList, uploadCite, editCite, trainList, uploadTrain,editTrain } from "@/api/allApi";
+import { certificatePage, certificateUpload, notice, certificatType, dictList, allUserList, citeList, uploadCite, editCite, trainList, uploadTrain,editTrain,remarkHtml } from "@/api/allApi";
 import { handleTree } from '@/utils/index'
 export default {
   data() {
     return {
+      remarkHtml:'',
       citeLogsList:[],
       trainLogsList:[],
       integralRules: '',
@@ -405,7 +412,10 @@ export default {
         materials: [{ required: true, message: "请上传培训材料", trigger: "blur" }],
         signPhotos: [{ required: true, message: "请上传签到表照片", trigger: "blur" }],
         sitePhotos: [{ required: true, message: "请上传现场照片", trigger: "blur" }],
-        content: [{ required: true, message: '请填写培训内容', trigger: 'blur' }],
+        content: [
+          { required: true, message: '请填写培训内容', trigger: 'blur' },
+          { min: 50, max: 500, message: '培训内容的描述不得低于50字！', trigger: 'blur' }
+        ],
       },
       totalTrain: 0,
       listQueryTrain: {
@@ -442,8 +452,15 @@ export default {
     this.getTypeList();
     this.getDataList();
     this.getIntegralNotice();
+    this.getRemarkHtml('trainrule');
   },
   methods: {
+    getRemarkHtml(val) {
+      remarkHtml({ noticeType: val }).then(response => {
+          console.log(response.data.data);
+          this.remarkHtml = response.data.data.content
+      })    
+    },
     handleClickCreate(val){
       this.dialogStatus = 'create';
       if(val=='上传表彰'){