添加校验

src/utils/constants.js

@@ -6,14 +6,8 @@
 // 分页大小
 export const PAGE_SIZE = 10
 
-// 添加动作常量
-export const ACTION_TYPE_ADD = 'ACTION_TYPE_ADD'
-
-// 修改动作常量
-export const ACTION_TYPE_UPDATE = 'ACTION_TYPE_UPDATE'
-
-// 删除动作常量
-export const ACTION_TYPE_DELETE = 'ACTION_TYPE_DELETE'
+// 问卷--模板下载
+export const QUESTION_UPLOAD_TEMPLATE = 'https://files.yunqueyi.com/application/vnd.openxmlformats-officedocument.spreadsheetml.sheet/common/20190408140018271.xlsx'
 
 /* 是否使用Mock数据 */
 export const IS_MOCK_DATAS = true

src/views/question-naire/question-list.vue

@@ -94,22 +94,24 @@
                         <el-radio :label="2">平铺显示</el-radio>
                     </el-radio-group>
                 </el-form-item>
-                <el-form-item label="问卷标题">
-                    <el-input v-model="questionEditList.name" placeholder="标题最多30字符" style="width: 300px;"></el-input>
+                <el-form-item label="问卷标题" prop="name">
+                    <el-input v-model="questionEditList.name" maxlength="30" placeholder="标题最多30字符" style="width: 300px;"></el-input>
                 </el-form-item>
-                <el-form-item label="题库导入">
+                <el-form-item label="题库导入" prop="fileName">
                     <el-col :span="10">
                         <el-input class="form-input" :placeholder="excelFileName" v-model="fileName" style="width: 300px;"/>
                     </el-col>
-                    <el-col :span="2">
+                    <el-col :span="6">
                         <el-upload 
-                        class="upload-demo" 
+                        class="upload-demo"
+                        style="display: inline-block;width: 80px;" 
                         action="#" 
                         accept=".xlsx" 
                         :before-upload="beforeImport" 
                         :limit="1">
-                            <el-button type="primary" size="mini" icon="search">导入题库</el-button>
+                            <el-button type="primary" size="mini">导入题库</el-button>
                         </el-upload>
+                        <el-button type="default" size="mini" @click="uploadTemplate">模板下载</el-button>
                     </el-col>
                 </el-form-item>
                 <el-form-item label="下一题按钮" v-if="questionEditList.showType == 1">
@@ -151,10 +153,29 @@
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item label="副标题" v-if="questionEditList.showType == 2 && questionEditList.headStyle == 1">
-                    <el-input v-model="questionEditList.subheading" placeholder="副标题最多20字符" style="width: 300px;"></el-input>
+                    <el-input v-model="questionEditList.subheading" maxlength="20" placeholder="副标题最多20字符" style="width: 300px;"></el-input>
                 </el-form-item>
                 <el-form-item label="问卷导言" v-if="questionEditList.showType == 2">
-                    <el-input v-model="questionEditList.questionIntro" placeholder="最多210字符" style="width: 300px;"></el-input>
+                    <el-input v-model="questionEditList.questionIntro"  maxlength="120" placeholder="最多210字符" style="width: 300px;"></el-input>
+                </el-form-item>
+                <el-form-item label="问卷起始时间" v-if="questionEditList.showType == 2 && questionEditList.headStyle == 1">
+                    <el-date-picker 
+                        type="date" 
+                        placeholder="开始时间" 
+                        v-model="questionEditList.startDate" 
+                        style="width: 144px;"
+                        format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd 00:00:00">
+                    </el-date-picker>
+                    <span>-</span>
+                    <el-date-picker 
+                        type="date" 
+                        placeholder="结束时间" 
+                        v-model="questionEditList.endDate" 
+                        style="width: 144px;"
+                        format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd 00:00:00">
+                    </el-date-picker>
                 </el-form-item>
                 <div v-if="questionEditList.showType == 2 && questionEditList.headStyle == 2">
                     <el-form-item class="submit-btn" label="头图">
@@ -186,13 +207,13 @@
                         <img v-if="!questionEditList.submitButtomUrl" class="bg-img" src="../../assets/image/default.png">
                     </div>
                 </el-form-item> 
-                <el-form-item label="问卷填写完毕提示文案">
-                    <el-input v-model="questionEditList.promptCopy"  style="width: 300px;"></el-input>
+                <el-form-item label="问卷填写完毕提示文案" prop="promptCopy">
+                    <el-input v-model="questionEditList.promptCopy" maxlength="40" style="width: 300px;"></el-input>
                     <span style="font-size:12px;">标题最多40字符</span>
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer" style="text-align:center;">
-                <el-button type="primary" size="small" @click="submitQuestion">提交</el-button>
+                <el-button type="primary" size="small" @click="submitQuestion" style="width:120px;">提交</el-button>
             </div>
         </el-dialog>
     </div>
@@ -201,6 +222,7 @@
 import BreadCrumb from '../../components/breadcrumb.vue'
 import * as commonUtil from '../../utils/utils'
 import { getFilePath, doUpload } from '../../utils/qiniu-util'
+import { QUESTION_UPLOAD_TEMPLATE } from '../../utils/constants'
 let vm = null
 export default {
     components: {
@@ -369,6 +391,10 @@ export default {
             };
             reader.readAsDataURL(file);
         },
+        // 模板下载
+        uploadTemplate() {
+            window.location.href = QUESTION_UPLOAD_TEMPLATE
+        },
         // 置灰不可点图片上传
         beforeAvatarUpload_1(file) {
             if (commonUtil.isEmptyUtils(file)) return;
@@ -429,24 +455,36 @@ export default {
                 model: vm.questionEditList,
                 fileArray: vm.fileArray
             }
-            if(vm.questionEditList.showType == 1) {
+            if(vm.questionEditList.showType == 1) {  // 单题显示
                 vm.questionEditList.subheading = ''
                 vm.questionEditList.questionIntro = ''
                 vm.questionEditList.headDiagramUrl = ''
             }else {
                 vm.questionEditList.nextDisableClickUrl = ''
                 vm.questionEditList.nextClickUrl = ''
-                if(vm.questionEditList.headStyle == 1) {
+                if(vm.questionEditList.headStyle == 1) { // 文字
                     vm.questionEditList.headDiagramUrl = ''
                 }else {
                     vm.questionEditList.subheading = ''
+                    vm.questionEditList.startDate = ''
+                    vm.questionEditList.endDate = ''
                 }
             }
-            vm.POST('/campaign/adminQuestionnaire/insertOrUpdateQuestionnaire',req).then((res) => {
-                if(res.code == '000000') {
-                    vm.discussEditVisible = false
-                }else {
-                    vm.$message.info(res.message)
+            if(!vm.questionEditList.id) {
+                if(!vm.fileArray) {
+                    vm.$message.info('请导入题库')
+                    return
+                }
+            }
+            vm.$refs.questionForm.validate((valid) => {
+                if(valid) {
+                    vm.POST('/campaign/adminQuestionnaire/insertOrUpdateQuestionnaire',req).then((res) => {
+                        if(res.code == '000000') {
+                            vm.discussEditVisible = false
+                        }else {
+                            vm.$message.info(res.message)
+                        }
+                    })
                 }
             })
         }