Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/ssti-CollegeManage

src/views/projectApply/projectApplication.vue

@@ -558,7 +558,7 @@ import downloadFile from '@/components/tool/downloadFile.js';
           // }
       },
       mounted(){      //跳转到此页面立刻获取数据
-        this.getData();     //获取表格数据
+        // this.getData();     //获取表格数据
       }
 
     }

src/views/projectApply/projectApplicationApply.vue

@@ -86,6 +86,7 @@
                               <el-date-picker
                                 v-model="data.select.projectDate"
                                 type="daterange"
+                                value-format="yyyy-MM-dd HH:mm:ss"
                                 range-separator="至"
                                 start-placeholder="开始日期"
                                 end-placeholder="结束日期">

src/views/projectApply/projectApplicationApply2.vue

@@ -27,25 +27,25 @@
               <div>
                 <p class="pTit2">一、项目研发背景</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="data.content.back"></vue-editor>
+                  <vue-editor  :editorToolbar="customToolbar" v-model="data.back"></vue-editor>
                 </div>
               </div>
               <div>
                 <p class="pTit2">二、项目创新点</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="data.content.innovate"></vue-editor>
+                  <vue-editor  :editorToolbar="customToolbar" v-model="data.innovate"></vue-editor>
                 </div>
               </div>
               <div>
                 <p class="pTit2">三、技术研发路线</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="data.content.path"></vue-editor>
+                  <vue-editor  :editorToolbar="customToolbar" v-model="data.path"></vue-editor>
                 </div>
               </div>
               <div>
                 <p class="pTit2">四、项目应用场景</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="data.content.scene"></vue-editor>
+                  <vue-editor  :editorToolbar="customToolbar" v-model="data.scene"></vue-editor>
                 </div>
               </div>
               <!-- <div class="editor">
@@ -57,7 +57,7 @@
               <div>
                 <p class="pTit2">一、项目商业模式/社会价值</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="data.content.worth"></vue-editor>
+                  <vue-editor  :editorToolbar="customToolbar" v-model="data.worth"></vue-editor>
                 </div>
               </div>
             </div>
@@ -66,7 +66,7 @@
               <div>
                 <p class="pTit2">一、团队构成及优势</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="data.content.team"></vue-editor>
+                  <vue-editor  :editorToolbar="customToolbar" v-model="data.team"></vue-editor>
                 </div>
               </div>
             </div>
@@ -76,7 +76,7 @@
               <div>
                 <p class="pTit2">一、研发成本来源及构成</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="data.content.cost"></vue-editor>
+                  <vue-editor  :editorToolbar="customToolbar" v-model="data.cost"></vue-editor>
                 </div>
               </div>
             </div>
@@ -85,26 +85,26 @@
               <div>
                 <p class="pTit2">一、项目预期成果、数量及形式（产品原型/发明专利/双创竞赛/成果转化/社会效益）</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="data.content.expectResults"></vue-editor>
+                  <vue-editor  :editorToolbar="customToolbar" v-model="data.expectResults"></vue-editor>
                 </div>
               </div>
               <div>
                 <p class="pTit2">二、学生创客人才培养预期成果、数量（教师填写）</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="data.content.expectResultsTeacher"></vue-editor>
+                  <vue-editor  :editorToolbar="customToolbar" v-model="data.expectResultsTeacher"></vue-editor>
                 </div>
               </div>
               <div>
                 <p class="pTit2">三、项目预期孵化、转化创业项目情况</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="data.content.expectConversion"></vue-editor>
+                  <vue-editor  :editorToolbar="customToolbar" v-model="data.expectConversion"></vue-editor>
                 </div>
               </div>
             </div>
             <div>
               <p class="pTit">实施计划</p>
               <div class="editor">
-                <vue-editor  :editorToolbar="customToolbar" v-model="data.content.plan"></vue-editor>
+                <vue-editor  :editorToolbar="customToolbar" v-model="data.plan"></vue-editor>
               </div>
             </div>
             <div id="r" class="baseBtn">

src/views/projectApply/projectApplicationApplyMain.vue

