展演修改

src/main/vue/src/plugins/http.js

@@ -5,8 +5,8 @@ import qs from 'qs';
 let baseUrl = 'http://localhost:8080';
 switch (process.env.NODE_ENV) {
     case 'development':
-        // baseUrl = 'http://localhost:8080';
-        baseUrl = 'http://wljtest.izouma.com';
+        baseUrl = 'http://localhost:8080';
+        // baseUrl = 'http://wljtest.izouma.com';
         // baseUrl = 'http://192.168.31.202:8080';
         break;
     case 'test':

src/main/vue/src/views/performance/ProgrammeEdit.vue

@@ -221,7 +221,8 @@
             </el-timeline>
 
             <el-form-item>
-                <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+                <el-button @click="onSave(true)" :loading="saving" type="primary">提交</el-button>
+                <el-button @click="onSave(false)" :loading="saving" type="success">保存</el-button>
                 <el-button @click="onDelete" :loading="saving" type="danger" v-if="formData.id">删除 </el-button>
                 <el-button @click="$router.go(-1)">取消</el-button>
             </el-form-item>
@@ -371,11 +372,21 @@ export default {
             rules: {
                 phone: [
                     {
+                        required: true,
                         pattern: /^1[3-9]\d{9}$/,
                         message: '请输入正确的手机号',
                         trigger: 'blur'
                     }
-                ]
+                ],
+                performanceId: [{ required: true, message: '请选择活动', trigger: 'blur' }],
+                name: [{ required: true, message: '请输入节目名称', trigger: 'blur' }],
+                specialtyId: [{ required: true, message: '请选择参赛专业', trigger: 'blur' }],
+                competitionGroup: [{ required: true, message: '请选择参赛组别', trigger: 'blur' }],
+                levelSettingId: [{ required: true, message: '请选择参赛级别', trigger: 'blur' }],
+                instructor: [{ required: true, message: '请输入指导老师', trigger: 'blur' }],
+                gradingOrganizationId: [{ required: true, message: '请选择考级机构', trigger: 'blur' }],
+                organizationId: [{ required: true, message: '请选择承办单位', trigger: 'blur' }],
+                contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }]
             },
             competitionGroupOptions: [
                 { label: '个人', value: 'SINGLE' },
@@ -418,14 +429,25 @@ export default {
         }
     },
     methods: {
-        onSave() {
-            this.$refs.form.validate(valid => {
-                if (valid) {
-                    this.submit();
-                } else {
-                    return false;
-                }
-            });
+        onSave(isSubmit) {
+            // this.$refs.form.validate(valid => {
+            //     if (valid) {
+            //         this.submit();
+            //     } else {
+            //         return false;
+            //     }
+            // });
+            if (isSubmit) {
+                this.$refs.form.validate(valid => {
+                    if (valid) {
+                        this.submit(isSubmit);
+                    } else {
+                        return false;
+                    }
+                });
+            } else {
+                this.submit(false);
+            }
         },
         submit() {
             let lenght = this.participants.filter(item => !item.del).length;
@@ -571,4 +593,15 @@ export default {
 .width {
     width: 260px;
 }
+/deep/.el-timeline-item__timestamp {
+    color: #0561d9;
+    line-height: 1;
+    font-size: 14px;
+}
+/deep/.el-timeline-item__node {
+    background-color: #5b9bed;
+}
+/deep/.el-timeline-item__tail {
+    border-left: 2px solid #7cace9;
+}
 </style>