#

src/views/projectApply/projectApplication.vue

@@ -121,8 +121,8 @@
             <div>
               <!-- <span v-show="scope.row.typeid==options.sort[0].typeid">学生</span> -->
               <!-- <span v-show="scope.row.typeid==options.sort[1].typeid">特色</span> -->
-              <span v-show="scope.row.typeid==options.sort[1].typeid">{{ scope.row.sort==0?'已建设':'待建设' }}</span>
-              <span v-show="scope.row.typeid==options.sort[0].typeid">{{ scope.row.sort==0?'创意组':'初创组' }}</span>
+              <!-- <span v-show="scope.row.typeid==options.sort[1].typeid">{{ scope.row.sort==0?'已建设':'待建设' }}</span> -->
+              <!-- <span v-show="scope.row.typeid==options.sort[0].typeid">{{ scope.row.sort==0?'创意组':'初创组' }}</span> -->
             </div>
           </template>
         </el-table-column>
@@ -133,7 +133,7 @@
           min-width="8%">
         </el-table-column>
         <el-table-column
-          prop="time[0]"
+          prop="startTime"
           align="center"
           label="开始时间"
           min-width="11%">
@@ -145,7 +145,7 @@
           min-width="10%">
           <template #default="scope">
             <div>
-              {{ scope.row.phone!=null?scope.row.phone:"无" }}
+              {{ scope.row.phone!=null?scope.row.phone:"-" }}
             </div>
           </template>
         </el-table-column>
@@ -511,13 +511,13 @@ import downloadFile from '@/components/tool/downloadFile.js';
                 a.sort=data[3];
                 a.person=data[4];
                 this.table.total=data[5][0].total
-                this.tableData.forEach(item=>{
-                  if(item['time']!=null&&item['time']!=''){
-                    item['time']=JSON.parse(item['time'])
-                  }else{
-                    item['time'] = []
-                  }
-                })
+                // this.tableData.forEach(item=>{
+                //   if(item['time']!=null&&item['time']!=''){
+                //     item['time']=JSON.parse(item['time'])
+                //   }else{
+                //     item['time'] = []
+                //   }
+                // })
                 this.loading = false;
 
                 // console.log(this.tableData)

src/views/projectApply/projectApplicationApplyMain.vue

@@ -126,6 +126,8 @@
                 studentTeam:"",//学生创客团队（人才）培养预期成果、数量
                 studentActivities:"",//学生创客活动组织实施情况
                 Transforming:"",//学生创客团队孵化、转化创业项目情况
+                condition:"",//立 项基 础及条 件
+
             },
 
             projectApplicationApply1:{   //立项基础信息页面
@@ -525,7 +527,8 @@
                 uid:this.$store.state.userInfo.userid,//用户ID,
                 title:this.MakerSpace.select.projectName,//项目名称
                 pro_leader:this.MakerSpace.select.person,//项目负责人
-                projectTime:JSON.stringify(this.MakerSpace.select.Data),//项目时间
+                startTime:this.MakerSpace.select.Data[0],//项目开始时间
+                endTime:this.MakerSpace.select.Data[1],//项目结束时间
                 classid:this.MakerSpace.select.value,//部门ID
                 fund:this.MakerSpace.select.fund,//预算总经费
                 lead_leader:this.MakerSpace.select.leader,//学院牵头领导
@@ -545,9 +548,12 @@
                   case 'pro_leader':
                     if(cEmpty.test(param[i]))return this.$message.error("项目负责人不能为空")
                     break;
-                  case 'projectTime':
-                    if(JSON.parse(param[i]).length<=1)return this.$message.error("请选择项目开始时间和计划完成时间")
+                  case 'startTime':
+                    if(cEmpty.test(param[i]))return this.$message.error("请选择项目开始时间")
                     break;
+                  case 'endTime':
+                    if(cEmpty.test(param[i]))return this.$message.error("请选择项目计划结束时间")
+                    break
                   case 'classid':
                     if(cEmpty.test(param[i]))return this.$message.error("请选择项目所属部门")
                     break;

src/views/projectApply/projectApplicationApplyMakerSpace2.vue

@@ -6,7 +6,11 @@
             <div class="qiu"></div>
           </div>
           <div class="leftTits">
-            <div @click="toPage(1)">项目创新点</div>
+            <div @click="toPage(1)" style="position: relative;right: 5px;">
+              <el-tooltip class="item" effect="light" content="项目建设内容及目标" placement="bottom-start">
+                <p>项目建设内容及目标</p>
+              </el-tooltip>
+            </div>
             <div @click="toPage(2)" style="position: relative;right: 5px;">
               <el-tooltip class="item" effect="light" content="预期取得的成果" placement="bottom-start">
                 <p>预期取得的成果</p>
@@ -77,6 +81,15 @@
                 </div>
               </div>
             </div>
+            <div id="z">
+              <p class="pTit">立项基础及条件</p>
+              <div>
+                <p class="pTit2">一、基础条件<span>（物理环境/设备设施/项目实施/活动开展/技术力量/社会资源）</span></p>
+                <div class="editor">
+                  <vue-editor  :editorToolbar="customToolbar" v-model="data.condition"></vue-editor>
+                </div>
+              </div>
+            </div>
             <div id="r" class="baseBtn">
               <div class="blockWidth">
                 <el-button type="primary" class="backBtn" @click="backBtn1" size:small>上一步</el-button>