协议问题等

src/components/education/custom-resource/edit-course-dialog.vue

@@ -161,12 +161,12 @@
                     />
                   </div>
                 </el-upload>
-                <div class="limit-text">尺寸：750*420，只支持jpeg格式</div>
+                <div class="limit-text">尺寸：750*420，只支持jpg、jpeg格式</div>
                 <!-- <div style="color:red;position:absolute;top:104px;"  class="error">
                   课程难度课程难度
                 </div> -->
-                <div style="color:red;position:absolute;top:102px;" v-show="needShowAuditMsg && formData.courseCustomDoctorModels[0].courseDoctorAvatarUrlCheck" class="error">
-                  <span>{{formData.courseCustomDoctorModels[0].courseDoctorAvatarUrlCheck}}</span>
+                <div style="color:red;position:absolute;top:102px;" v-show="needShowAuditMsg && formData.courseCustomDoctorModels[0].courseIntroImageCheck" class="error">
+                  <span>{{formData.courseCustomDoctorModels[0].courseIntroImageCheck}}</span>
                 </div>                  
               </el-form-item>
               <!-- <p class="upload-message" v-if="uploadImgMessage">请选择列表图片</p> -->
@@ -194,9 +194,9 @@
                 <span
                   class="word-num"
                 >{{(formData.courseCustomDoctorModels[0] && formData.courseCustomDoctorModels[0].courseDoctorName || '').replace(/\s+/g,"").length}}/25</span>
-                <div v-show="needShowAuditMsg && formData.courseCustomDoctorModels[0].courseDoctorHospitalCheck" class="error">
-                  <span>{{formData.courseCustomDoctorModels[0].courseDoctorHospitalCheck}}</span>
-                  <span v-show="formData.checkStatus == 0" class="cancle" @click="cancleAudit(formData.courseCustomDoctorModels[0], 'courseDoctorHospitalCheck')">X</span>
+                <div v-show="needShowAuditMsg && formData.courseCustomDoctorModels[0].courseDoctorNameCheck" class="error">
+                  <span>{{formData.courseCustomDoctorModels[0].courseDoctorNameCheck}}</span>
+                  <span v-show="formData.checkStatus == 0" class="cancle" @click="cancleAudit(formData.courseCustomDoctorModels[0], 'courseDoctorNameCheck')">X</span>
                 </div> 
               </el-col>
             </el-form-item>
@@ -226,7 +226,7 @@
                     />
                   </div>
                 </el-upload>
-                <div class="limit-text" style="top: 76px;">尺寸：88*88，只支持jpeg格式</div>
+                <div class="limit-text" style="top: 76px;">尺寸：88*88，只支持jpg、jpeg格式</div>
                 <!-- <div class="error" style="position:absolute;top: 94px;">
                   所属机构所属机构：所属机构：
                 </div> -->
