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

src/views/projectApply/projectApplication.vue

@@ -119,10 +119,10 @@
           min-width="10%">
           <template #default="scope">
             <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-if="scope.row.typeid=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'">{{ scope.row.sort==0?'已建设':'待建设' }}</span>
+              <!-- 学生创客项目 -->
+              <span v-if="scope.row.typeid=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'">{{ 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==''?scope.row.phone:"-" }}
             </div>
           </template>
         </el-table-column>
@@ -267,30 +267,30 @@
         
           <div class="diaTit">
               <div class="addDialogLogo">LOGO</div>
-              <div class="spans">项目名称</div>
-              <div class="spanCon">:{{ auditDialog.projectName }}</div>
-              <div class="spans" style="margin-left: 30px;">项目负责人</div>
-              <div class="spanCon">:{{ auditDialog.person }}</div>
+              <div class="spans">项目名称：</div>
+              <div class="spanCon">{{ auditDialog.projectName }}</div>
+              <div class="spans">项目负责人：</div>
+              <div class="spanCon">{{ auditDialog.person }}</div>
           </div>
 
             <div class="diaTit1">
               <div class="spans1">所在部门</div>
               <div>
-                <el-input v-model="auditDialog.department" placeholder="信通学院"></el-input>
+                <el-input disabled v-model="auditDialog.department" placeholder="所在部门"></el-input>
               </div>
             </div>
 
             <div class="diaTit1">
               <div class="spans1">预算总经费</div>
               <div>
-                <el-input v-model="auditDialog.fund" placeholder="6000"></el-input>
+                <el-input disabled v-model="auditDialog.fund" placeholder="预算总经费"></el-input>
               </div>
             </div>
 
             <div class="diaTit1">
               <div class="spans1">联系电话</div>
               <div>
-                <el-input v-model="auditDialog.tel" placeholder="13854449525"></el-input>
+                <el-input disabled v-model="auditDialog.tel" placeholder="联系电话"></el-input>
               </div>
             </div>
             <div slot="footer" class="dialog-footer">
@@ -403,8 +403,8 @@ import downloadFile from '@/components/tool/downloadFile.js';
             this.auditDialog.projectName=val.title;
             this.auditDialog.person=val.pro_leader;
             this.auditDialog.department=val.name;
-            this.auditDialog.fund=val.money;
-            this.auditDialog.tel=val.phone;
+            this.auditDialog.fund=val.fund;
+            this.auditDialog.tel=val.phone || '-';
           }
             
             
@@ -496,14 +496,11 @@ import downloadFile from '@/components/tool/downloadFile.js';
           this.ajax    
             .get(this.$store.state.api+'/SelectAllProject',param)
               .then(res=>{
-                console.log(res);
-                // this.loading = false;
                 let data=res.data;
                 if (data[0].length==0 && data[5][0]['total'] != 0) {
                   this.table.currentPage=1
                   return this.getData()
                 }
-                console.log(data);
                 let a=this.options;
                 this.tableData=data[0];
                 a.projectFilter=data[1];
@@ -511,13 +508,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)
@@ -701,9 +698,9 @@ import downloadFile from '@/components/tool/downloadFile.js';
             width: 100%;
             display: flex;
             .spans{
-              width: 84px;
+              width: auto;
               font-size: 16px;
-              margin-right: 10px;
+              // margin-right: 10px;
               display: inline-block;
               text-align: justify;
               color: #000;

src/views/projectApply/projectApplicationApplyMain.vue

@@ -128,6 +128,8 @@
                 studentTeam:"",//学生创客团队（人才）培养预期成果、数量
                 studentActivities:"",//学生创客活动组织实施情况
                 Transforming:"",//学生创客团队孵化、转化创业项目情况
+                condition:"",//立 项基 础及条 件
+
             },
 
             projectApplicationApply1:{   //立项基础信息页面
@@ -529,7 +531,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,//学院牵头领导
@@ -549,9 +552,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>