完成了活动申请部分前端

src/views/activityManage/makerActvityApply.vue

@@ -51,7 +51,7 @@
                           </div>
                           <div class="inpBlock">
                               <div class="label">负责人</div>
-                              <el-input v-model="data.select.person" placeholder="请输入内容"></el-input>
+                              <el-input v-model="data.select.leader" placeholder="请输入内容"></el-input>
                           </div>
                           <div class="inpBlock">
                               <div class="label">所在部门</div>
@@ -71,9 +71,9 @@
                         <div class="inpBlock">
                               <div class="label">项目开始时间</div>
                               <el-date-picker
-                                v-model="data.select.date"
+                                v-model="data.select.time"
                                 type="datetime"
-                                value-format="timestamp"
+                                value-format="yyyy-MM-dd HH:mm:ss"
                                 style="width: 100%;"
                                 placeholder="选择日期">
                               </el-date-picker>
@@ -84,7 +84,7 @@
                           </div>
                           <div class="inpBlock">
                               <div class="label">联系电话</div>
-                              <el-input v-model="data.select.tel" placeholder="请输入内容"></el-input>
+                              <el-input v-model="data.select.tel" @blur="checkPhone(data.select.tel)" placeholder="请输入内容"></el-input>
                           </div>
                           
                       </div>
@@ -154,7 +154,7 @@
                 resize="none"
                 class="textArea"
                 placeholder="请输入内容"
-                v-model="data.introduce">
+                v-model="data.select.introduce">
               </el-input>
             </div>
             <!-- 活动介绍区域结束 -->
