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

src/views/projectManage/ProjectManagementFund2.vue

@@ -1,245 +0,0 @@
-<template>
-  <!-- 项目管理 资金申报明细 -->
-    <div class="ProjectManagementFund2" v-loading="loading">
-        <div class="vfpHeader">
-            <div class="titleOne">预算经费</div>
-            <el-button type="primary" @click="$router.push('/ProjectManagement')">返回</el-button>
-        </div>
-          <hr>
-         <!-- 跳转导航开始 -->
-         <div class="AppBar">
-              <div @click="content">项目资金使用详情</div>
-              <div @click="remark" class="AppBarActive">
-                资金申报明细
-                <div class='pr1TitBass'></div>
-              </div>
-          </div>
-          <!-- 跳转导航结束 -->
-              
-
-      <!-- 表格开始 -->
-      <el-table
-        ref="multipleTable"
-        :data="tableData"
-        tooltip-effect="dark"
-        stripe
-        class="fontSize"
-        :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
-        >
-        
-        <el-table-column
-          prop="title"
-          align="center"
-          label="活动名称"
-          >
-        </el-table-column>
-        <el-table-column
-          prop="pro_leader"
-          align="center"
-          label="负责人"
-          >
-        </el-table-column>
-        <el-table-column
-          prop="type"
-          align="center"
-
-          label="项目类型"
-          >
-        </el-table-column>
-        <el-table-column
-          prop="fund"
-          align="center"
-          label="申请经费(元)"
-          >
-        </el-table-column>
-        <el-table-column
-          prop="name"
-          align="center"
-          label="所在部门"
-          >
-        </el-table-column>
-
-        <el-table-column
-          prop="dateTime"
-          align="center"
-          label="申请时间"
-         >
-        </el-table-column>
-      </el-table>
-      <!-- 表格结束 -->
-
-
-        <el-pagination
-        background
-        class="paginations"
-        layout="prev, pager, next"
-        :total="1">
-        </el-pagination>
-
-  </div>
-  </template>
-  
-  <script>
-      export default {
-        data() {
-          return {
-            tableData:[],
-            loading:false,
-          }
-        },
-        methods:{
-          content(){
-            this.$router.push(`/ProjectManagementFund1?pid=${this.$route.query['pid']}`)
-          },
-          remark(){
-            this.$router.push(`/ProjectManagementFund2?pid=${this.$route.query['pid']}`)
-          },
-          getData(){
-            this.loading = true;
-            let param={
-              uid:this.$store.state.userInfo.userid,
-              cid:this.$route.query['pid']
-            }
-            // console.log(param);
-            // return
-            this.ajax
-                .get(this.$store.state.api+'/SelectFundDetail',param)
-                .then(res=>{
-                    console.log(res.data[0]);
-                    this.tableData=res.data[0]
-                    this.loading = false;
-                },err=>{
-                    console.log(err);
-                })
-          },
-        },
-        mounted(){
-          this.getData()
-        }
-      }
-  </script>
-  
-  <style lang="less">
-  .ProjectManagementFund2{
- 
-     .right{
-      width: 100%;
-     }
-    .pmFund1Footer{   //分页
-       display: flex;
-       justify-content: flex-end;
-       margin: 20px 50px 0 0;
-    }
-
-
-  .projectApplicationfundAddDialog2{
-
-
-    .el-header {
-      background-color: #3d67bc;
-      color: #333;
-      text-align: center;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-    }
-    .el-select-dropdown__item{
-      text-align: left;
-    }
-    .el-dialog__title{
-      color:#fff;
-        display: flex;
-        justify-content: center;
-        font-size: 18px;
-        position: relative;
-        top: -2px;
-    }
-    font-size: 16px !important;
-    .el-dialog__header{
-      display: flex;
-      font-weight: bold;
-      justify-content: flex-start;
-    }
-    .el-dialog__body{
-      padding-top: 0px;
-    }
-    .dagSpan{
-      min-width: 65px;
-      max-width: 65px;
-      display: flex;
-      justify-content:flex-end;
-      margin-right: 9px;
-      align-items: center;
-      font-size: 16px;
-    }
-    .deleteContent1{
-      width: 55%;
-      margin-bottom: 10px;
-      display: flex;
-    }
-
-    .dagRemark{
-      display: flex;
-      margin: 20px 0px;
-      font-size: 16px;
-      font-weight: 550;
-    }
-    .dagInpS{
-      // width: 100%;
-      display: flex;
-      font-size: 16px;
-
-      justify-content: space-between;
-      .dagInpS1{
-        display: flex;
-        min-width: 23%;
-        max-width: 23%;
-        font-size: 16px;
-
-      }
-      .dagInpS1:nth-child(1){
-        min-width: 30%;
-        max-width: 30%;
-        .dagSpan{
-          font-size: 16px;
-          display: inline-block;
-          text-align: justify;
-          text-justify:distribute-all-lines;
-          text-align-last: justify;
-          transform: translate(0,22%);
-        }
-      }
-      .dagInpSf1:nth-child(n+2) .dagSpan{
-        font-size: 16px;
-        min-width: 50px;
-        max-width: 50px;
-
-      }
-    }
-    .dagInpS2{
-        margin:20px 0 20px 0;
-        display: flex;
-        font-size: 16px;
-
-        .dagSpan2{
-          font-size: 16px;
-
-          max-width: 65px;
-          min-width: 65px;
-          margin-right: 10px;
-          // text-align: right;
-          display: inline-block;
-          text-align: justify;
-          text-justify:distribute-all-lines;
-          text-align-last: justify;
-        }
-    }
-  }
-
-  .newWidth{
-    width: 150px;
-  }
-
-
-  }
-  </style>