@@ -224,7 +224,6 @@
             },
 
             projectApplicationApply2:{  //项目内容页面
-                content:{
                   back:'',
                   innovate:'',
                   path:'',
@@ -236,7 +235,6 @@
                   expectResultsTeacher:'',
                   expectConversion:'',
                   plan:''
-                }
             },
             projectApplicationApply3:{  //预算经费页面
                 tableData:  // 经费月支出计划列表数据默认显示数据
@@ -383,14 +381,19 @@
               let a=this.projectApplicationApply1;
               let b=this.projectApplicationApply2;
               let c=this.projectApplicationApply3
-              // if(a.select.projectName=='') return this.$message.error('请输入项目名称')
-              // if(a.select.person=='') return this.$message.error('请输入项目负责人')
-              // if(a.select.value1=='') return this.$message.error('请选择项目开始时间')
-              // if(a.select.value=='') return this.$message.error('请选择所在部门')
-              // if(a.select.fund=='') return this.$message.error('请输入预算总经费')
-              // if(a.select.tel=='') return this.$message.error('请输入联系电话')
-              // if(!a.telVerify) return this.$message.error('请输入正确联系电话格式')
-              // if(a.select.sort=='') return this.$message.error('请选择分类')
+              if(a.select.projectName=='') return this.$message.error('请输入项目名称')
+              if(a.select.leader=='') return this.$message.error('请输入项目负责人')
+              if(a.select.department=='') return this.$message.error('请选择所在部门')
+              if(!a.select.MultiSelectProjectNameS[0]) return this.$message.error('请选择优先支持项目')
+              if(a.select.tel=='') return this.$message.error('请输入联系电话')
+
+              if(a.select.projectDate=='') return this.$message.error('请选择项目开始时间')
+              if(a.select.fund=='') return this.$message.error('请输入预算总经费')
+              if(a.select.fund=='') return this.$message.error('请选择美丽校园改造计划')
+              if(a.select.person=='') return this.$message.error('请选择项目申请人')
+
+
+              if(!a.telVerify) return this.$message.error('请输入正确联系电话格式')
               
               // let d=[]   //按照后端格式传递数据，项目内容，要将经费支出，与项目明细放在一起，
               // for(let key in b){
@@ -404,8 +407,9 @@
               //   }
               // }
               // console.log(a.select.sort);
-              // let typeId=a.select.sort[0]
-              // let typeName=a.select.sort[1]
+              console.log(this.pageType);
+              let typeId=this.pageType[0]
+              let typeName=this.pageType[1]
               // return console.log(typeId,typeName);
 
               let param={
@@ -415,29 +419,34 @@
                 // phone:a.select.tel,
                 // cid:a.select.value,
                 // student:JSON.stringify(a.tableData),
-                // message:JSON.stringify([d,[newData1,c.tableData2]]),
                 // tid:typeId,
                 // tidName:typeName,
                 // mon:a.select.fund,
-                imgsrc:a.dialogImageUrl,
                 uid:this.$store.state.userInfo.userid,
                 tit:a.select.projectName,
-                con:a.textarea,
                 leader:a.select.leader,
-                tel:a.select.tel,
-                cid: this.pageType,
-                proDate:a.select.projectDate,
+                proDate:JSON.stringify(a.select.projectDate),
                 department:a.select.department,
                 fund:a.select.fund,
+                lleader:'',
+                imgsrc:a.dialogImageUrl,
+                teacher:JSON.stringify(a.tableTeacherData),
+                student:JSON.stringify(a.tableStudentData),
+                con:a.textarea,
+                chapters:JSON.stringify(b),
+                tid:typeId,
+                tName:typeName,
+                // message:JSON.stringify([d,[newData1,c.tableData2]]),
+                mon:JSON.stringify(this.projectApplicationApply3),//预算经费,
+
+                tel:a.select.tel,
                 MultiSelectProjectNameS:JSON.stringify(a.select.MultiSelectProjectNameS),
                 schoolRemould:a.select.schoolRemould,
                 person:a.select.projectApplyPerson,
-                student:JSON.stringify(a.tableStudentData),
-                teacher:JSON.stringify(a.tableTeacherData)
               }
-              return console.log(param);
+              // return console.log(param);
                 this.ajax
-                      .post(this.$store.state.api+'/CreateProject',param)
+                      .post(this.$store.state.api+'/InsertProjectMakerSpace',param)
                       .then(res=>{
                         console.log(res)
                         if(res.data==1){