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

src/views/projectApply/projectApplicationApply.vue

@@ -33,23 +33,32 @@
                     </div>
                     <div class="selectMid">
                       <div class="selectLeft">
-                          
-
                           <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>
-                              <el-select v-model="data.select.value" style="width: 100%;" placeholder="请选择">
+                              <el-select v-model="data.select.department" style="width: 100%;" placeholder="请选择">
                                 <el-option
-                                  v-for="item in data.options"
+                                  v-for="item in data.departmentOptions"
                                   :key="item.id"
                                   :label="item.name"
                                   :value="item.id">
                                 </el-option>
                               </el-select>
                           </div>
+                          <div class="inpBlock">
+                              <div class="label" style="width: 50px;font-size: 14px;position: relative;top: -8px;">优先支持项目(可多选)</div>
+                              <el-select style="width: 100%;" v-model="data.select.MultiSelectProjectNameS" multiple placeholder="请选择">
+                                <el-option
+                                  v-for="item in data.MultiSelectProject"
+                                  :key="item.value"
+                                  :label="item.label"
+                                  :value="item.value">
+                                </el-option>
+                              </el-select>
+                          </div>
                           <div class="inpBlock">
                               <div class="label">联系电话</div>
                               <el-input type="number" v-model="data.select.tel"  @blur="getText(data.select.tel)" placeholder="请输入联系方式"></el-input>
@@ -61,12 +70,20 @@
                       <div class="selectRight">
                         <div class="inpBlock">
                               <div class="label">项目开始时间</div>
-                              <el-date-picker
+                              <!-- <el-date-picker
                                 v-model="data.select.value1"
                                 type="datetime"
                                 style="width: 100%;"
                                 value-format="yyyy-MM-dd HH:mm:ss"
                                 placeholder="选择日期">
+                              </el-date-picker> -->
+                              <el-date-picker
+                                v-model="data.select.projectDate"
+                                type="datetimerange"
+                                value-format="yyyy-MM-dd HH:mm:ss"
+                                start-placeholder="开始日期"
+                                end-placeholder="结束日期"
+                                >
                               </el-date-picker>
                           </div>
                           <div class="inpBlock" style="position: relative;">
@@ -74,6 +91,28 @@
                               <el-input type="number"  v-model="data.select.fund" placeholder="请输入内容"></el-input>
                               <div style="position: absolute;right: -30px;top: 10px;">(万)</div>
                           </div>
+                          <div class="inpBlock">
+                              <div class="label" style="font-size: 14px;max-width: 50px;position: relative;top: -8px;">美丽校园改造项目(特色项目)</div>
+                              <el-select v-model="data.select.schoolRemould" style="width: 100%;" placeholder="请选择">
+                                <el-option
+                                  v-for="item in data.schoolRemouldOptions"
+                                  :key="item.value"
+                                  :label="item.label"
+                                  :value="item.value">
+                                </el-option>
+                              </el-select>
+                          </div>
+                          <div class="inpBlock">
+                              <div class="label">项目申请人</div>
+                              <el-select v-model="data.select.value" style="width: 100%;" placeholder="请选择">
+                                <el-option
+                                  v-for="item in data.personType"
+                                  :key="item.value"
+                                  :label="item.label"
+                                  :value="item.value">
+                                </el-option>
+                              </el-select>
+                          </div>
                           <!-- <div class="inpBlock">
                               <div class="label">选择分类</div>
                               <el-cascader v-model="data.select.sort" :options="data.sortOptions" clearable></el-cascader>

src/views/projectApply/projectApplicationApplyMain.vue

@@ -23,8 +23,10 @@
       <div class="Main_area">
         <!-- 学生创客项目 5e21b204-c206-11ed-a4cd-509a4c5b67cf -->
         <!-- 特色创客空间建设项目 5f7a66d5-c206-11ed-a4cd-509a4c5b67cf -->
