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

src/views/activityManage/makerActvity.vue

@@ -464,9 +464,7 @@ import downloadFile from '@/components/tool/downloadFile.js';
             page:this.Page.nowPage,
             lim:this.Page.lim,
           }).then(res=>{
-            console.log(res.data)
             let data = res.data;
-            // console.log(data);
             if(data[0].length==0&&data[4][0]['total']!=0){
               this.Page.nowPage = 1;
               this.getData(); 

src/views/activityManage/makerActvityApply.vue

@@ -70,13 +70,7 @@
                       <div class="selectRight">
                         <div class="inpBlock">
                               <div class="label">活动时间</div>
-                              <!-- <el-date-picker
-                                v-model="data.select.time"
-                                type="datetime"
-                                value-format="yyyy-MM-dd HH:mm:ss"
-                                style="width: 100%;"
-                                placeholder="选择日期">
-                              </el-date-picker> -->
+    
                               <el-date-picker
                                 v-model="data.select.time"
                                 type="daterange"
@@ -361,5 +355,10 @@
     justify-content: center;
   }
 }
+.littleBlock{
+  .dialogLabel{
+    width: 15% !important;
+  }
+}
 
   </style>

src/views/activityManage/makerActvityApplyMain.vue

@@ -161,6 +161,7 @@ import makerActvityApply2 from './makerActvityApply2.vue';
                 uid:this.$store.state.userInfo.userid,
                 projectid:pid
               }).then(res=>{
+                console.log(res.data)
                 let PMoney = res.data[0][0]['PMoney'];
                 let AMoney = res.data[1][0]["AMoney"];
                 if(PMoney<(AMoney+aMoney)){

src/views/activityManage/makerActvityDetails.vue

@@ -563,7 +563,8 @@ export default {
         this.ajax.get(this.$store.state.api+"/GetAllProjectName",{
             uid:this.$store.state.userInfo.userid,
         }).then(res=>{
-          this.selectInput.project = res.data[0].filter(item=>item.endProject==0);
+          console.log(res)
+          this.selectInput.project = res.data[0].filter(item=>(item.courseId==this.tableData.pid||item.endProject==0));
           this.loading = false
         }).catch(err=>{
             this.$message.error(err.message)
@@ -584,6 +585,7 @@ export default {
         this.tableData = data;
         this.oldMoney += Number(this.tableData.money)
         this.getProject();
+        console.log(this.tableData)
         this.loading = false;
       }).catch(err=>{
         this.$message.error(err.message)

src/views/projectApply/projectApplicationApplyMakerSpace.vue

@@ -404,7 +404,6 @@
 </template>
 
 <script>
-    import { Dropdown } from "element-ui";
 import BeUpload from "../../components/tool/beUpload.vue";
     export default { 
       props:["data","next",'back','addPerson'],

src/views/projectApply/projectApplicationApplyMakerSpace2.vue

@@ -13,15 +13,20 @@
             </div>
             <div @click="toPage(2)" style="position: relative;right: 5px;">
               <el-tooltip class="item" effect="light" content="预期取得的成果" placement="bottom-start">
-                <p>预期取得的成果</p>
+                <p>预项目建设论证报告</p>
+              </el-tooltip>
+            </div>
+            <div @click="toPage(3)">预期成果</div>
+            <div @click="toPage(5)" style="position: relative;right: 5px;">
+              <el-tooltip class="item" effect="light" content="立项基础及条件" placement="bottom-start">
+                <p>立项基础及条件</p>
               </el-tooltip>
             </div>
-            <div @click="toPage(3)">实施计划</div>
             <div @click="toPage(4)">下一步</div>
           </div>
         </div>
         <div class="right">
-            <div id="q" class="vfpHeader">
+            <div id="l" class="vfpHeader">
               <div class="titleOne">项目立项申请</div>
               <el-button @click="backBtn1" type="primary" size="mini">返回</el-button>
             </div>
@@ -35,7 +40,7 @@
                 </div>
               </div>
             </div>
-            <div>
+            <div id="a">
               <p class="pTit">预项目建设论证报告</p>
               <div>
                 <p class="pTit2">一、立项依据<span> （说明本项目的目的、意义以及国内外高校现状、市场预测和发展趋势，预期达到的目标，研究的预期效果分析，成果受益面）</span></p>
@@ -81,7 +86,7 @@
                 </div>
               </div>
             </div>
-            <div id="z">
+            <div id="p">
               <p class="pTit">立项基础及条件</p>
               <div>
                 <p class="pTit2">一、基础条件<span>（物理环境/设备设施/项目实施/活动开展/技术力量/社会资源）</span></p>
@@ -126,13 +131,15 @@
           },
           toPage(val){
             if (val==1) {
-              document.getElementById("q").scrollIntoView({ behavior: "smooth" });
-            }else if(val==2){
               document.getElementById("w").scrollIntoView({ behavior: "smooth" });
+            }else if(val==2){
+              document.getElementById("a").scrollIntoView({ behavior: "smooth" });
             }else if(val==3){
-              document.getElementById("e").scrollIntoView({ behavior: "smooth" });
+              document.getElementById("q").scrollIntoView({ behavior: "smooth" });
             }else if(val==4){
               document.getElementById("r").scrollIntoView({ behavior: "smooth" });
+            }else if(val==5){
+              document.getElementById("p").scrollIntoView({ behavior:"smooth"})
             }
           }
         }

src/views/projectManage/ProjectManagement.vue

@@ -110,7 +110,7 @@
         <div class="classBlock1">
             <div class="classBlock2">{{ item.title }}</div>
             <div class="classBlock3">
-              <div><span style="color: #000;">创建日期:</span>{{ item.time }}</div>
+              <div><span style="color: #000;">创建日期:</span>{{ item.createTime }}</div>
             </div>
             <div class="classBlock3">
               <div><span style="color: #000;">修改日期:</span>{{ item.updateTime}}</div>