src/views/projectManage/ProjectManagementFundDetail.vue

@@ -13,6 +13,7 @@
           </div>
           <div id="ShowArea">
             <fundDetail v-if="state==0"/>
+            <FundDetailList v-if="state==1"/>
           </div>
 
          
@@ -21,8 +22,9 @@
 
 <script>
 import fundDetail from './components/FundDetail.vue'
+import FundDetailList from './components/FundDetailList.vue'
     export default {
-      components:{fundDetail},
+      components:{fundDetail,FundDetailList},
       data() {
         return {
           state:0,

src/views/projectManage/ProjectManagementMain.vue

@@ -3,7 +3,7 @@
         <div class="vfpHeader">
             <div class="titleOne">项目管理</div>
             <div class="smallTitle" style="left: 100px;">项目进展详情</div>
-            <el-button type="primary" @click="$router.back()">返回</el-button>
+            <el-button type="primary" @click="$router.push('/ProjectManagement')">返回</el-button>
         </div>
         <hr>
 
@@ -19,22 +19,19 @@
         <!-- 特色创客空间建设 -->
         <MakerSpaceWordShow v-if="show==0 && this.$route.query['Id']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/>
         <!-- 活动开展 -->
-        <ProjectManagement3 :changeShow="goto" v-if="show==1"></ProjectManagement3>
+        <ProjectManagementActivity :changeShow="goto" v-if="show==1"/>
         <!-- 活动开展详细 -->
-        <!-- <ProjectManagement3_1 v-if="show==5"/> -->
-        <!-- 项目附件 -->
-        <!-- <ProjectManagement4 v-if="show==2"></ProjectManagement4> -->
+        <ProjectManagementActivityDetail v-if="show==5"/>
         <!-- 项目结题文件 -->
-        <ProjectManagement5 v-if="show==2"></ProjectManagement5>
+        <ProjectManagementEndProjectFile v-if="show==2"/>
     </div>
 </template>
 
 <script>
 
-    import ProjectManagement3 from './components/ProjectManagement3.vue'
-    // import ProjectManagement3_1 from './components/ProjectManagement3_1.vue'
-    // import ProjectManagement4 from './components/ProjectManagement4.vue'
-    import ProjectManagement5 from './components/ProjectManagement5.vue'
+    import ProjectManagementActivity from './components/ProjectManagementActivity.vue'
+    import ProjectManagementActivityDetail from './components/ProjectManagementActivityDetail.vue'
+    import ProjectManagementEndProjectFile from './components/ProjectManagementEndProjectFile.vue'
 
     // //特色创客空间建设
     import MakerSpaceWordShow from './components/MakerSpaceWordShow.vue'
@@ -43,24 +40,17 @@
     export default {
         components:{
             MakerSpaceWordShow,
-            // ProjectManagement1,
-            // ProjectManagement2,
-            ProjectManagement3,
-            // ProjectManagement3_1,
-            // ProjectManagement4,
-            ProjectManagement5,
+            ProjectManagementActivity,
+            ProjectManagementActivityDetail,
+            ProjectManagementEndProjectFile,
             studentProjectWordShow,
-            // ProjectManagement1_MakerSpace,
-            // ProjectManagement2_MakerSpace,
         },
         data() {
             return {
                 show:0,
                 items:[
                     {tit:'项目详细',cl:'pr1TitBass'},
-                    // {tit:'项目详情',cl:'pr1TitBass'},
                     {tit:'活动开展',cl:'pr1TitBass'},
-                    // {tit:'项目附件',cl:'pr1TitBass'},
                     {tit:'项目结题附件',cl:'pr1TitBass'},
                 ]
             }

src/views/projectManage/components/FundDetailList.vue

@@ -0,0 +1,253 @@
+<template>
+  <!-- 项目管理 资金申报明细 -->
+    <div class="FundDetailList" v-loading="loading">
+      <!-- 表格开始 -->
+      <el-table
+        ref="multipleTable"
+        :data="tableData"
+        tooltip-effect="dark"
+        stripe
+        class="fontSize"
+        :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
+        >
+        <el-table-column
+          prop="fundNo"
+          align="center"
+          label="资金编号"
+          >
+        </el-table-column>
+        <el-table-column
+          prop="title"
+          align="center"
+          label="活动名称"
+          >
+        </el-table-column>
+        <el-table-column
+          prop="pro_leader"
+          align="center"
+          label="负责人"
+          >
+        </el-table-column>
+        <el-table-column
+          prop="name"
+          align="center"
+          label="所在部门"
+          >
+        </el-table-column>
+        <el-table-column
+          prop="apply"
+          align="center"
+          label="申请经费(元)"
+          >
+        </el-table-column>
+        <el-table-column
+          prop="isUser"
+          align="center"
+          label="实际使用(元)"
+          >
+        </el-table-column>
+        <el-table-column
+          prop="create_at"
+          align="center"
+          label="申请时间"
+         >
+        </el-table-column>
+        <el-table-column
+          prop="state"
+          align="center"
+          label="资金状态"
+         >
+         <template #default="scope">
+          <div>
+            {{ scope.row.state==0?'未审核':""}}
+            {{ scope.row.state==1?'未报销':""}}
+            {{ scope.row.state==2?'已报销':""}}
+          </div>
+         </template>
+        </el-table-column>
+      </el-table>
+      <!-- 表格结束 -->
+
+
+      <el-pagination
+      @current-change="handleCurrentChange"
+      :current-page="PageData.currentPage"
+      :page-size="PageData.packageSize"
+      layout=" prev, pager, next"
+      background
+      class="paginations"
+      :total="PageData.total">
+    </el-pagination>
+  </div>
+  </template>
+  
+  <script>
+      export default {
+        data() {
+          return {
+            tableData:[],
+            loading:false,
+            PageData:{         // 分页数据
+              total:0,
+              packageSize:5,
+              currentPage:1
+            }, 
+          }
+        },
+        methods:{
+          handleCurrentChange(val) {   //当页数发生改变的时候调用获取列表数据请求
+            this.PageData.currentPage=val
+            this.getData()
+          },
+          getData(){
+            this.loading = true;
+            let param={
+              uid:this.$store.state.userInfo.userid,
+              cid:this.$route.query['pid'],
+              nowPage:this.PageData.currentPage,
+              lim:this.PageData.packageSize,
+            }
+            this.ajax
+                .get(this.$store.state.api+'/getProjectActivityAllFund',param)
+                .then(res=>{
+                  let data = res['data'][0];
+                  console.log(data)
+                  this.tableData = data;
+                  this.PageData.total = res['data'][1][0]['total']
+                  //后面还有申请经费和实际使用的计算
+                  this.loading = false;
+                },err=>{
+                    console.log(err);
+                })
+          },
+        },
+        mounted(){
+          this.getData();
+        }
+      }
+  </script>
+  
+  <style lang="less">
+  .FundDetailList{
+ 
+     .right{
+      width: 100%;
+     }
+    .pmFund1Footer{   //分页
+       display: flex;
+       justify-content: flex-end;
+       margin: 20px 50px 0 0;
+    }
+
+
+  // .projectApplicationfundAddDialog2{
+
+
+  //   .el-header {
+  //     background-color: #3d67bc;
+  //     color: #333;
+  //     text-align: center;
+  //     display: flex;
+  //     justify-content: space-between;
+  //     align-items: center;
+  //   }
+  //   .el-select-dropdown__item{
+  //     text-align: left;
+  //   }
+  //   .el-dialog__title{
+  //     color:#fff;
+  //       display: flex;
+  //       justify-content: center;
+  //       font-size: 18px;
+  //       position: relative;
+  //       top: -2px;
+  //   }
+  //   font-size: 16px !important;
+  //   .el-dialog__header{
+  //     display: flex;
+  //     font-weight: bold;
+  //     justify-content: flex-start;
+  //   }
+  //   .el-dialog__body{
+  //     padding-top: 0px;
+  //   }
+  //   .dagSpan{
+  //     min-width: 65px;
+  //     max-width: 65px;
+  //     display: flex;
+  //     justify-content:flex-end;
+  //     margin-right: 9px;
+  //     align-items: center;
+  //     font-size: 16px;
+  //   }
+  //   .deleteContent1{
+  //     width: 55%;
+  //     margin-bottom: 10px;
+  //     display: flex;
+  //   }
+
+  //   .dagRemark{
+  //     display: flex;
+  //     margin: 20px 0px;
+  //     font-size: 16px;
+  //     font-weight: 550;
+  //   }
+  //   .dagInpS{
+  //     // width: 100%;
+  //     display: flex;
+  //     font-size: 16px;
+
+  //     justify-content: space-between;
+  //     .dagInpS1{
+  //       display: flex;
+  //       min-width: 23%;
+  //       max-width: 23%;
+  //       font-size: 16px;
+
+  //     }
+  //     .dagInpS1:nth-child(1){
+  //       min-width: 30%;
+  //       max-width: 30%;
+  //       .dagSpan{
+  //         font-size: 16px;
+  //         display: inline-block;
+  //         text-align: justify;
+  //         text-justify:distribute-all-lines;
+  //         text-align-last: justify;
+  //         transform: translate(0,22%);
+  //       }
+  //     }
+  //     .dagInpSf1:nth-child(n+2) .dagSpan{
+  //       font-size: 16px;
+  //       min-width: 50px;
+  //       max-width: 50px;
+
+  //     }
+  //   }
+  //   .dagInpS2{
+  //       margin:20px 0 20px 0;
+  //       display: flex;
+  //       font-size: 16px;
+
+  //       .dagSpan2{
+  //         font-size: 16px;
+
+  //         max-width: 65px;
+  //         min-width: 65px;
+  //         margin-right: 10px;
+  //         // text-align: right;
+  //         display: inline-block;
+  //         text-align: justify;
+  //         text-justify:distribute-all-lines;
+  //         text-align-last: justify;
+  //       }
+  //   }
+  // }
+
+  .newWidth{
+    width: 150px;
+  }
+
+
+  }
+  </style>

src/views/projectManage/components/ProjectManagement3.vue → src/views/projectManage/components/ProjectManagementActivity.vue

@@ -136,7 +136,6 @@
             this.ajax
                   .get(this.$store.state.api+'/GetAllActivity',param)
                   .then(res=>{
-                    console.log(res)
                     this.tableData=res.data[0]
                     this.table.total=res.data[4][0].total
                     this.loading = false;

src/views/projectManage/components/ProjectManagement5.vue → src/views/projectManage/components/ProjectManagementEndProjectFile.vue

@@ -197,12 +197,10 @@
             this.ajax
                   .post(this.$store.state.api+'/AddProjectManageFile',param)
                   .then(res=>{
-                    console.log(res);
                     if (res.data==1) {
                       this.getData()
                       this.$message.success('上传成功')
                       this.progress.show = false;
-
                     }else{
                       this.$message.error('上传失败')
                     }
@@ -226,9 +224,7 @@
               this.ajax
                     .get(this.$store.state.api+'/SelectProjectManageFile',param)
                     .then(res=>{
-                      console.log(res.data[0][0]);
                       this.state=res.data[0][0].isupload;
-                      console.log(res.data[0][0])
                       let file = JSON.parse(res.data[0][0]['endFile']);
                       this.tableData=file
                       this.loading = false;

src/views/resultShow/components/resultDetail_student.vue

@@ -46,10 +46,10 @@
                 <i class="iconStyle iconfont icon-jiegou" style="color:#58c2fe;font-size:22px;margin-right: 7px;"></i>
                 <span>活动开展</span>
             </div>
-            <div  class="navLi" @click="pageState=3">
+            <!-- <div  class="navLi" @click="pageState=3">
                 <i class="iconStyle iconfont icon-wenjian" style="color:#58c2fe;font-size:22px;margin-right: 7px;"></i>
                 <span>项目附件</span>
-            </div>
+            </div> -->
             <div  class="navLi" @click="pageState=4">
                 <i class="iconStyle iconfont icon-baogao" style="color:#58c2fe;font-size:22px;margin-right: 7px;"></i>
                 <span>项目结题报告</span>
@@ -463,7 +463,7 @@
             </div>
             <!-- 活动开展结束 -->
             <!-- 项目附件开始 -->
-            <div class="BaseMessage" v-show="pageState==3">
+            <!-- <div class="BaseMessage" v-show="pageState==3">
                 <div class="BaseTitle" type="3">
                     <span>项目附件</span>
                 </div>
@@ -495,7 +495,7 @@
                         </div>
                     </div>
                 </div>
-                </div>
+                </div> -->
 
             <!-- 项目中期报告开始 -->
             <div class="BaseMessage" v-show="pageState==4">