-        <projectApplicationApply :data="projectApplicationApply1" :next="next"  :back="back" v-if="status==0 && pageType[0]=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"/>
-        <projectApplicationApplyMakerSpace :data="MakerSpace" :next="next"  :back="back" v-if="status==0 && pageType[0]=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/>
+        <projectApplicationApply :data="projectApplicationApply1" :next="next"  :back="back" v-if="status==0"/>
+
+        <!-- <projectApplicationApply :data="projectApplicationApply1" :next="next"  :back="back" v-if="status==0 && pageType[0]=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"/> -->
+        <!-- <projectApplicationApplyMakerSpace :data="MakerSpace" :next="next"  :back="back" v-if="status==0 && pageType[0]=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/> -->
 
         <projectApplicationApply2 :data="projectApplicationApply2" :next="next" :back="back" v-if="status==1"/>
         <projectApplicationApply3 :data="projectApplicationApply3" :confirmSetFund="confirmSetFund" :data2="projectApplicationApply1" :next="next" :back="back" :submitBtn="submitBtn" v-show="status==2"/> 
@@ -89,8 +91,8 @@
         },
         data() {
           return {
-            selectType:true,     //选择分类对话框
-            pageType:['5f7a66d5-c206-11ed-a4cd-509a4c5b67cf',0],         //判断页面显示分类   学生创客项目    学院特色创客空间   
+            selectType:false,     //选择分类对话框
+            pageType:[],         //判断页面显示分类   学生创客项目    学院特色创客空间   
             status:0,   //判断顶部导航跳转
             submitHint:false,   //提交按钮
 
@@ -122,7 +124,8 @@
                 contentFive:'',
             },
 
-            projectApplicationApply1:{   //立项基础信息页面
+            //创客空间建设项目立项申报数据
+            MakerSpace:{
               amendMemberDialog:false,  //修改人员对话框显示判断
                 dialogImageUrl:"",  //封面
                 telVerify:true,
@@ -135,9 +138,85 @@
                   fund:'',
                   tel:'',
                   value1:"",
-                  sort:[] //["dawjiawdjaw",0]
                 },
                 options: [],  //部门下拉框
+                textarea:'',   //项目简介
+                Member:{    //添加成员
+                    name:'',
+                    class:'',
+                    phone:'',
+                    score:'0'
+                },
+                tableData:[ //成员列表
+                ]
+            },
+            //创客空间建设项目立项申报项目内容数据
+            MakerSpace2:{
+                contentOne:'',
+                contentTwo:'',
+                contentThree:'',
+                contentFour:'',
+                contentFive:'',
+            },
+
+            projectApplicationApply1:{   //立项基础信息页面
+              amendMemberDialog:false,  //修改人员对话框显示判断
+                dialogImageUrl:"",  //封面
+                telVerify:true,    //判断基础信息里联系电话
+                telVerify2:true,  //添加修改成员电话判断
+                MultiSelectProject:[   //优先支持项目下拉框数据
+                    {
+                      value: '1',
+                      label: '大赛选拔项目'
+                    }, {
+                      value: '2',
+                      label: '落地注册项目'
+                    }, {
+                      value: '3',
+                      label: '社会征集项目'
+                    }, {
+                      value: '4',
+                      label: '产业命题项目'
+                    }
+                ],
+                schoolRemouldOptions:[   //美丽校园下拉框数据
+                    {
+                      value: '1',
+                      label: '校园安全项目'
+                    }, {
+                      value: '2',
+                      label: '环境治理项目'
+                    }, {
+                      value: '3',
+                      label: '校园服务项目'
+                    }, {
+                      value: '4',
+                      label: '文创装置项目'
+                    }
+                ],
+                personType:[
+                    {
+                      value: '1',
+                      label: '在校学生'
+                    }, {
+                      value: '2',
+                      label: '入驻学校孵化基地的初创企业法人'
+                    }
+                ],
+                select:{    //提交后端的基本信息数据框
+                  projectName:'',     //项目名称
+                  leader:'', 
+                  projectDate:'',   //开始结束日期
+                  department:"",   //部门
+                  fund:'',         //资金
+                  MultiSelectProjectNameS:[],   //优先支持项目
+                  schoolRemould:'',        //校园改造项目
+                  tel:'',  //电话
+                  value1:"",
+                  projectApplyPerson:'',  //项目申请人
+                  sort:[] //["dawjiawdjaw",0]   
+                },
+                departmentOptions: [],  //部门下拉框
                 // sortOptions: [], //分类下拉框
                 sortOptions: [
                     {
@@ -170,8 +249,8 @@
                     phone:'',
                     score:'0'
                 },
-                tableData:[ //成员列表
-                ], 
+                tableData:[],  //成员列表
+
             },
             projectApplicationApply2:{  //项目内容页面
                   contentOne:'',