#

src/App.vue

@@ -11,7 +11,7 @@
             <span class="el-icon-s-opportunity"></span>
           </el-badge>
         </div>
-        <div>你好，{{ $store.state.userInfo }}</div>
+        <div>你好，{{ $store.state.userInfo.username }}</div>
         <div class="homeExit" @click="homeExit">退出</div>
       </div>
     </el-header>
@@ -326,12 +326,11 @@ hr {
 .exitTable{   //所见所得填写项目的table样式
             border: none;
             border-top: solid 1px black;
-            // border-right:  solid 1px black;
             border-left:  solid 1px black;
             position: relative;
             margin-top: 150px;
             margin-bottom: 120px;
-            font-size: 20px;
+            // font-size: 20px;
             width: 1200px;
             font-family:Arial,"Microsoft Yahe","微软雅黑";
             .bold{
@@ -376,9 +375,9 @@ hr {
               border: none;
               border-bottom: solid 1px black;
               border-right: solid 1px black;
-              height: 60px;
+              height: 40px;
               text-align: center;
-              line-height: 30px;
+              // line-height: 30px;
               min-width: 160px;
               box-sizing: border-box;
               padding: 5px;

src/views/activityManage/makerActvity.vue

@@ -340,7 +340,7 @@
       :visible.sync="endFundDialog"
       width="600px"
       class="endDialog"
-      :before-close="init">
+      >
       
       <div class="deleteContent">"{{ endTable.title }}"项目活动还有资金未完结！</div>
       <div class="deleteContent1">未完结资金编号</div>

src/views/commission/commissionDetailMain.vue

@@ -13,9 +13,15 @@
                 <div :class="index==show?item.cl:''"></div>
             </div>
         </div>
+        <!-- 项目查看学生 -->
         <projectLookstudnt v-if="this.show==1 && this.$route.query['tid']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"></projectLookstudnt>
+
+        <!-- 项目查看创客空间 -->
         <projectLookSpace v-if="this.show==1 && this.$route.query['tid']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"></projectLookSpace>
+        <!-- 项目下载 -->
         <projectDownload v-if="this.show==2"></projectDownload>
+
+        <!-- 项目结项书 -->
         <projectBook v-if="this.show==0"></projectBook>
     </div>
 </template>

src/views/commission/components/projectBook.vue

@@ -1,5 +1,6 @@
 <template>
   <div>
+    <!-- 项目申报书 -->
     <table border="1" cellspacing="0">
         <div class="onePage">
             <div class="titSchool">深圳技师学院</div>
@@ -8,23 +9,29 @@
         </div>
         
         <tr>
-            <td colspan="2" class="bold"> <span>*</span>项目名称</td><td colspan="2"></td>
-            <td colspan="2" class="bold"><span>*</span>所在学院</td><td colspan="2"></td>
+            <td colspan="2" class="bold"> <span>*</span>项目名称</td>
+            <td colspan="2">{{ bookData.title }}</td>
+            <td colspan="2" class="bold"><span>*</span>所在学院</td>
+            <td colspan="2">{{ bookData.name }}</td>
         </tr>
         <tr>
-            <td rowspan="2" class="bold"><span>*</span>项目状态</td><td>已建设</td><td colspan="6">指二级学院已获得政府或学校资助( 例:设计学院、信通学院、珠宝学院 )，已有双创空间( 创客实践室场地、设备设施并已投入运营，需对空间环境优化、规章制度建设、小型设施设备添置、创客项目物料增补，需拓展创客项目培训、辅导，创客讲座、沙龙、论坛，创客路演、竞赛、集市及成果参评、参展等方面的工作而提出的资助申请。</td>
+            <td rowspan="2" class="bold"><span>*</span>项目状态</td>
+            <td>{{ bookData.typeName=='00a3aa2f-f51e-11ed-a3f6-509a4c5b67cf'?'√':'□' }}已建设</td><td colspan="6">指二级学院已获得政府或学校资助( 例:设计学院、信通学院、珠宝学院 )，已有双创空间( 创客实践室场地、设备设施并已投入运营，需对空间环境优化、规章制度建设、小型设施设备添置、创客项目物料增补，需拓展创客项目培训、辅导，创客讲座、沙龙、论坛，创客路演、竞赛、集市及成果参评、参展等方面的工作而提出的资助申请。</td>
         </tr>
         <tr>
-            <td>待建设</td><td colspan="6">指二级学院拟立项开展学院特色创客空间建设项目，需进行项目前期调研论证、场馆规划、空间图纸设计设备选型等方面的工作而进行的资助申请。</td>
+            <td>{{ bookData.typeName=='00a3aa2f-f51e-11ed-a3f6-509a4c5b67cf'?'√':'□' }} 待建设</td>
+            <td colspan="6">指二级学院拟立项开展学院特色创客空间建设项目，需进行项目前期调研论证、场馆规划、空间图纸设计设备选型等方面的工作而进行的资助申请。</td>
         </tr>
 
         <tr>
-            <td colspan="2" class="bold"> <span>*</span>项目起始时间</td> <td colspan="2"></td> 
-            <td colspan="2" class="bold"><span>*</span>计划完成时间</td><td colspan="2"></td>
+            <td colspan="2" class="bold"> <span>*</span>项目起始时间</td> 
+            <td colspan="2">{{ bookData.begin_at }}</td> 
+            <td colspan="2" class="bold"><span>*</span>计划完成时间</td>
+            <td colspan="2">{{ bookData.plannedEnd_at }}</td>
         </tr>
         <tr>
-            <td colspan="2" class="bold"> <span>*</span>项目负责人</td> <td colspan="2"></td> 
-            <td colspan="2" class="bold"><span>*</span>学院牵头领导</td><td colspan="2"></td>
+            <td colspan="2" class="bold"> <span>*</span>项目负责人</td> <td colspan="2">{{ bookData.pro_leader }}</td> 
+            <td colspan="2" class="bold"><span>*</span>学院牵头领导</td><td colspan="2">{{ bookData.lead_leader }}</td>
         </tr>
         <tr>
             <td colspan="8" style="height: 200px;box-sizing: border-box;padding-bottom: 40px;">
@@ -82,12 +89,6 @@
         <tr>
             <td style="display:none" v-for="i in 8" :key="i"></td>
         </tr>
-
-
-
-
-
-
     </table>
   </div>
 </template>
@@ -96,9 +97,27 @@
     export default {
         data() {
             return {
-                ttt:''
+                ttt:'',
+                bookData:{}
+            }
+        },
+        methods:{
+            getData(){
+                this.ajax.get(this.$store.state.api+'/getProjectBookData',{
+                  uid:this.$store.state.userInfo.userid,
+                  pid:this.$route.query['pid']
+              }).then(res=>{
+                let data=res.data[0][0]
+                this.bookData=data
+                console.log(data);
+              }).catch(err=>{
+                  console.log(err);
+              })
             }
         },
+        mounted(){
+            this.getData()
+        }
     }
 </script>
 
@@ -135,7 +154,7 @@
             }
             .dateCss{
                 text-align: right;
-                font-size: 24px;
+                font-size: 18px;
                 width: 90%;
                 font-weight: 600;
                 font-family:  \9ed1\4f53;

src/views/commission/components/projectLookSpace.vue

@@ -0,0 +1,783 @@
+<template>
+  <div id="MakerSpaceWord" ref="downPDF" v-loading="loading">
+      <div id="title">
+          <div class="school">深圳技师学院</div>
+          <div class="wordTitle">二级学院特色创客空间建设项目立项申报书</div>
+          <div class="date">申请日期： {{ wordData['applicationDate'] }}</div>
+      </div>
+      <div id="table">
+          <div class="han" id="one">
+            <div class="label">项目名称</div><div class="value" v-text="wordData['projectName']"></div>
+            <div class="label">所在学院</div><div class="value" v-text="wordData['collegeName']"></div>
+          </div>
+          <div class="status" id="two">
+            <div class="statusLabel">项目状态</div>
+            <div class="ValueDescribe">
+              <div class="statusHan">
+                <div class="DescribeLabel">
+                  <span v-if="wordData['stateName']=='已建设'">√</span><span v-else>□</span>已建设
+              </div><div class="DescribeValue">指二级学院已获得政府或学校资助（例：设计学院、信通学院、珠宝学院），已有双创空间（创客实践室）场地、设备设施并已投入运营，需对空间环境优化、规章制度建设、小型设施设备添置、创客项目物料增补，需拓展创客项目培训、辅导，创客讲座、沙龙、论坛，创客路演、竞赛、集市及成果参评、参展等方面的工作而提出的资助申请。</div>
+              </div>
+              <div class="statusHan">
+                <div class="DescribeLabel">
+                  <span v-if="wordData['stateName']=='待建设'">√</span><span v-else>□</span>待建设
+              </div><div class="DescribeValue">指二级学院拟立项开展学院特色创客空间建设项目，需进行项目前期调研论证、场馆规划、空间图纸设计、设备选型等方面的工作而进行的资助申请。</div>
+              </div>
+            </div>
+          </div>
+          <div class="han" id="three">
+            <div class="label">项目起始时间</div><div class="value" v-text="wordData['begin_at']"></div>
+            <div class="label">计划完成时间</div><div class="value" v-text="wordData['plannedEnd_at']"></div>
+          </div>
+          <div class="han" id="four">
+            <div class="label">项目负责人</div><div class="value" v-text="wordData['pro_leader']"></div>
+            <div class="label">学院牵头领导</div><div class="value" v-text="wordData['lead_leader']"></div>
+          </div>
+          <div class="han">
+            <div class="label">项目组人数</div><div class="value">{{ wordData['teacher'].length+wordData['student'].length }}</div>
+            <div class="label">参与教师人数</div><div class="value">{{wordData['teacher'].length}}</div>
+            <div class="label">参与学生人数</div><div class="value">{{wordData['student'].length }}</div>
+          </div>
+          <div class="member" id="five">
+            <div class="memberLabel">
+              <span class="fontBold">项目组</span>
+              <span class="fontBold">教师团队</span>
+              <span>（团队3人以上，</span>
+              <span>至少应包含1名教</span>
+              <span>研室主任）</span>
+            </div>
+            <div class="memberTable" :style="wordData['teacher'].length<4?'border-bottom:solid 1px black':''">
+              <div class="memberHan">
+                <div class="memberValue">姓名</div>
+                <div class="memberValue">专业</div>
+                <div class="memberValue">职称</div>
+                <div class="memberValue">学历</div>
+                <div class="memberValue">所在教研室</div>
+                <div class="memberValue">项目组角色分工</div>
+              </div>
+              <div class="memberHan" v-for="(item,index) in wordData['teacher']" :key="index">
+                <div class="memberValue" v-text="item['name']"></div>
+                <div class="memberValue" v-text="item['speciality']"></div>
+                <div class="memberValue" v-text="item['title']"></div>
+                <div class="memberValue" v-text="item['education']"></div>
+                <div class="memberValue" v-text="item['section']"></div>
+                <div class="memberValue" v-text="item['work']"></div>
+              </div>
+            </div>
+          </div>
+          <div class="member" id="six">
+            <div class="memberLabel">
+              <span class="fontBold">项目组</span>
+              <span class="fontBold">学生团队</span>
+              <span>（团队5人以上，</span>
+              <span>学生团队年级结构</span>
+              <span>安排合理）</span>
+            </div>
+            <div class="memberTable" :style="wordData['student'].length<4?'border-bottom:solid 1px black':''">
+              <div class="memberHan">
+                <div class="memberValue">姓名</div>
+                <div class="memberValue">班级</div>
+                <div class="memberValue">年龄</div>
+                <div class="memberValue">项目组角色分工</div>
+              </div>
+              <div class="memberHan" v-for="(item,index) in wordData['student']" :key="index">
+                <div class="memberValue" v-text="item['name']"></div>
+                <div class="memberValue" v-text="item['class']"></div>
+                <div class="memberValue" v-text="item['age']"></div>
+                <div class="memberValue" v-text="item['work']"></div>
+              </div>
+            </div>
+          </div>
+          <div class="chapters">
+            <div class="chaptersLabel">
+              <span class="fontBold">项目</span>
+              <span class="fontBold">建设</span>
+              <span class="fontBold">内容</span>
+              <span class="fontBold">及</span>
+              <span class="fontBold">目标</span>
+              <span>（说明项目建设内</span><span>容、拟解决的关键</span><span>问题、创新之处、</span><span>主要建设指标）</span>
+            </div>
+            <div class="chaptersTable">
+                <div class="chaptersValue" id="seven">
+                  <span>项目简介(200-300字)</span><br/>
+                  <p v-text="wordData['brief']"></p>
+                </div>
+                <div class="chaptersValue" id="eight">
+                  <span>建设内容（空间优化/场馆规划方面拟解决的关键问题及主要建设指标）</span><br/>
+                  <p v-text="wordData['Construction']"></p>
+                </div>
+            </div>
+          </div>
+          <div class="chapters">
+            <div class="chaptersLabel fontBold">
+              <span>项目</span>
+              <span>建设</span>
+              <span>论证</span>
+              <span>报告</span>
+            </div>
+            <div class="chaptersTable">
+                <div class="chaptersValue" id="nine">
+                  <span>立项依据(说明本项目的目的、意义以及国内外高校现状、市场预测和发展趋势，预期达到的目标，研究的预期效果分析，成果受益面)</span><br/>
+                  <p v-text="wordData['ProjectBasis']"></p>
+                </div>
+            </div>
+          </div>
+          <div class="chapters">
+            <div class="chaptersLabel">
+              <span class="fontBold">预期</span>
+              <span class="fontBold">成果</span>
+              <span>(项目预期成果、</span><span>数量及形式，结题</span><span>时：须附项目研究</span><span>报告)</span>
+            </div>
+            <div class="chaptersTable">
+                <div class="chaptersValue" id="ten">
+                  <span>创客空间物理环境、制度建设及软件设施建设情况（环境优化/制度完善/设施改造）</span><br/>
+                  <p v-text="wordData['development']"></p>
+                </div>
+                <div class="chaptersValue" id="eleven">
+                  <span>学生创客工作室建设情况（工作室数量及活动开展情况）</span><br/>
+                  <p v-text="wordData['studio']"></p>
+                </div>
+                <div class="chaptersValue" id="twelve">
+                  <span>学生创客团队（人才）培养预期成果、数量</span><br/>
+                  <p v-text="wordData['studentTeam']"></p>
+                </div>
+                <div class="chaptersValue" id="thirteen">
+                  <span>学生创客活动组织实施情况</span><br/>
+                  <p v-text="wordData['studentActivities']"></p>
+                </div>
+                <div class="chaptersValue" id="fourteen">
+                  <span>学生创客团队孵化、转化创业项目情况</span><br/>
+                  <p v-text="wordData['Transforming']"></p>
+                </div>
+            </div>
+          </div>
+          <div class="chapters">
+            <div class="chaptersLabel">
+              <span class="fontBold">立项</span>
+              <span class="fontBold">基础</span>
+              <span class="fontBold">及</span>
+              <span class="fontBold">条件</span>
+              <span>(说明已开展的相</span>
+              <span>关研究及基础准备</span>
+              <span>工作，已具备的设</span>
+              <span>备场地条件和技术</span>
+              <span>力量，尚缺少的条</span>
+              <span>件和拟解决的途</span>
+              <span>径)</span>
+            </div>
+            <div class="chaptersTable">
+                <div class="chaptersValue" id="fifteen">
+                  <span>基础条件（物理环境/设备设施/项目实施/活动开展/技术力量/社会资源）</span><br/>
+                  <p v-text="wordData['condition']"></p>
+                </div>
+            </div>
+          </div>
+  
+          <div class="fund">
+            <div class="fundTitle">
+              预算<br/>经费
+            </div>
+            <div class="fundTable">
+              <div class="fundTotal">
+                <div class="fundLabel">总经费</div>
+                <div class="fundValue">{{wordData['fund']['total']}}元</div>
+              </div>
+              <div class="fundHeader">
+                <div class="HeaderLabel">支出类别</div>
+                <div class="HeaderLabel">支出项目</div>
+                <div class="HeaderLabel">金额（元）</div>
+                <div class="HeaderLabel">备注</div>
+              </div>
+              <div class="fundData">
+                <div class="fundDataLabel">直接费用</div>
+                <div class="fundDataHan">
+                  <div class="fundDataLie">
+                    <div class="fundDataValue">小型仪器设备费</div>
+                    <div class="fundDataValue" v-text="wordData['fund']['device']">
+                    </div>
+                    <div class="fundDataValue"><span>项目开展所需的小型专用仪器设备、工具、配件购置或租赁费用。</span></div>
+                  </div>
+  
+                  <div class="fundDataLie">
+                    <div class="fundDataValue">材料费</div>
+                    <div class="fundDataValue" v-text="wordData['fund']['Material']">
+                    </div>
+                    <div class="fundDataValue"><span>项目开展需消耗的各种原材料、辅助材料等低值易耗品的采购费用。</span></div>
+                  </div>
+  
+                  <div class="fundDataLie">
+                    <div class="fundDataValue">测试化验加工费</div>
+                    <div class="fundDataValue" v-text="wordData['fund']['processing']">
+                    </div>
+                    <div class="fundDataValue"><span>项目开展过程中支付给外单位的检验、测试、化验、计算、分析及加工费等费用。</span></div>
+                  </div>
+  
+                  <div class="fundDataLie">
+                    <div class="fundDataValue">项目协作费</div>
+                    <div class="fundDataValue" v-text="wordData['fund']['Collaboration']">
+                    </div>
+                    <div class="fundDataValue"><span>按合同规定支付给协作单位的费用</span></div>
+                  </div>
+                 
+                </div>
+              </div>
+  
+              <div class="fundData">
+                <div class="fundDataLabel">间接费用</div>
+                <div class="fundDataHan">
+                  <div class="fundDataLie">
+                    <div class="fundDataValue">项目成果鉴定费</div>
+                    <div class="fundDataValue" v-text="wordData['fund']['APPRAISAL']">
+                    </div>
+                    <div class="fundDataValue"><span>学术会务费、评审费、鉴定费、成果集制作费等费用。</span></div>
+                  </div>
+  
+                  <div class="fundDataLie">
+                    <div class="fundDataValue">参展参赛费</div>
+                    <div class="fundDataValue" v-text="wordData['fund']['entery']">
+                    </div>
+                    <div class="fundDataValue"><span>参加创客展会、竞赛等所需的报名费、展位费、布展费、宣传推广费及差旅费等费用。</span></div>
+                  </div>
+  
+                  <div class="fundDataLie">
+                    <div class="fundDataValue">创客交流活动费</div>
+                    <div class="fundDataValue" v-text="wordData['fund']['activities']">
+                    </div>
+                    <div class="fundDataValue"><span>创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。</span></div>
+                  </div>
+  
+                  <div class="fundDataLie">
+                    <div class="fundDataValue">知识产权事务费</div>
+                    <div class="fundDataValue" v-text="wordData['fund']['Transaction']">
+                    </div>
+                    <div class="fundDataValue"><span>论文版面费、专利及其他知识产权事务等费用。</span></div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <!-- <div class="opinion">
+            <div class="opinionLabel">所在学院/部门<br/> 意 见</div>
+            <div class="opinionValue">
+              <div class="opinionImport">
+                <div class="opinionChapter">负责人签章：</div>
+                <div class="opinionDate">年 月 日</div>
+              </div>
+            </div>
+          </div>
+  
+          <div class="opinion">
+            <div class="opinionLabel">财务部门<br/>意 见</div>
+            <div class="opinionValue">
+              <div class="opinionImport">
+                <div class="opinionChapter">负责人签章：</div>
+                <div class="opinionDate">年 月 日</div>
+              </div>
+            </div>
+          </div>
+  
+          <div class="opinion">
+            <div class="opinionLabel">创新创业学院<br/>审 核 意 见</div>
+            <div class="opinionValue">
+              <div class="opinionImport">
+                <div class="opinionChapter">负责人签章：</div>
+                <div class="opinionDate">年 月 日</div>
+              </div>
+            </div>
+          </div> -->
+  
+        </div>
+        <div class="notes">
+          <span>备注：</span>
+          <span>1.表格可顺延或另附页。</span>
+          <span>2.项目申报需附相关佐证材料。</span>
+        </div>
+        <!-- <el-button v-if="downFile" type="primary" @click="getWord">下载表格</el-button> -->
+  </div>
+  </template>
+    
+  <script>
+  // import {getMakerSpaceWord} from '@/components/tool/getWord'
+
+    export default {
+      data() {
+        return {
+          loading:false,
+          downFile:true,
+          wordData:{
+              applicationDate:"",//申请日期
+              projectName:"",//项目名称
+              college:"",//所在学院
+              collegeName:"",
+              begin_at:"",//项目开始时间
+              state:"",//项目状态
+              stateName:"",//项目状态名称
+              plannedEnd_at:"",//计划完成时间
+              pro_leader:"",//项目负责人
+              lead_leader:"",//学院牵头领导
+              teacher:[
+                  {name:"",speciality:"",title:"",education:"",section:"",work:""},
+                  {name:"",speciality:"",title:"",education:"",section:"",work:""},
+                  {name:"",speciality:"",title:"",education:"",section:"",work:""},
+              ],   //教师组//name：姓名  speciality：专业  title：职称 education：学历    section：所在教研室    work：项目组角色分工
+              student:[
+                  {name:"",class:"",age:"",work:""},
+                  {name:"",class:"",age:"",work:""},
+                  {name:"",class:"",age:"",work:""},
+                  {name:"",class:"",age:"",work:""},
+                  {name:"",class:"",age:"",work:""},
+              ],   //学生组//name：姓名    class：班级 age：年龄   work：项目组任务分工
+              brief:"",//项目简介
+              Construction:"",//建设内容
+              ProjectBasis:"",//立项依据
+              development:"",//创客空间物理环境、制度建设及软件设施建设情况
+              studio:"",//学生创客工作室建设情况
+              studentTeam:"",//学生创客团队（人才）培养预期成果、数量
+              studentActivities:"",//学生创客活动组织实施情况
+              Transforming:"",//学生创客团队孵化、转化创业项目情况
+              condition:"",//立 项基 础及条 件
+              fund:{
+                total:"",
+                device:"",
+                Material:"",
+                processing:"",
+                Collaboration:"",
+                APPRAISAL:"",
+                entery:"",
+                activities:"",
+                Transaction:"",
+              },
+            },
+        };
+      },
+      methods: {
+          getWord(){
+            this.downFile = false;
+            // console.log(this.$refs.downPDF)
+            downloadPDF(this.$refs.downPDF);
+            this.downFile = true;
+            // this.$message.info("正在下载表格")
+            // getMakerSpaceWord(this.wordData);
+          },
+          getData(){
+              this.loading = true;
+              this.ajax.get(this.$store.state.api+'/getMakerSpaceWordData',{
+                  uid:this.$store.state.userInfo.userid,
+                  pid:this.$route.query['pid']
+              }).then(result=>{
+                  let data = result['data'][0][0]
+                  this.wordData['projectName'] = data['title'];
+                  this.wordData['applicationDate'] = data['applyProjectTime'];
+                  this.wordData['college'] = data['classid'];
+                  this.wordData['collegeName'] = data['cName']
+                  this.wordData['begin_at'] = data['begintime'];
+                  this.wordData['state'] = data['typeName'];
+                  this.wordData['stateName'] = data['tName']
+                  this.wordData['plannedEnd_at'] = data['planTime'];
+                  this.wordData['pro_leader'] = data['pro_leader'];
+                  this.wordData['lead_leader'] = data['lead_leader'];
+                  this.wordData['teacher'] = JSON.parse(data['course_teacher']);
+                  this.wordData['student'] = JSON.parse(data['course_student']);
+                  this.wordData['brief'] = data['brief'];
+                  this.wordData['fund'] = JSON.parse(data['money']);
+                  this.state = data['isupload']
+                  this.wordData = {...this.wordData,...JSON.parse(data['chapters'])}
+                  this.loading = false;
+              }).catch(err=>{
+                  console.log(err);
+              })
+          },
+      },
+      mounted(){
+          this.getData();
+      }
+    };
+  </script>
+    
+  <style lang="less" scoped>
+  #MakerSpaceWord{
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      background-color: white;
+      padding:40px 100px;
+      box-sizing:border-box;
+      #title{
+          width: 100%;
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          position: relative;
+          // margin-top: 40px;
+          .school{
+              font-size: 2.5em;
+              font-weight: bold;
+              letter-spacing: 20px;
+          }
+          .wordTitle{
+              font-size: 2em;
+              letter-spacing: .15em;
+              margin-bottom:40px ;
+          }
+          .date{
+  
+              font-size: 1em;
+              position: absolute;
+              bottom: 0;
+              right: 100px;
+              font-weight: bold;
+              margin-bottom:5px;
+          }
+      }
+      #table{
+      box-sizing: border-box;
+      border: solid 1px black;
+      border-bottom: none;
+      display: flex;
+      flex-direction: column;
+      .han{
+        display: flex;
+        height: auto;
+        box-sizing: border-box;
+        border-bottom:solid 1px black;
+        .label{
+          position: relative;
+          flex:1;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          box-sizing: border-box;
+          min-height: 50px;
+          border-right: solid 1px black;
+          font-weight:bold;
+        }
+        .value{
+          flex: 2;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          box-sizing: border-box;
+          min-height: 50px;
+          &:not(:nth-last-child(1)){
+            border-right: solid 1px black;
+          }
+        }
+        &:nth-child(5){
+          .label{
+            flex: 1;
+          }
+          .value{
+            flex: 1;
+          }
+        }
+      }
+      .status{
+        display: flex;
+        height: auto;
+        box-sizing: border-box;
+        .statusLabel{
+          flex:1;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          box-sizing: border-box;
+          border-right: solid 1px black;
+          border-bottom: solid 1px black;
+          font-weight:bold;
+        }
+        .ValueDescribe{
+          flex: 5;
+          display: flex;
+          flex-direction: column;
+          .statusHan{
+            display: flex;
+            box-sizing: border-box;
+            border-bottom: solid 1px black;
+  
+            .DescribeLabel{
+              flex: 1;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              box-sizing: border-box;
+              // min-height: 200px;
+              padding:40px 10px;
+              border-right: solid 1px black;
+            }
+            &:nth-child(2){
+              .DescribeLabel{
+                  min-height: 100px;
+              }
+            }
+            .DescribeValue{
+              flex: 5;
+              box-sizing: border-box;
+              padding: 15px;
+            }
+          }
+        }
+      }
+      .member{
+        display: flex;
+        .memberLabel{
+          flex:1;
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: center;
+          box-sizing: border-box;
+          border-right: solid 1px black;
+          border-bottom: solid 1px black;
+          min-height: 200px;
+        }
+        .memberTable{
+          flex: 5;
+          display: flex;
+          flex-direction: column;
+          .memberHan{
+            display: flex;
+            box-sizing: border-box;
+            border-bottom: solid 1px black;
+            position:relative;
+            .memberValue{
+              box-sizing: border-box;
+              flex: 1;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              border-right: solid 1px black;
+              min-height: 45px;
+              &:nth-last-child(1){
+                border-right: none;
+                flex: 3;
+              }
+            }
+        }
+      }
+  }
+      .chapters{
+        display: flex;
+        .chaptersLabel{
+          flex:1;
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: center;
+          box-sizing: border-box;
+          padding: 20px 0;
+          border-right: solid 1px black;
+          border-bottom: solid 1px black;
+        }
+        .chaptersTable{
+          flex: 5;
+          display: flex;
+          flex-direction: column;
+          .chaptersValue{
+            flex: 1;
+            min-height:200px;
+            box-sizing: border-box;
+            border-bottom: solid 1px black;
+            padding: 5px;
+            span{
+              font-weight: bold;
+            }
+          }
+        }
+      }
+      .fund{
+        display: flex;
+        .fundTitle{
+          flex:1;
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: center;
+          box-sizing: border-box;
+          border-right: solid 1px black;
+          border-bottom: solid 1px black;
+          font-weight:bold;
+        }
+        .fundTable{
+          flex: 5;
+          display: flex;
+          flex-direction: column;
+          box-sizing: border-box;
+          .fundTotal{
+            height: 60px;
+            box-sizing: border-box;
+            border-bottom: solid 1px black;
+            display: flex;
+            div{
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              font-weight: bold;
+            }
+            .fundLabel{
+              flex: 1;
+              box-sizing: border-box;
+              border-right:solid 1px black;
+            }
+            .fundValue{
+              flex: 4;
+            }
+          }
+          .fundHeader{
+            min-height: 40px;
+            box-sizing: border-box;
+            border-bottom: solid 1px black;
+            display: flex;
+            font-weight:bold;
+            .HeaderLabel{
+              flex: 1;
+              display: flex;
+              box-sizing: border-box;
+              justify-content: center;
+              align-items: center;
+              border-right: solid 1px black;
+              &:nth-last-child(1){
+                flex: 2;
+                border: none;
+              }
+            }
+          }
+          .fundData{
+            display: flex;
+            .fundDataLabel{
+              flex:1;
+              box-sizing: border-box;
+              border-right: solid 1px black;
+              border-bottom: solid 1px black;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              font-weight:bold;
+            }
+            .fundDataHan{
+              flex: 4;
+              display: flex;
+              flex-direction: column;
+              .fundDataLie{
+                display: flex;
+                min-height: 40px;
+                flex: 4;
+                box-sizing: border-box;
+                border-bottom: solid 1px black;
+                .fundDataValue{
+                  flex: 1;
+                  min-height: 40px;
+                  display: flex;
+                  box-sizing: border-box;
+                  justify-content: center;
+                  align-items: center;
+                  border-right: solid 1px black;
+                  &:nth-last-child(1){
+                    flex:2;
+                    border: none;
+                    justify-content: flex-start;
+                    span{
+                      padding: 10px 20px;
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      // .fundTable{
+      //   tr{
+      //     td{
+      //       height: 50px;
+      //     }
+      //     &:nth-child(1){
+      //       flex: 1;
+      //     }
+      //   }
+      // }
+      .opinion{
+        display: flex;
+        .opinionLabel{
+          flex:1;
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: center;
+          box-sizing: border-box;
+          // padding: 3.5px;
+          border-right: solid 1px black;
+          border-bottom: solid 1px black;
+          font-weight:bold;
+        }
+        .opinionValue{
+          flex: 5;
+          min-height: 200px;
+          position: relative;
+          box-sizing:border-box;
+          border-bottom: solid 1px black;
+          .opinionImport{
+            display: flex;
+            width: 30%;
+            height:40%;
+            flex-direction: column;
+            position:absolute;
+            bottom: 0px;
+            right: 20px;
+            justify-content: space-between;
+            .opinionDate{
+              display: flex;
+              justify-content: flex-end;
+              font-size: 18px;
+            }
+          }
+        }
+      }
+    }
+    .notes{
+      width: 100%;
+      display: flex;
+      flex-direction:column;
+    }
+    :deep(.el-input__inner){
+      height: 100%;
+      border-radius: 0;
+      width: 100%;
+      background: none;
+      color: black;
+      text-align: center;
+      font-size: 16px;
+      box-sizing: border-box;
+      border: none;
+      outline: none;
+    }
+    :deep(.el-textarea__inner){
+      height: 100%;
+      border-radius: 0;
+      width: 100%;
+      background: none;
+      color: black;
+      text-align: center;
+      font-size: 16px;
+      box-sizing: border-box;
+      border: none;
+      overflow: hidden;
+    }
+    .noCenter{
+      :deep(.el-textarea__inner ){
+        text-align:left;
+      }
+    }
+    :deep(.el-date-editor){
+      width: 100%;
+      height: 100%;
+    }
+    :deep(.el-input__suffix){
+      display:none;
+    }
+  
+    .fontBold{
+      font-weight:bold;
+    }
+  }
+  </style>

src/views/commission/components/projectLookstudnt.vue

@@ -22,12 +22,6 @@
           </tr> 
           <tr id="checkList" class="checkArea">
             <td colspan="2" ref="checkList">优先支持项目（可多选）</td> <td colspan="5">
-              <!-- <span><span v-text="downWordData['checkList'].includes('1')?'√ ':'□'"></span><span>大赛选拔项目</span></span>
-              <span><span v-text="downWordData['checkList'].includes('2')?'√ ':'□'"></span><span>落地注册项目</span></span>
-              <span><span v-text="downWordData['checkList'].includes('3')?'√ ':'□'"></span><span>社会征集项目</span></span>
-              <span><span v-text="downWordData['checkList'].includes('4')?'√ ':'□'"></span><span>产业命题项目</span></span> -->
-              
-
               <span><span>{{ downWordData['checkList'].includes('1')?'√ ':'□' }}大赛选拔项目</span></span>
               <span><span>{{ downWordData['checkList'].includes('2')?'√ ':'□' }}落地注册项目</span></span>
               <span><span>{{ downWordData['checkList'].includes('3')?'√ ':'□' }}社会征集项目</span></span>
@@ -40,19 +34,14 @@
               <span><span v-text="downWordData['schoolRadio']=='2'?'√ ':'□ '"></span><span>环境治理项目</span></span>
               <span><span v-text="downWordData['schoolRadio']=='3'?'√ ':'□ '"></span><span>校园服务项目</span></span>
               <span><span v-text="downWordData['schoolRadio']=='4'?'√ ':'□ '"></span><span>文创装置项目</span></span>
-              <!-- <el-radio v-model="downWordData.schoolRadio" label="1">校园安全项目</el-radio>
-              <el-radio v-model="downWordData.schoolRadio" label="2">环境治理项目</el-radio>
-              <el-radio v-model="downWordData.schoolRadio" label="3">校园服务项目</el-radio>
-              <el-radio v-model="downWordData.schoolRadio" label="4">文创装置项目</el-radio> -->
+             
             </td>
           </tr>
           <tr id="applyParsonRadio">
             <td colspan="2" ref="applyParsonRadio" >项 目 申 请 人</td><td colspan="2">
               <span v-text="downWordData['applyParsonRadio']=='1'?'√ ':'□ '"></span><span>在校学生</span>
-              <!-- <el-radio v-model="downWordData.applyParsonRadio" label="1">在校学生</el-radio> -->
             </td><td colspan="3">
               <span v-text="downWordData['applyParsonRadio']=='2'?'√ ':'□ '"></span><span>入驻学校孵化基地的初创企业法人</span>
-              <!-- <el-radio v-model="downWordData.applyParsonRadio" label="2">入驻学校孵化基地的初创企业法人</el-radio> -->
             </td>
           </tr>
           <tr id="applyParsonName">
@@ -234,27 +223,7 @@
               论文版面费、专利及其他知识产权事务等费用。
             </td>
           </tr>
-          <!-- <tr>
-            <td>所在学院/部门意见</td><td colspan="6" class="textLeft" style="height:200px">
-              <div style="height:200px"></div>
-                <div style="text-align: right;font-size: 18px;width: 80%;margin-bottom: 20px;">负责人签章：</div>
-                <div style="text-align: right;font-size: 18px;width: 90%;">年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日</div>
-            </td>
-          </tr>
-          <tr>
-            <td>财务部门意见</td><td colspan="6" class="textLeft" style="height:200px">
-              <div style="height:200px"></div>
-                <div style="text-align: right;font-size: 18px;width: 80%;margin-bottom: 20px;">负责人签章：</div>
-                <div style="text-align: right;font-size: 18px;width: 90%;">年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日</div>
-            </td>
-          </tr>
-          <tr>
-            <td>创新创业学院审核意见</td><td colspan="6" class="textLeft" style="height:200px">
-                <div style="height:200px"></div>
-                <div style="text-align: right;font-size: 18px;width: 80%;margin-bottom: 20px;">负责人签章：</div>
-                <div style="text-align: right;font-size: 18px;width: 90%;">年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日</div>
-            </td>
-          </tr> -->
+
           <div class="notes">
             <span>备注：</span>
             <span>1.表格可顺延或另附页。</span>
@@ -310,7 +279,6 @@
                   wordData.introduce=JSON.parse(data.chapters)
                   wordData.fund=JSON.parse(data.money)
                   wordData.dp=data.className
-
                   this.downWordData=wordData
               },err=>{
                   console.log(err);
@@ -340,31 +308,7 @@
         margin: 0;
         padding: 40px 100px;
         box-sizing:border-box;
-        #title{
-            width: 100%;
-            position: absolute;
-            top: -170px;
-            .school{
-              text-align: center;
-                width: 100%;
-                font-size: 2.5em;
-                font-weight: bold;
-                letter-spacing: 20px;
-            }
-            .wordTitle{
-              text-align: center;
-                width: 100%;
-                font-size: 2em;
-                letter-spacing: .15em;
-                margin-bottom:40px ;
-            }
-            .date{
-                width: 90%;
-                text-align: right;
-                font-size: 1em;
-                font-weight: bold;
-            }
-        }
+       
         .table{
             border: none;
             width: 1200px;
@@ -374,6 +318,31 @@
             position: relative;
             margin-top: 180px;
             margin-bottom: 100px;
+            #title{
+            width: 100%;
+              position: absolute;
+              top: -170px;
+              .school{
+                text-align: center;
+                  width: 100%;
+                  font-size: 2.5em;
+                  font-weight: bold;
+                  letter-spacing: 20px;
+              }
+              .wordTitle{
+                text-align: center;
+                  width: 100%;
+                  font-size: 2em;
+                  letter-spacing: .15em;
+                  margin-bottom:40px ;
+              }
+            .date{
+                width: 90%;
+                text-align: right;
+                font-size: 18px;
+                font-weight: bold;
+            }
+        }
             .textLeft{
               text-align: left ;
               vertical-align: top;

src/views/echarts/components/HorizontalChart.vue

@@ -77,6 +77,7 @@ import * as echarts from 'echarts';
         },
         mounted(){
             this.setHorizontalData();
+            console.log(this.HorizontalData);
         }
 
     }

src/views/echarts/echarts.vue

@@ -101,8 +101,9 @@
         this.ajax.get(this.$store.state.api+'/getEchartsData',{
           uid:this.$store.state.userInfo.userid
         }).then(result=>{
+          console.log(result);
           let data = result['data'];
-          console.log(data)
+          // console.log(data)
           //创客项目人数
           this.HeaderData['people']=data[0][0]['total']
           //目前积累项目数量
@@ -125,6 +126,7 @@
           this.CircularData[1]['value'] = data[2][0]['Maker']
 
           //创客活动资金
+          console.log(data[3]);
           let MakerData = data[3].filter(item=>item.type==0);
           let GroupMakerData = [];
           MakerData.forEach(item=>{
@@ -149,8 +151,8 @@
               GroupPersonalData.push(item);
             }
           })
+          console.log(GroupPersonalData);
           GroupPersonalData.sort((item1,item2)=>item2['isUse']-item1['isUse']).splice(0,16).sort((item1,item2)=>item1['isUse']-item2['isUse']).forEach(item=>this.ColumnarData.push([item['title'],item['isUse']]))
-
           //项目排名
           this.tableData = data[4];
 

src/views/projectApply/components/MakerSpaceWordShow.vue

@@ -506,7 +506,7 @@
             </td>
           </tr>
 
-          <tr>
+          <!-- <tr>
             <td><span class="jc">所在学院/</span><br><br> <span class="jc">部门意见</span></td>
             <td colspan="7" class="textLeft">
 
@@ -533,7 +533,7 @@
                 <div>年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日</div>
               </div>
             </td>
-          </tr>
+          </tr> -->
 
           <div class="notes">
             <span>备注：</span>

src/views/projectApply/components/studentProjectWordShow.vue

@@ -219,7 +219,7 @@
               论文版面费、专利及其他知识产权事务等费用。
             </td>
           </tr>
-          <tr>
+          <!-- <tr>
             <td><span class="jc">所在学院/</span><br><br> <span class="jc">部门意见</span></td>
             <td colspan="6" class="textLeft">
 
@@ -246,7 +246,7 @@
                 <div>年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日</div>
               </div>
             </td>
-          </tr>
+          </tr> -->
           <div class="notes">
             <span>备注：</span>
             <span>1.表格可顺延或另附页。</span>

src/views/projectManage/ProjectManagement.vue

@@ -397,11 +397,8 @@ import Closingstatement from './components/Closingstatement.vue'
 
 
         ending(){   //结项书提交
-          console.log(
-            this.$store.state.userInfo.userid,
-            this.iid,
-            this.myArrayProp[0]['ClosingstatementData'],
-          );
+        //  return console.log(this.myArrayProp[0]);
+
           this.ajax.post(this.$store.state.api+"/updateClosingstatementData",{
             uid:this.$store.state.userInfo.userid,
             cid:this.iid,
@@ -433,8 +430,6 @@ import Closingstatement from './components/Closingstatement.vue'
         },
 
         finish(val){     //结项对话框显示
-          // return console.log(a);
-          // return console.log(val,tit);
           this.iid=val.courseId;          // 提交结项时候的用
 
           this.checkActivityFinishData = [];  //未完成项目
@@ -471,7 +466,7 @@ import Closingstatement from './components/Closingstatement.vue'
               this.tit = val.title;
               this.NoReportActivity = true;
             }else{
-              this.myArrayProp=[]
+              // this.myArrayProp=[]
 
             this.iid=val.courseId;
 
@@ -480,9 +475,19 @@ import Closingstatement from './components/Closingstatement.vue'
               uid:this.$store.state.userInfo.userid,
               pid:val.courseId,
             }).then(res=>{
-              // console.log(res.data[0][0]);
+              let num=0
+              res.data[1].forEach(i=>{            //计算出已经使用过的金钱
+                // console.log(i);
+                i['actualuse']=JSON.parse(i['actualuse'])
+                for(let key in i['actualuse']){
+                   if (i['actualuse'][key]) {
+                    num = i['actualuse'][key]*1 + num
+                   }
+                }
+              })
+              console.log(num);
+
               let data=res.data[0]
-              console.log(data);
 
               data[0].course_student=JSON.parse(data[0].course_student)
               data[0].course_teacher=JSON.parse(data[0].course_teacher)
@@ -493,11 +498,8 @@ import Closingstatement from './components/Closingstatement.vue'
               data[0].money=JSON.parse(data[0].money)
 
               this.myArrayProp=data
-              // console.log(this.myArrayProp);
-              // this.myArrayProp[0]
-              
+              this.myArrayProp[0].actualuse=num    //添加已经使用过的经费
               this.myArrayProp[0].ClosingstatementData=this.submitData
-              //  return console.log(this.myArrayProp);
 
               console.log(this.myArrayProp);
               this.endDialog=true;
@@ -513,7 +515,6 @@ import Closingstatement from './components/Closingstatement.vue'
           })
         },  
         amendFinish(val){         //修改结项按钮（获取结项时提交的文件）
-          console.log('修改结项');
 
           //#region 上传文件版本结项
           // this.checkFundEndData=[];  
@@ -561,6 +562,19 @@ import Closingstatement from './components/Closingstatement.vue'
             pid:val.courseId,
           }).then(res=>{
             // return console.log(res);
+
+            let num=0
+              res.data[1].forEach(i=>{            //计算出已经使用过的金钱
+                // console.log(i);
+                i['actualuse']=JSON.parse(i['actualuse'])
+                for(let key in i['actualuse']){
+                   if (i['actualuse'][key]) {
+                    num = i['actualuse'][key]*1 + num
+                   }
+                }
+              })
+              console.log(num);
+
             let data=res.data[0]
             data[0].course_student=JSON.parse(data[0].course_student)
             data[0].course_teacher=JSON.parse(data[0].course_teacher)
@@ -570,6 +584,8 @@ import Closingstatement from './components/Closingstatement.vue'
             // data[0].multiSelectProject=JSON.parse(data[0].multiSelectProject)
 
             this.myArrayProp=data
+            this.myArrayProp[0].actualuse=num    //添加已经使用过的经费
+
             console.log(this.myArrayProp);
             this.endDialog=true;
 

src/views/projectManage/components/Closingstatement.vue

@@ -143,7 +143,7 @@
                     type="textarea"
                     :autosize="{minRows: 6}"
                     placeholder="请输入内容"
-                    v-model="myArrayProp[0].plan">
+                    v-model="myArrayProp[0]['ClosingstatementData'].plan">
                 </el-input>
             </td>
         </tr>
@@ -154,7 +154,7 @@
                     type="textarea"
                     :autosize="{minRows: 6}"
                     placeholder="请输入内容"
-                    v-model="myArrayProp[0].technology">
+                    v-model="myArrayProp[0]['ClosingstatementData'].technology">
                 </el-input>
             </td>
         </tr>
@@ -165,7 +165,7 @@
                     type="textarea"
                     :autosize="{minRows: 6}"
                     placeholder="请输入内容"
-                    v-model="myArrayProp[0].business">
+                    v-model="myArrayProp[0]['ClosingstatementData'].business">
                 </el-input>
             </td>
         </tr>
@@ -176,7 +176,7 @@
                     type="textarea"
                     :autosize="{minRows: 6}"
                     placeholder="请输入内容"
-                    v-model="myArrayProp[0].innovate">
+                    v-model="myArrayProp[0]['ClosingstatementData'].innovate">
                 </el-input>
             </td>
         </tr>
@@ -309,7 +309,7 @@
                     type="textarea"
                     :autosize="{minRows: 6}"
                     placeholder="请输入内容"
-                    v-model="myArrayProp[0].targetPlan">
+                    v-model="myArrayProp[0]['ClosingstatementData'].targetPlan">
                 </el-input>
             </td>
         </tr>
@@ -320,7 +320,7 @@
                     type="textarea"
                     :autosize="{minRows: 6}"
                     placeholder="请输入内容"
-                    v-model="myArrayProp[0].realityResult">
+                    v-model="myArrayProp[0]['ClosingstatementData'].realityResult">
                 </el-input>
             </td>
         </tr>
@@ -331,7 +331,7 @@
                     type="textarea"
                     :autosize="{minRows: 6}"
                     placeholder="请输入内容"
-                    v-model="myArrayProp[0].socialValue">
+                    v-model="myArrayProp[0]['ClosingstatementData'].socialValue">
                 </el-input>
             </td>
         </tr>
@@ -358,7 +358,7 @@
         <tr>
             <td rowspan="12">经 <br><br>费 <br><br>使 <br><br>用</td>
             <td colspan="2">预算总经费</td><td colspan="2">{{ myArrayProp[0].fund }}元</td>
-            <td>实际使用</td><td colspan="2">元</td>
+            <td>实际使用</td><td colspan="2">{{ myArrayProp[0].actualuse }}元</td>
         </tr>
         <tr>
             <td>经费大类</td><td>经费小类</td><td>支出科目</td><td>金额（元）</td><td colspan="3">计算依据及理由</td>

src/views/projectManage/components/MakerSpaceWordShow.vue

@@ -775,20 +775,7 @@
       :deep(.el-input__suffix){
         display:none;
       }
-      // .InputDiv{
-      //   width: 100%;
-      //   height: 100%;
-      //   word-break: break-all;
-      //   display: flex;
-      //   justify-content: center;
-      //   align-items: center;
-      //   box-sizing: border-box;
-      //   padding: 10px;
-      //   outline: none;
-      //   &:focus{
-      //     border:solid 1px #409eff ;
-      //   }
-      // }
+    
       .fontBold{
         font-weight:bold;
       }

src/views/projectManage/components/studentProjectWordShow.vue

@@ -23,10 +23,6 @@
           </tr> 
           <tr id="checkList" class="checkArea">
             <td colspan="2" ref="checkList">优先支持项目（可多选）</td> <td colspan="5">
-              <!-- <span><span v-text="downWordData['checkList'].includes('1')?'√ ':'□'"></span><span>大赛选拔项目</span></span>
-              <span><span v-text="downWordData['checkList'].includes('2')?'√ ':'□'"></span><span>落地注册项目</span></span>
-              <span><span v-text="downWordData['checkList'].includes('3')?'√ ':'□'"></span><span>社会征集项目</span></span>
-              <span><span v-text="downWordData['checkList'].includes('4')?'√ ':'□'"></span><span>产业命题项目</span></span> -->
               
 
               <span><span>{{ downWordData['checkList'].includes('1')?'√ ':'□' }}大赛选拔项目</span></span>
@@ -41,10 +37,6 @@
               <span><span v-text="downWordData['schoolRadio']=='2'?'√ ':'□ '"></span><span>环境治理项目</span></span>
               <span><span v-text="downWordData['schoolRadio']=='3'?'√ ':'□ '"></span><span>校园服务项目</span></span>
               <span><span v-text="downWordData['schoolRadio']=='4'?'√ ':'□ '"></span><span>文创装置项目</span></span>
-              <!-- <el-radio v-model="downWordData.schoolRadio" label="1">校园安全项目</el-radio>
-              <el-radio v-model="downWordData.schoolRadio" label="2">环境治理项目</el-radio>
-              <el-radio v-model="downWordData.schoolRadio" label="3">校园服务项目</el-radio>
-              <el-radio v-model="downWordData.schoolRadio" label="4">文创装置项目</el-radio> -->
             </td>
           </tr>
           <tr id="applyParsonRadio">

src/views/projectSettlement/components/MakerSpaceWordShow.vue

@@ -256,7 +256,7 @@
                 </div>
               </div>
             </div>
-            <div class="opinion">
+            <!-- <div class="opinion">
               <div class="opinionLabel">所在学院/部门<br/> 意 见</div>
               <div class="opinionValue">
                 <div class="opinionImport">
@@ -284,7 +284,7 @@
                   <div class="opinionDate">年 月 日</div>
                 </div>
               </div>
-            </div>
+            </div> -->
     
           </div>
           <div class="notes">

src/views/projectSettlement/components/projectSettlementBook.vue

@@ -1,6 +1,7 @@
 <template>    
     <!-- 结项书组件 -->
   <div>
+
     <table border="1" cellspacing="0">
         <div class="onePage">
             <div class="titSchool">深圳技师学院</div>
@@ -143,7 +144,7 @@
                     type="textarea"
                     :autosize="{minRows: 6}"
                     placeholder="请输入内容"
-                    v-model="myArrayProp[0].plan">
+                    v-model="myArrayProp[0]['ClosingstatementData'].plan">
                 </el-input>
             </td>
         </tr>
@@ -154,7 +155,7 @@
                     type="textarea"
                     :autosize="{minRows: 6}"
                     placeholder="请输入内容"
-                    v-model="myArrayProp[0].technology">
+                    v-model="myArrayProp[0]['ClosingstatementData'].technology">
                 </el-input>
             </td>
         </tr>
@@ -165,7 +166,7 @@
                     type="textarea"
                     :autosize="{minRows: 6}"
                     placeholder="请输入内容"
-                    v-model="myArrayProp[0].business">
+                    v-model="myArrayProp[0]['ClosingstatementData'].business">
                 </el-input>
             </td>
         </tr>
@@ -176,7 +177,7 @@
                     type="textarea"
                     :autosize="{minRows: 6}"
                     placeholder="请输入内容"
-                    v-model="myArrayProp[0].innovate">
+                    v-model="myArrayProp[0]['ClosingstatementData'].innovate">
                 </el-input>
             </td>
         </tr>
@@ -195,7 +196,7 @@
                 <div class="bigBlock">
                     <div class="fileBlock" v-for="(item,index) in myArrayProp[0]['ClosingstatementData'].resultAccessory" :key="index+'a'">
                         <div class="masking-out">
-                            <div class="delete" @click="deleteFile(index)">×</div>
+                            <!-- <div class="delete" @click="deleteFile(index)">×</div> -->
                         </div>
                         <img style="width: 100%;height: 100%;" v-show="myArrayProp[0]['ClosingstatementData'].resultAccessory.length>0" src="../../../assets/img/zzpic426.jpg" alt="">
                         <div class="titName">{{ item.fileName }}</div>
@@ -219,7 +220,7 @@
                 <div class="bigBlock">
                     <div class="fileBlock" v-for="(item,index) in myArrayProp[0]['ClosingstatementData'].firmAccessory" :key="index+'a'">
                         <div class="masking-out">
-                            <div class="delete" @click="deletefirmAccessory(index)">×</div>
+                            <!-- <div class="delete" @click="deletefirmAccessory(index)">×</div> -->
                         </div>
                         <img style="width: 100%;height: 100%;" v-show="myArrayProp[0]['ClosingstatementData'].firmAccessory.length>0" src="../../../assets/img/zzpic426.jpg" alt="">
                         <div class="titName">{{ item.fileName }}</div>
@@ -242,7 +243,7 @@
                 <div class="bigBlock">
                     <div class="fileBlock" v-for="(item,index) in myArrayProp[0]['ClosingstatementData'].competitionAccessory" :key="index+'a'">
                         <div class="masking-out">
-                            <div class="delete" @click="deletecompetitionAccessory(index)">×</div>
+                            <!-- <div class="delete" @click="deletecompetitionAccessory(index)">×</div> -->
                         </div>
                         <img style="width: 100%;height: 100%;" v-show="myArrayProp[0]['ClosingstatementData'].competitionAccessory.length>0" src="../../../assets/img/zzpic426.jpg" alt="">
                         <div class="titName">{{ item.fileName }}</div>
@@ -260,7 +261,7 @@
                 <div class="bigBlock">
                     <div class="fileBlock" v-for="(item,index) in myArrayProp[0]['ClosingstatementData'].exchangeAccessory" :key="index+'a'">
                         <div class="masking-out">
-                            <div class="delete" @click="deleteexchangeAccessory(index)">×</div>
+                            <!-- <div class="delete" @click="deleteexchangeAccessory(index)">×</div> -->
                         </div>
                         <img style="width: 100%;height: 100%;" v-show="myArrayProp[0]['ClosingstatementData'].exchangeAccessory.length>0" src="../../../assets/img/zzpic426.jpg" alt="">
                         <div class="titName">{{ item.fileName }}</div>
@@ -277,7 +278,7 @@
                 <div class="bigBlock">
                     <div class="fileBlock" v-for="(item,index) in myArrayProp[0]['ClosingstatementData'].conversionAccessory" :key="index+'a'">
                         <div class="masking-out">
-                            <div class="delete" @click="deleteconversionAccessory(index)">×</div>
+                            <!-- <div class="delete" @click="deleteconversionAccessory(index)">×</div> -->
                         </div>
                         <img style="width: 100%;height: 100%;" v-show="myArrayProp[0]['ClosingstatementData'].conversionAccessory.length>0" src="../../../assets/img/zzpic426.jpg" alt="">
                         <div class="titName">{{ item.fileName }}</div>
@@ -294,7 +295,7 @@
                 <div class="bigBlock">
                     <div class="fileBlock" v-for="(item,index) in myArrayProp[0]['ClosingstatementData'].talentsAccessory" :key="index+'a'">
                         <div class="masking-out">
-                            <div class="delete" @click="deletetalentsAccessory(index)">×</div>
+                            <!-- <div class="delete" @click="deletetalentsAccessory(index)">×</div> -->
                         </div>
                         <img style="width: 100%;height: 100%;" v-show="myArrayProp[0]['ClosingstatementData'].talentsAccessory.length>0" src="../../../assets/img/zzpic426.jpg" alt="">
                         <div class="titName">{{ item.fileName }}</div>
@@ -309,7 +310,7 @@
                     type="textarea"
                     :autosize="{minRows: 6}"
                     placeholder="请输入内容"
-                    v-model="myArrayProp[0].targetPlan">
+                    v-model="myArrayProp[0]['ClosingstatementData'].targetPlan">
                 </el-input>
             </td>
         </tr>
@@ -320,7 +321,7 @@
                     type="textarea"
                     :autosize="{minRows: 6}"
                     placeholder="请输入内容"
-                    v-model="myArrayProp[0].realityResult">
+                    v-model="myArrayProp[0]['ClosingstatementData'].realityResult">
                 </el-input>
             </td>
         </tr>
@@ -331,7 +332,7 @@
                     type="textarea"
                     :autosize="{minRows: 6}"
                     placeholder="请输入内容"
-                    v-model="myArrayProp[0].socialValue">
+                    v-model="myArrayProp[0]['ClosingstatementData'].socialValue">
                 </el-input>
             </td>
         </tr>
@@ -346,7 +347,7 @@
                 <div class="bigBlock">
                     <div class="fileBlock" v-for="(item,index) in myArrayProp[0]['ClosingstatementData'].taskAccessory" :key="index+'a'">
                         <div class="masking-out">
-                            <div class="delete" @click="deletetaskAccessory(index)">×</div>
+                            <!-- <div class="delete" @click="deletetaskAccessory(index)">×</div> -->
                         </div>
                         <img style="width: 100%;height: 100%;" v-show="myArrayProp[0]['ClosingstatementData'].taskAccessory.length>0" src="../../../assets/img/zzpic426.jpg" alt="">
                         <div class="titName">{{ item.fileName }}</div>
@@ -358,7 +359,7 @@
         <tr>
             <td rowspan="12">经 <br><br>费 <br><br>使 <br><br>用</td>
             <td colspan="2">预算总经费</td><td colspan="2">{{ myArrayProp[0].fund }}元</td>
-            <td>实际使用</td><td colspan="2">元</td>
+            <td>实际使用</td><td colspan="2">{{ myArrayProp[0].actualuse }}元</td>
         </tr>
         <tr>
             <td>经费大类</td><td>经费小类</td><td>支出科目</td><td>金额（元）</td><td colspan="3">计算依据及理由</td>
@@ -419,7 +420,7 @@
             <td colspan="3">论文版面费、专利及其他知识产权事务等费用。</td>
         </tr>
 
-        <tr>
+        <!-- <tr>
            <td> 所 <br>在 <br>学 <br>院/ <br>部 <br>门 <br>意 <br>见</td>
            <td colspan="7">
             <el-input
@@ -431,9 +432,9 @@
             <div style="width: 200px;float: right;margin: 10px 300px; ">负责人签章：</div>
             <div style="width: 200px;float: right;margin: 10px 100px; ">年   月   日</div>
            </td>
-        </tr>
+        </tr> -->
 
-        <tr>
+        <!-- <tr>
            <td> 专 <br>家 <br>验 <br>收 <br>结 <br>论</td>
            <td colspan="7">
             <el-input
@@ -473,7 +474,7 @@
             <div style="width: 200px;float: right;margin: 10px 300px; ">负责人签章：</div>
             <div style="width: 200px;float: right;margin: 10px 100px; ">年   月   日</div>
            </td>
-        </tr>
+        </tr> -->
         <div class="ending">
             <p>备注：1、本表一式三份，专家验收后交双创学院</p>
             <p style="text-indent: 3em;">2、各栏目若不够填写，可自行加页，加页需紧附该栏目之后。</p>
@@ -485,6 +486,7 @@
 
 <script>
   import {getNowDate} from '@/components/tool/Date.js'
+  import beUpload from "@/components/tool/beUpload.vue";
 
     export default {
         // props: {
@@ -493,6 +495,8 @@
         //         required: true
         //     }
         // },
+        components: { beUpload},
+
         data() {
             return {
                nowTime:getNowDate(1),
@@ -546,13 +550,51 @@
                     pid:this.$route.query['pid'],
                 }).then(res=>{
                     // return console.log(res);
+
+                    let num=0
+                    res.data[1].forEach(i=>{            //计算出已经使用过的金钱
+                        // console.log(i);
+                        i['actualuse']=JSON.parse(i['actualuse'])
+                        for(let key in i['actualuse']){
+                        if (i['actualuse'][key]) {
+                            num = i['actualuse'][key]*1 + num
+                        }
+                        }
+                    })
+                    console.log(num);
+
                     let data=res.data[0]
                     data[0].course_student=JSON.parse(data[0].course_student)
                     data[0].course_teacher=JSON.parse(data[0].course_teacher)
                     data[0].multiSelectProject=JSON.parse(data[0].multiSelectProject)
-                    data[0].ClosingstatementData=JSON.parse(data[0].ClosingstatementData)
+
+                    if (data[0].ClosingstatementData) {
+                        data[0].ClosingstatementData=JSON.parse(data[0].ClosingstatementData)
+                    }else{
+                        data[0].ClosingstatementData={
+                            brief:'',
+                            business:'',
+                            competitionAccessory:'',
+                            conversionAccessory:'',
+                            exchangeAccessory:'',
+                            firmAccessory:'',
+                            innovate:'',
+                            plan:'',
+                            realityResult:[],
+                            resultAccessory:[],
+                            socialValue:[],
+                            talentsAccessory:[],
+                            targetPlan:[],
+                            taskAccessory:[], 
+                            technology:[]
+
+                        }
+                    }
+
                     data[0].money=JSON.parse(data[0].money)
                     this.myArrayProp=data
+                    this.myArrayProp[0].actualuse=num    //添加已经使用过的经费
+
                     console.log(this.myArrayProp);
                 }).catch(err=>{
                     console.log(err)
@@ -637,7 +679,7 @@
         mounted(){
             // console.log(this.myArrayProp);
             this.getData();
-            console.log(this.$route.query['tid']);
+            // console.log(this.$route.query['tid']);
         }
     }
 </script>

src/views/projectSettlement/components/studentProjectWordShow.vue

@@ -227,7 +227,7 @@
               论文版面费、专利及其他知识产权事务等费用。
             </td>
           </tr>
-          <tr>
+          <!-- <tr>
             <td>所在学院/部门意见</td><td colspan="6" class="textLeft" style="height:200px">
                 <div style="text-align: right;font-size: 18px;width: 80%;margin-bottom: 20px;">负责人签章：</div>
                 <div style="text-align: right;font-size: 18px;width: 90%;">年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日</div>
@@ -244,7 +244,7 @@
                 <div style="text-align: right;font-size: 18px;width: 80%;margin-bottom: 20px;">负责人签章：</div>
                 <div style="text-align: right;font-size: 18px;width: 90%;">年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日</div>
             </td>
-          </tr>
+          </tr> -->
         </table>
           <div class="notes">
             <span>备注：</span>

src/views/projectSettlement/components/studentProjectWordShowNew.vue

@@ -228,7 +228,7 @@
               论文版面费、专利及其他知识产权事务等费用。
             </td>
           </tr>
-          <tr>
+          <!-- <tr>
             <td>所在学院/部门意见</td><td colspan="6" class="textLeft" style="height:200px">
                 <div style="text-align: right;font-size: 18px;width: 80%;margin-bottom: 20px;">负责人签章：</div>
                 <div style="text-align: right;font-size: 18px;width: 90%;">年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日</div>
@@ -245,7 +245,7 @@
                 <div style="text-align: right;font-size: 18px;width: 80%;margin-bottom: 20px;">负责人签章：</div>
                 <div style="text-align: right;font-size: 18px;width: 90%;">年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日</div>
             </td>
-          </tr>
+          </tr> -->
           <div class="notes">
             <span>备注：</span>
             <span>1.表格可顺延或另附页。</span>

src/views/projectSettlement/projectSettlementDetailMain.vue

@@ -6,7 +6,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('/projectSettlement')">返回</el-button>
         </div>
         <hr>
         <div class="AppBar">