Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/course-pc/src/views/coursemanagement/list.vue

@@ -144,10 +144,10 @@
                     <quill-editor style="height: 150px" ref="text" v-model="courseForm.courseDesc" class="myQuillEditor" :options="editorOption"/>
                 </el-form-item>
                 <el-form-item label="课程价格">
-                    <el-input-number v-model="courseForm.coursePrice" :min="0" :precision="2"></el-input-number>
+                    <el-input-number v-model="courseForm.coursePrice" :min="0" :precision="2" step-strictly :step="1" @blur="coursePriceBlur"></el-input-number>
                 </el-form-item>
                 <el-form-item label="课程时间(分钟)">
-                    <el-input-number v-model="courseForm.courseDuration" :min="0"></el-input-number>
+                    <el-input-number v-model="courseForm.courseDuration" :min="1" step-strictly :step="1" @blur="courseDurationBlur"></el-input-number>
                 </el-form-item>
                 <el-form-item label="课程封面">
                     <el-upload
@@ -307,6 +307,16 @@ export default {
         }
     },
     methods: {
+        coursePriceBlur(val) {
+            if(!this.courseForm.coursePrice) {
+                this.courseForm.coursePrice = 0
+            }
+        },
+        courseDurationBlur(val) {
+            if(!this.courseForm.courseDuration) {
+                this.courseForm.courseDuration = 1
+            }
+        },
         saveVideo() {
             console.log(this.displayVideoList, '<=== 看看数据')
             const courseInfoId = this.addVideoRow.id
@@ -657,7 +667,7 @@ export default {
                     courseName: '',
                     courseDesc: '',
                     coursePrice: 0,
-                    courseDuration: 0,
+                    courseDuration: 1,
                     coverImageUrl: '',
                 };
                 if (this.$refs.courseForm) {

fhKeeper/formulahousekeeper/course-pc/src/views/examCertification/examCertification.vue

@@ -12,7 +12,7 @@
       <el-form ref="form" :model="form" label-width="120px">
         <div class="form-section">
           <el-form-item label="分类名称" prop="typeName">
-            <el-input v-model="form.typeName" placeholder="请输入分类名称"></el-input>
+            <el-input v-model="form.typeName" placeholder="请输入分类名称" maxlength="100"></el-input>
           </el-form-item>
         </div>
 
@@ -239,7 +239,6 @@ export default {
     submitForm() {
       this.$refs.form.validate(valid => {
         if (valid) {
-          console.log(this.form, '<==== 将要提交的表单')
           const { id, type, typeName, coverImage, contentImage, contentVideo } = this.form
           const obj = {
             typeName,

fhKeeper/formulahousekeeper/course-pc/src/views/lecturerManagement/index.vue

@@ -52,7 +52,7 @@
         <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="800px">
             <el-form :model="lecturerForm" :rules="rules" ref="lecturerForm" label-width="100px">
                 <el-form-item label="讲师名称" prop="name">
-                    <el-input v-model="lecturerForm.name" placeholder="请输入讲师名称"></el-input>
+                    <el-input v-model="lecturerForm.name" placeholder="请输入讲师名称" maxlength="20"></el-input>
                 </el-form-item>
                 <el-form-item label="讲师介绍">
                     <el-input type="textarea" v-model="lecturerForm.introduction" placeholder="请输入讲师介绍"></el-input>
@@ -230,7 +230,7 @@ export default {
                         this.getList();
                     } else {
                         this.$message({
-                            type: 'warning',
+                            type: 'error',
                             message: res.msg
                         });
                     }

fhKeeper/formulahousekeeper/course-pc/src/views/offlineRegistration/registration.vue

@@ -46,7 +46,9 @@
       <div>
         <el-table v-if="activeTab === 'course-registration'" :data="courseRegistrationList" highlight-current-row
           v-loading="listLoading" :height="tableHeight - 58" style="width: 100%;">
-          <el-table-column label="序号" prop="id" width="80" align="center"></el-table-column>
+          <el-table-column label="序号" width="80" align="center">
+            <template slot-scope="scope">{{ scope.$index + 1 }}</template>
+          </el-table-column>
           <el-table-column label="姓名" prop="name" width="140" align="center"></el-table-column>
           <el-table-column label="手机号" prop="phone" width="200" align="center"></el-table-column>
           <el-table-column label="报名课程" prop="course" align="center"></el-table-column>
@@ -68,7 +70,7 @@
           <el-input v-model.trim="registrationForm.name" placeholder="请输入姓名"></el-input>
         </el-form-item>
         <el-form-item label="手机">
-          <el-input v-model.trim="registrationForm.phone" placeholder="请输入姓名"></el-input>
+          <el-input v-model.trim="registrationForm.phone" placeholder="请输入手机号"></el-input>
         </el-form-item>
         <el-form-item label="报名课程">
           <el-select v-model="registrationForm.course" multiple placeholder="请选择课程" style="width: 100%" clearable>

fhKeeper/formulahousekeeper/course-pc/src/views/offlineTraining/offlineTraining.vue

@@ -12,7 +12,7 @@
       <el-form ref="form" :model="form" label-width="120px">
         <div class="form-section">
           <el-form-item label="分类名称" prop="typeName">
-            <el-input v-model="form.typeName" placeholder="请输入分类名称"></el-input>
+            <el-input v-model="form.typeName" placeholder="请输入分类名称" maxlength="100"></el-input>
           </el-form-item>
         </div>
 

fhKeeper/formulahousekeeper/timesheet_mld/src/i18n/zh.json

@@ -1805,7 +1805,7 @@
   "liuYue": "六月",
   "qiYue": "七月",
   "baYue": "八月",
-  "thisTWuyue": "this.$t('wuYue')",
+  "thisTWuyue": "五月",
   "jiuYue": "九月",
   "shiYue": "十月",
   "shiYiYue": "十一月",