Merge branch 'dev' of http://47.92.113.182:3000/wangpeng/integrated_traffic_admin_vue into dev

src/views/studyResource/videocourseware/components/complete.vue

@@ -10,7 +10,7 @@
           <el-form-item label="课件名称" prop="COURSEWARENAME">
             <el-input id="COURSEWARENAME" ref="COURSEWARENAME" :disabled="dialogType == 'info'" v-model="form.COURSEWARENAME" maxlength="255" placeholder="这里输入课件名称..." title="课件名称"/>
           </el-form-item>
-          <el-form-item label="培训类型" prop="trainAllName">
+          <el-form-item label="培训类型" prop="trainAllName" class="is-required">
             <div @click="dialogFormVisible = true">
               <el-input v-model="form.trainAllName" :readonly="true" maxlength="255" placeholder="这里输入培训类型..." title="培训类型"/>
             </div>
@@ -559,7 +559,18 @@ export default {
       //     return false
       //   }
       // }
-
+      if (!this.TRAINTYPE) {
+        this.$message.warning('培训类型不能为空')
+        return false
+      }
+      if (!this.INDUSTRY_END_ID) {
+        this.$message.warning('行业类型不能为空')
+        return false
+      }
+      if (!this.POSTTYPE) {
+        this.$message.warning('岗位类型不能为空')
+        return false
+      }
       // if (!this.form.INDUSTRY_END_ID) {
       //   this.$message.warning('请选择培训类型')
       //   return false

src/views/studyResource/videocourseware/components/edit.vue

@@ -10,7 +10,7 @@
           <el-form-item label="课件名称" prop="COURSEWARENAME">
             <el-input id="COURSEWARENAME" ref="COURSEWARENAME" :disabled="dialogType == 'info'" v-model="form.COURSEWARENAME" maxlength="255" placeholder="这里输入课件名称..." title="课件名称"/>
           </el-form-item>
-          <el-form-item label="培训类型" prop="trainAllName">
+          <el-form-item label="培训类型" prop="trainAllName" class="is-required">
             <div @click="dialogFormVisible = true">
               <el-input v-model="form.trainAllName" :readonly="true" maxlength="255" placeholder="这里输入培训类型..." title="培训类型"/>
             </div>
@@ -535,6 +535,18 @@ export default {
           return false
         }
       }
+      if (!this.TRAINTYPE) {
+        this.$message.warning('培训类型不能为空')
+        return false
+      }
+      if (!this.INDUSTRY_END_ID) {
+        this.$message.warning('行业类型不能为空')
+        return false
+      }
+      if (!this.POSTTYPE) {
+        this.$message.warning('岗位类型不能为空')
+        return false
+      }
       this.$refs.form.validate(valid => {
         if (valid) {
           Object.keys(this.form).map(key => {