@@ -213,7 +213,7 @@
   <script>
   import { uuid } from 'vue-uuid';
       export default {
-        props:["next","data"],
+        props:["next","data","checkPhone"],
         data() {
           return {
             addMemberDialog:false,
@@ -237,6 +237,8 @@
             this.$router.push('/makerActvity')
           },
           commit(){
+            //判断是否全部填写
+            for(let a in this.Member)if(a!='Id'&&/^\s*$/g.test(this.Member[a]))return this.$message.error("请不要留空")
             this.Member.Id = uuid.v1();
             let pushData={};
             Object.assign(pushData,this.Member)
@@ -250,6 +252,7 @@
           },
           change(){
             if(this.Member.Id=='')return this.$message.error("错误");
+            for(let a in this.Member)if(/^\s*$/g.test(this.Member[a]))return this.$message.error("请不要留空")
             Object.assign(this.data.select.teacher.filter(item=>item.Id==this.Member.Id)[0],this.Member)
             for(let i in this.Member)this.Member[i]='';
             this.addMemberDialog = true;

src/views/activityManage/makerActvityApply2.vue

@@ -71,13 +71,12 @@
         title="提示"
         :visible.sync="dialogVisible1"
         width="600px"
-        class="MAputIn"
-        :before-close="init">
+        class="MAputIn">
         <div class="addDialogLogo">LOGO</div>
         <div class="deleteContent">是否提交“{{activityName}}”项目活动？</div>
         <span slot="footer" class="dialog-footer">
             <el-button type="primary" @click="submit" class="btn5" size="small">确认提交</el-button>
-            <el-button @click="init" class="btn5" style="background:#cccccc" size="small">取消</el-button>
+            <el-button @click="dialogVisible1=false;" class="btn5" style="background:#cccccc" size="small">取消</el-button>
         </span>
       </el-dialog>
       <!-- 提交对话框结束 -->
@@ -88,13 +87,12 @@
   <script>
   import { VueEditor } from "vue2-editor";
       export default {
-        props:["back","submit","activityName","data"],
+        props:["back","submit","activityName","data","check"],
         components:{
           VueEditor
         },
         data() {
           return {
-            content:'',
             dialogVisible1:false,
             customToolbar: [
               ["bold", "italic", "underline"], [{ list: "ordered" }, { list: "bullet" }],
@@ -104,22 +102,11 @@
           }
         },
         methods:{
-            init(){
-            //重置
-            // this.dialogVisible=false;
-            this.dialogVisible1=false;
-            // this.dialogVisible2=false;
-            },
-            putIn(){
-            // alert('333')
-            this.dialogVisible1=true;
-            // this.$router.push('/projectApplicationfund')
+          putIn(){
+              if(this.check()==1)this.dialogVisible1=true;
           },
           backBtn1(){
-            this.$router.push('/makerActvityApply')
-          },
-          homeExit(){
-
+              this.$router.push('/makerActvityApply')
           },
           toPage(val){
             if (val==1) {
@@ -135,8 +122,6 @@
             }
           }
         },
-        mounted(){
-        }
       }
   </script>
   

src/views/activityManage/makerActvityApplyMain.vue

@@ -1,8 +1,8 @@
 <template>
     <!-- 创客创新-活动申请 -->
   <div class="core_dialogue">
-        <makerActvityApply :data="makerActvityApplyData"  :next="next"  v-if="status==0" />
-        <makerActvityApply2 :data="makerActvityApply2Data" :activityName="makerActvityApplyData.select.activityName" :next="next" :submit="submit" :back="back" v-if="status==1" />
+        <makerActvityApply :data="makerActvityApplyData" :checkPhone="checkPhone"  :next="next"  v-if="status==0" />
+        <makerActvityApply2 :data="makerActvityApply2Data" :activityName="makerActvityApplyData.select.activityName" :check="check" :submit="submit" :back="back" v-if="status==1" />
   </div>
 </template>
 
@@ -18,15 +18,15 @@ import makerActvityApply2 from './makerActvityApply2.vue';
                     select:{
                         activityName:'',
                         pid:"",
-                        person:'',
+                        leader:'',
                         tel:'',
-                        date:'',
+                        time:'',
                         fund:0,
                         people:0,
                         value:'',
                         teacher:[],
+                        introduce:'',
                     },
-                    introduce:'',
                     class:[],
                     project:[],
                 },
@@ -43,8 +43,9 @@ import makerActvityApply2 from './makerActvityApply2.vue';
                 this.status--
             },
             submit(){
-                console.log(this.makerActvityApplyData)
-                console.log(this.makerActvityApply2Data)
+                let data = {...this.makerActvityApplyData.select,...this.makerActvityApply2Data}
+                console.log(data);
+                
             },
             getAllClass(){
                 this.ajax.get(this.$store.state.api+"/SelectAllDepartment",{
@@ -63,6 +64,65 @@ import makerActvityApply2 from './makerActvityApply2.vue';
                 }).catch(err=>{
                     this.$message.error(err.message)
                 })
+            },
+            check(){
+                let checkData = {...this.makerActvityApplyData.select,...this.makerActvityApply2Data}
+                const cEmpty = /^\s*$/g;
+                for(let i in checkData){
+                    switch(i){
+                        case "0":
+                            if(cEmpty.test(checkData[i]))return this.$message.error("活动计划不能为空");
+                            break;
+                        case "1":
+                            if(cEmpty.test(checkData[i]))return this.$message.error("预期目标不能为空");
+                            break;
+                        case "2":
+                            if(cEmpty.test(checkData[i]))return this.$message.error("活动受面不能为空");
+                            break;
+                        case "3":
+                            if(cEmpty.test(checkData[i]))return this.$message.error("经费支出计划不能为空");
+                            break;
+                        case "activityName":
+                            if(cEmpty.test(checkData[i]))return this.$message.error("活动名称不能为空");
+                            break;
+                        case "teacher":
+                            if(checkData[i].length==0)return this.$message.error("请添加至少一名指导老师")
+                            break;
+                        case "fund":
+                            break;
+                        case "people":
+                            break;
+                        case "leader":
+                            if(cEmpty.test(checkData[i]))return this.$message.error("负责人不能为空");
+                            break;
+                        case "pid":
+                            if(cEmpty.test(checkData[i]))return this.$message.error("请选择所属项目");
+                            break;
+                        case "tel":
+                            if(cEmpty.test(checkData[i]))return this.$message.error("电话号码不能为空");
+                            if(!this.checkPhone(checkData[i]))return;
+                            break;
+                        case "time":
+                            if(cEmpty.test(checkData[i]))return this.$message.error("请选择项目开始时间");
+                            break;
+                        case "value":
+                            if(cEmpty.test(checkData[i]))return this.$message.error("请选择所在部门");
+                            break;
+                        case "introduce":
+                            if(cEmpty.test(checkData[i]))return this.$message.error("活动介绍不能为空");
+                            break;
+                    }
+                }
+                return 1;
+            },
+            checkPhone(val){
+                if(/^\s*$/g.test(val))return;
+                const cPhone = /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/
+                if(!cPhone.test(val)){
+                    this.$message.error("电话号码格式不正确");
+                    return false;
+                }
+                return true;
             }
         },
         mounted() {