@@ -326,23 +326,7 @@ import { ossUpload, getFilePathForOSS } from "@/utils/oss/ossUtil";
 let vm = null;
 export default {
   data() {
-    let checkCourseName = (rule, value, callback) => {
-      // 如果有审核的信息，则直接报错
-      if (!value && this.needCheckField) {
-        callback(new Error("请输入课程名称"));
-      } else {
-        callback();
-      }
-    };
     return {
-      state1: '',
-      showCropper: false,  
-      cropOption: {
-        offset_x: 10,
-        offset_y: 10,
-        width: 750,
-        height: 420
-      },
       step: 1,
       needCheckField: false,
       needShowAuditMsg: false,    // TODO
@@ -414,18 +398,6 @@ export default {
       },
       // uploadImgMessage: false,
       imgMouseOver: false,
-      // rules: {
-      //   courseName: [
-      //     { required: true, message: " " },
-      //     { validator: checkCourseName }
-      //   ],
-      //   subjectIdList: [
-      //     { required: true, message: "请输入课程名称" }
-      //   ],
-      //   shareType: [
-      //     { required: true, message: "请选择开放范围" }
-      //   ]
-      // },
       labelOptions: [],
       isShowOtherContent: false,
       fileList: [
@@ -826,7 +798,7 @@ export default {
     beforeUploadForCourse(file) {
       const isJPG = file.type === 'image/jpeg'
       if(!isJPG) {
-        this.$message.error('只支持jpeg格式')
+        this.$message.error('只支持jpg、jpeg格式')
         return;
       }
 
@@ -851,7 +823,7 @@ export default {
       // const isLt50kb = file.size / 1024 < 50;
       const isJPG = file.type === 'image/jpeg'
       if(!isJPG) {
-        this.$message.error('只支持jpeg格式')
+        this.$message.error('只支持jpg、jpeg格式')
         return;
       }
       var _img = new FileReader()

src/components/education/custom-resource/preview-protocol.vue

@@ -14,7 +14,7 @@
       </div>
       <div v-html="protocolContent"></div>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="close">不同意</el-button>
+        <el-button @click="close(false)">不同意</el-button>
         <el-button type="primary" @click="signProtocol">同意</el-button>
       </div>
     </el-dialog>

src/components/education/custom/course-list.vue

@@ -466,7 +466,7 @@ export default {
     display: flex;
     flex-direction: column;
     // padding: 30px 200px;
-    width: 1000px;
+    width: 100%;
     text-align: center;
     margin-bottom: 100px;
     align-items: center;

src/utils/fetch.js

@@ -54,7 +54,7 @@ service.interceptors.request.use(config => {
     }
     if( process.env.BUILD_ENV == "development" ){  // 本地开发环境
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
-      config.headers['token'] = 'D516F5CA9A304FC9929F09BF9F07024C';
+      config.headers['token'] = 'FB40194EE277496093448BF696A3D0E4';
       // config.headers['token'] = localStorage.getItem('storageToken')
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')

src/views/education/audit-custom-course copy.vue

@@ -118,7 +118,7 @@
                     />
                   </div>
                 </el-upload>
-                <div class="limit-text">尺寸：750*420，只支持jpeg格式</div>
+                <div class="limit-text">尺寸：750*420，只支持jpg、jpeg格式</div>
                 <span class="word-num">
                   <span v-show="formData.checkStatus == 0" class="edit-wrapper" @click="auditField(formData, 'courseIntroImageCheck')">
                     <img class="edit-img" src="../../assets/image/phrase3/icon-pz.png" />拒绝原因
@@ -198,7 +198,7 @@
                     />
                   </div>
                 </el-upload>
-                <div class="limit-text">尺寸：88*88，只支持jpeg格式</div>
+                <div class="limit-text">尺寸：88*88，只支持jpg、jpeg格式</div>
                 <span class="word-num">
                   <span v-show="formData.checkStatus == 0" class="edit-wrapper" @click="auditField(formData.courseCustomDoctorModels[0], 'courseDoctorAvatarUrlCheck')">
                     <img class="edit-img" src="../../assets/image/phrase3/icon-pz.png" />拒绝原因

src/views/education/audit-custom-course.vue

@@ -125,7 +125,7 @@
                     />
                   </div>
                 </el-upload>
-                <div class="limit-text">尺寸：750*420，只支持jpeg格式</div>
+                <div class="limit-text">尺寸：750*420，只支持jpg、jpeg格式</div>
                 <span class="word-num">
                   <span v-show="formData.checkStatus == 0" class="edit-wrapper" @click="auditField(formData, 'courseIntroImageCheck')">
                     <img class="edit-img" src="../../assets/image/phrase3/icon-pz.png" />拒绝原因
@@ -207,7 +207,7 @@
                       />
                     </div>
                   </el-upload>
-                  <div class="limit-text">尺寸：88*88，只支持jpeg格式</div>
+                  <div class="limit-text">尺寸：88*88，只支持jpg、jpeg格式</div>
                   <span class="word-num">
                     <span v-show="formData.checkStatus == 0" class="edit-wrapper" @click="auditField(formData.courseCustomDoctorModels[0], 'courseDoctorAvatarUrlCheck')">
                       <img class="edit-img" src="../../assets/image/phrase3/icon-pz.png" />拒绝原因

src/views/education/external-resource-manage.vue

@@ -48,7 +48,11 @@
         <el-table-column align="center" prop="subjectName" label="课程分类" ></el-table-column>
         <el-table-column align="center" prop="createdDoctorName" label="创建人" ></el-table-column>
         <el-table-column align="center" prop="createdHospitalName" label="所属机构" ></el-table-column>
-        <el-table-column align="center" prop="createdTime" label="创建日期" ></el-table-column>
+        <el-table-column align="center" prop="createdTime" label="创建日期" >
+          <template slot-scope="scope">
+            {{scope.row.createdTime && new Date(scope.row.createdTime).format('yyyy-MM-dd hh:mm:ss')}}
+          </template>          
+        </el-table-column>
         <el-table-column align="center" prop="checkStatus" label="审核状态" >
           <template slot-scope="scope">
             <span v-html="getHtmlCheckStatus(scope.row.checkStatus)"></span>
@@ -195,7 +199,7 @@
         let searchForm = Object.assign({}, this.searchForm);
         let createdTime = searchForm.createdTime;
         if(createdTime) {
-          searchForm.createdTime = new Date(searchForm.createdTime).getTime();
+          searchForm.createdTime = new Date(searchForm.createdTime + ' 00:00:00').getTime();
         } else {
           searchForm.createdTime = '';
         }