#

src/router/index.js

@@ -105,9 +105,9 @@ const routes = [{
 
             },
             { //新个人创客
-                name: 'newNomMarker',
-                path: '/newNomMarker',
-                component: () =>import ('@/views/activityManage/newNomMarker.vue'),
+                name: 'newNomMarkerActivity',
+                path: '/newNomMarkerActivity',
+                component: () =>import ('@/views/activityManage/newNomMarkerActivity.vue'),
                 meta: { isAuth: true }
 
             },

src/views/home.vue

@@ -78,7 +78,7 @@
               {label:"创客项目",goto:"/newStudentProjectApply"},
               {label:"活动申请",icon:"el-icon-wind-power",goto:"/makerActvity",group:[
                 {label:"创客活动",icon:"iconfont icon-shuben",goto:"/newMarkerActivity"},
-                {label:"个人创客",icon:"iconfont icon-shuben",goto:"/newNomMarker"},
+                {label:"个人创客",icon:"iconfont icon-shuben",goto:"/newNomMarkerActivity"},
               ]}]},
             {id:2,label:"事后汇总",goto:"/makerfund",icon:"iconfont icon-zijinguanli",group:[
               {label:"创客活动资金申请",goto:"/newMarkerfundApply"},

src/views/projectManage/ProjectManagement.vue

@@ -89,18 +89,150 @@
 
       </div>
       <div class="ProjectManagementQuery">
-        <el-input v-model="selectText" placeholder="请输入项目名称"></el-input>
-        <el-button type="primary" class="btn" size="mini">查询</el-button>
+        <el-input v-model="selectText" placeholder="请输入项目名称/编号"></el-input>
+        <el-button type="primary" class="btn" size="mini" @click="getData">查询</el-button>
       </div>
     </div>
 <!-- 搜索栏结束 -->
       
-      
+      <!-- 表格开始 -->
+    <div>
+      <el-table
+        ref="multipleTable"
+        :data="items"
+        tooltip-effect="dark"
+        stripe
+        class="fontSize"
+        :header-cell-style="{ background: '#f2f2f2',color:'#000' }">
+        <el-table-column
+          prop="ProjectNo"
+          label="项目编号"
+          align="center"
+          min-width="9%">
+        </el-table-column>
+        <el-table-column
+          prop="title"
+          label="项目名称"
+          align="center"
+          min-width="10%">
+        </el-table-column>
+        <el-table-column
+          prop="pro_leader"
+          align="center"
+          label="项目负责人"
+          min-width="9%">
+        </el-table-column>
+
+        <el-table-column
+          prop="dName"
+          align="center"
+          label="所在部门"
+          min-width="10%">
+          
+        </el-table-column>
+        <el-table-column
+          prop="tName"
+          align="center"
+          label="分类"
+          min-width="10%">
+        </el-table-column>
+        <el-table-column
+          prop="fund"
+          label="预算(万)"
+          align="center"
+          min-width="8%">
+          <template #default="scope">
+            <div>
+              {{ scope.row.fund/10000 }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="startTime"
+          align="center"
+          label="开始时间"
+          min-width="9%">
+          <template #default="scope">
+            <div>
+              {{ scope.row.startTime.split(' ')[0] }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="phone"
+          align="center"
+          label="联系电话"
+          min-width="10%">
+          <template #default="scope">
+            <div>
+              {{ scope.row.phone!=null||scope.row.phone==''?scope.row.phone:"-" }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="state"
+          label="状态"
+          align="center"
+          min-width="6%">
+          <template #default="scope">
+                <div>
+                    <!-- {{scope.row.name + (scope.row.status==0?"":"(已屏蔽)")}} -->
+                    <!-- {{ (scope.row.isupload==0?"未审核": scope.row.data==1?"正在审核":"已审核")  }} -->
+
+                    <span v-if="scope.row.isupload==0">未审核</span>
+                    <span v-if="scope.row.isupload==1">审核中</span>
+                    <span v-if="scope.row.isupload==2">进行中</span>
+                    <span v-if="scope.row.isupload==3">待结项</span>
+                    <span v-if="scope.row.isupload==4">已结项</span>
+
+                </div>
+            </template>
+        </el-table-column>
+        <el-table-column
+          prop="operation"
+          width="500"
+          align="center"
+          label="操作"
+          >
+          <template #default="scope">
+              <div class="operations">
+                <!-- <span @click="scheduleDetail(item.courseId,item.typeid)">进度详细</span>
+                <span @click="fundStatus(item.courseId)">资金情况</span>
+                <span v-show="item.isupload==2"  @click="finish(item.courseId,item.title)">结项</span>
+                <span v-show="item.isupload==3"  @click="amendFinish(item.courseId,item.title)" >修改结项</span>
+                <span v-show="item.isupload==4" style="color: gray;cursor: no-drop;">已结项</span>    -->
+                <el-button type="primary" @click="scheduleDetail(scope.row.courseId,scope.row.typeid)"   size="mini" >进度详细</el-button>
+                <el-button type="primary" @click="fundStatus(scope.row.courseId)"  size="mini" >资金情况</el-button>
+                <el-button type="primary" v-show="scope.row.isupload==2"  @click="finish(scope.row.courseId,scope.row.title)"   size="mini">结项</el-button>
+                <el-button type="primary" v-show="scope.row.isupload==3"  @click="amendFinish(scope.row.courseId,scope.row.title)" size="mini">修改结项</el-button>
+                <el-button type="primary" v-show="scope.row.isupload==4" disabled class="disa" size="mini">已结项</el-button>
+                <!-- {{ scope.row.isupload }} -->
+                        <!-- <el-button type="primary"  size="mini" @click="lookDetail(scope.row.courseId,scope.row.typeid)">查看详情</el-button>
+
+                        <el-button type="primary" v-show="scope.row.isupload==0" @click="audit(scope.row,0)"  size="mini" >审核</el-button>
+                        <el-button type="primary" v-show="scope.row.isupload==1 " class="disa" size="mini" >审核中</el-button>
+                        <el-button type="primary" v-show="scope.row.isupload==2"  class="disa"  size="mini">已审核</el-button>
+                        <el-button type="primary" v-show="scope.row.isupload==3" class="disa" size="mini">待结项</el-button>
+                        <el-button type="primary" v-show="scope.row.isupload==4" class="disa" size="mini">已结项</el-button>
+
+                        
+                        <el-button  v-show="scope.row.isupload==0" type="primary" class="disa" size="mini">审核</el-button> 
+                        <el-button  v-show="scope.row.isupload==1" type="primary" size="mini" @click="audit(scope.row,1)">审核1</el-button>
+                        <el-button  v-show="scope.row.isupload==2" type="primary" class="disa" size="mini">已审核</el-button>
+                        <el-button  v-show="scope.row.isupload==3" type="primary" class="disa" size="mini">待结项</el-button>
+                        <el-button  v-show="scope.row.isupload==4" type="primary" class="disa" size="mini">已结项</el-button>
+
+                        <el-button type="primary"  size="mini" @click="del(scope.row)">删除</el-button> -->
+              </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+<!-- 表格结束 -->
 <!-- 循环展示框列表开始 -->
-    <div class="projectBlock core_dialogue">
+    <!-- <div class="projectBlock core_dialogue">
       <div class="classBlock" v-for="(item,index) in items" :key="index">
         <div class="projectBlockPosition">
-          <!-- {{ item.isupload }} -->
           <span v-if="item.isupload==2">进行中</span>
           <span v-if="item.isupload==3">待结题</span>
           <span v-if="item.isupload==4">已结题</span>
@@ -120,16 +252,13 @@
             <div class="classBlockBtn">
               <span @click="scheduleDetail(item.courseId,item.typeid)">进度详细</span>
               <span @click="fundStatus(item.courseId)">资金情况</span>
-              <!-- <span v-show="item.isupload==0"  @click="$message.error('请先进行项目立项审核')">结项</span> -->
               <span v-show="item.isupload==2"  @click="finish(item.courseId,item.title)">结项</span>
               <span v-show="item.isupload==3"  @click="amendFinish(item.courseId,item.title)" >修改结项</span>
-              <span v-show="item.isupload==4" style="color: gray;cursor: no-drop;">已结项</span>
-        
-                          
+              <span v-show="item.isupload==4" style="color: gray;cursor: no-drop;">已结项</span>          
             </div>
        
       </div>
-    </div>
+    </div> -->
 <!-- 循环展示框列表结束 -->
 
     <!-- 完结对话框开始 -->
@@ -354,6 +483,7 @@ import { getNowDate } from '@/components/tool/Date';
             uid:this.$store.state.userInfo.userid,
             pid:val
           }).then(res=>{
+            console.log(res['data'])
             if(res.data[0].length>0 || res.data[1].length>0){
               this.checkActivityFinishData = res.data[0];
               this.checkFundFinishData = res.data[1];
@@ -396,6 +526,7 @@ import { getNowDate } from '@/components/tool/Date';
             .get(this.$store.state.api+'/SelectAllProjectManagement',param)
               .then(res=>{
                 let data=res.data;
+                console.log(data)
                 if (data[0].length==0 && data[5][0]['total'] != 0&&this.table.currentPage!=1) {
                   this.table.currentPage=1
                   return this.getData()
@@ -418,13 +549,6 @@ import { getNowDate } from '@/components/tool/Date';
         }
      },
      watch:{    //监视选择框的变化，实施刷新表格数据
-      selectText:{
-            handler(){
-              immediate:true
-              deep:true
-              this.getData()
-            }
-          }
       },
      mounted(){
       this.getData()   //页面加载完成后自动获取渲染数据

src/views/projectManage/ProjectManagementMain.vue

@@ -9,58 +9,61 @@
 
     <!-- 跳转导航开始 -->
         <div class="AppBar">
-            <!-- <div v-for="(item,index) in items" :key="index" @click="goto(index)" class="AppBarActive">{{ item.tit }}</div> -->
             <div v-for="(item,index) in items" :key="index" @click="goto(index)" class="AppBarActive">
                 {{ item.tit }}
                 <div :class="index==show?item.cl:''"></div>
             </div>
         </div>
-        <ProjectManagement1 v-if="show==0 && this.$route.query['Id']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"></ProjectManagement1>
-        <ProjectManagement2 v-if="show==1 && this.$route.query['Id']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"></ProjectManagement2>
+        <!-- <ProjectManagement1 v-if="show==0 && this.$route.query['Id']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"></ProjectManagement1> -->
+        <!-- <ProjectManagement2 v-if="show==1 && this.$route.query['Id']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"></ProjectManagement2> -->
 
         <!-- 特色创客空间建设 -->
-        <ProjectManagement1_MakerSpace v-if="show==0 && this.$route.query['Id']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/>
-        <ProjectManagement2_MakerSpace v-if="show==1 && this.$route.query['Id']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"></ProjectManagement2_MakerSpace>
+        <!-- <ProjectManagement1_MakerSpace v-if="show==0 && this.$route.query['Id']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/> -->
+        <!-- <ProjectManagement2_MakerSpace v-if="show==1 && this.$route.query['Id']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"></ProjectManagement2_MakerSpace> -->
 
-
-        <ProjectManagement3 :changeShow="goto" v-if="show==2"></ProjectManagement3>
+        <!-- 特色创客空间建设 -->
+        <MakerSpaceWordShow v-if="show==0 && this.$route.query['Id']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/>
+        <!-- 活动开展 -->
+        <ProjectManagement3 :changeShow="goto" v-if="show==1"></ProjectManagement3>
+        <!-- 活动开展详细 -->
         <ProjectManagement3_1 v-if="show==5"/>
-        <ProjectManagement4 v-if="show==3"></ProjectManagement4>
-        <ProjectManagement5 v-if="show==4"></ProjectManagement5>
+        <!-- 项目附件 -->
+        <!-- <ProjectManagement4 v-if="show==2"></ProjectManagement4> -->
+        <!-- 项目结题文件 -->
+        <ProjectManagement5 v-if="show==2"></ProjectManagement5>
     </div>
 </template>
 
 <script>
-    import ProjectManagement1 from './components/ProjectManagement1.vue'
-    import ProjectManagement2 from './components/ProjectManagement2.vue'
+    // import ProjectManagement1 from './components/ProjectManagement1.vue'
+    // import ProjectManagement2 from './components/ProjectManagement2.vue'
     import ProjectManagement3 from './components/ProjectManagement3.vue'
     import ProjectManagement3_1 from './components/ProjectManagement3_1.vue'
-    import ProjectManagement4 from './components/ProjectManagement4.vue'
+    // import ProjectManagement4 from './components/ProjectManagement4.vue'
     import ProjectManagement5 from './components/ProjectManagement5.vue'
 
-    //特色创客空间建设
-    import ProjectManagement1_MakerSpace from './components/ProjectManagement1_MakerSpace.vue'
-    import ProjectManagement2_MakerSpace from './components/ProjectManagement2_MakerSpace.vue'
-
+    // //特色创客空间建设
+    import MakerSpaceWordShow from './components/MakerSpaceWordShow.vue'
     export default {
         components:{
-            ProjectManagement1,
-            ProjectManagement2,
+            MakerSpaceWordShow,
+            // ProjectManagement1,
+            // ProjectManagement2,
             ProjectManagement3,
             ProjectManagement3_1,
-            ProjectManagement4,
+            // ProjectManagement4,
             ProjectManagement5,
-            ProjectManagement1_MakerSpace,
-            ProjectManagement2_MakerSpace,
+            // ProjectManagement1_MakerSpace,
+            // ProjectManagement2_MakerSpace,
         },
         data() {
             return {
                 show:0,
                 items:[
-                    {tit:'项目基本内容',cl:'pr1TitBass'},
-                    {tit:'项目详情',cl:'pr1TitBass'},
+                    {tit:'项目详细',cl:'pr1TitBass'},
+                    // {tit:'项目详情',cl:'pr1TitBass'},
                     {tit:'活动开展',cl:'pr1TitBass'},
-                    {tit:'项目附件',cl:'pr1TitBass'},
+                    // {tit:'项目附件',cl:'pr1TitBass'},
                     {tit:'项目结题附件',cl:'pr1TitBass'},
                 ]
             }

src/views/projectManage/components/MakerSpaceWordShow.vue

@@ -0,0 +1,786 @@
+<template>
+    <div id="MakerSpaceWord" 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 type="primary" @click="getWord">下载表格</el-button> -->
+    </div>
+    </template>
+      
+    <script>
+    // import {getMakerSpaceWord} from '@/components/tool/getWord'
+      export default {
+        data() {
+          return {
+            loading:false,
+            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: {
+            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;
+      }
+      // .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;
+      }
+    }
+    </style>

src/views/projectManage/components/ProjectManagement3.vue

@@ -83,7 +83,7 @@
           <template #default="scope">
               <div class="operations">
                       <el-button type="primary"  size="mini" @click="detail(scope.row.acId)" style="background: #477edd">查看详情</el-button>
-                      <el-button type="primary"  size="mini" @click='sqb' style="background: #477edd">申请表</el-button>
+                      <!-- <el-button type="primary"  size="mini" @click='sqb' style="background: #477edd">申请表</el-button> -->
               </div>
           </template>
         </el-table-column>
@@ -106,7 +106,6 @@
   </template>
   
   <script>
-  import downloadFile from '@/components/tool/downloadFile.js'
       export default {
         props:['changeShow'],
         data() {
@@ -121,9 +120,6 @@
           }
         },
         methods:{
-          sqb(){
-            downloadFile("/file/附件 2：创客专项资金项目申请表（创客活动）.doc","创客专项资金项目申请表（创客活动）.doc",(_b)=>this.loading = _b)
-          },
           getData(){
             this.loading = true;
             let param={
@@ -139,7 +135,6 @@
             this.ajax
                   .get(this.$store.state.api+'/GetAllActivity',param)
                   .then(res=>{
-                    console.log(res.data);
                     this.tableData=res.data[0]
                     this.table.total=res.data[4][0].total
                     this.loading = false;
@@ -150,8 +145,8 @@
           GetTime(data){
           let cdata = JSON.parse(data);
           if(cdata[0]==cdata[1])return cdata[0];
-          let sp1 = cdata[0].split('-')
-          let sp2  =cdata[1].split('-')
+          let sp1 = cdata[0].split(" ")[0].split('-')
+          let sp2  =cdata[1].split(" ")[0].split('-')
           if(sp1[0]==sp2[0]){
             if(sp1[1]==sp2[1]){
               return `${sp1[0]}-${sp1[1]}-${sp1[2]} 至 ${sp2[2]}`

src/views/projectManage/components/ProjectManagement3_1.vue

@@ -1,554 +1,106 @@
 <template>
   <!-- 项目管理 活动开展 查看详细-->
     <div class="ProjectManagement3_1" v-loading="loading">
-     <!-- 活动申请填写信息区域开始 -->
-      <div class="select">
-                <div class="selectTop">
-                  <div class="label">项目名称</div>
-                  <el-input v-model="selects.projectName" placeholder="请输入内容"></el-input>
-                </div>
-                <div class="selectMid">
-                  <div class="selectLeft">
-                      <div class="inpBlock" style="position: relative;">
-                          <div class="label">预算经费</div>
-                          <el-input v-model="selects.fund" disabled placeholder="请输入内容"></el-input>
-                          <div style="position: absolute;top: 8px;right: -30px;">(万)</div>
-                      </div>
-                      <div class="inpBlock">
-                          <div class="label">负责人</div>
-                          <el-input v-model="selects.leader" placeholder="请输入内容"></el-input>
-                      </div>
-                      <div class="inpBlock">
-                          <div class="label">所在部门</div>
-                          <el-select v-model="selects.department" style="width: 100%;" placeholder="请选择">
-                            <el-option
-                              v-for="item in selectInput"
-                              :key="item.id"
-                              :label="item.name"
-                              :value="item.id">
-                            </el-option>
-                          </el-select>
-                      </div>
-                      <div class="inpBlock">
-                          <div class="label">联系电话</div>
-                          <el-input v-model="selects.tel" placeholder="请输入内容"></el-input>
-                      </div>
-                  </div>
-
-                  <div class="selectRight">
-                    <div class="inpBlock">
-                          <div class="label">项目开始时间</div>
-                          <el-date-picker
-                            v-model="selects.beginDate"
-                            type="datetime"
-                            style="width: 100%;"
-                            placeholder="选择日期">
-                          </el-date-picker>
-                      </div>
-                      <div class="inpBlock">
-                          <div class="label">参与学生人数</div>
-                          <el-input v-model="selects.studentNum" placeholder="请输入内容"></el-input>
-                      </div>
-                      
-                  </div>
-                </div>
-      </div>
-      <!-- 活动申请填写信息区域结束 -->
-
-
-
-   <!-- 活动指导老师开始 -->
-   <div class="tabTit">
-                <div>
-                  <p>活动指导老师</p>
-                </div>
-                <el-button type="primary" @click="addTeacher" size="mini">添加教师</el-button>
-              </div>
-              <hr>
-              <el-table
-                :data="tableData"
-                tooltip-effect="dark"
-                stripe
-                class="fontSize"
-                :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
-                >
-                <!-- 数据根据prop进行遍历填充 -->
-                <el-table-column
-                  prop="Name"
-                  label="姓名"
-                  align="center"
-                  >
-                </el-table-column>
-                <el-table-column
-                  prop="work"
-                  label="工作单位"
-                  align="center"
-                  >
-                </el-table-column>
-  
-                <el-table-column
-                  prop="takeCharge"
-                  label="活动分工"
-                  align="center"
-                  >
-                </el-table-column>
-                
-                <el-table-column
-                  prop="operation"
-                  align="center"
-                  label="操作"
-                  >
-                  <template #default="scope">
-                      <div class="operations">
-                              <el-button type="primary" size="mini" @click="updateTeacher(scope.$index)" style="font-size: 14px;">修改</el-button>
-                              <el-button type="primary" size="mini" style="font-size: 14px;" @click="deleteRow(scope.$index)">删除</el-button>
-                      </div>
-                  </template>
-                </el-table-column>
-              </el-table>
-            <!-- 活动指导老师结束 -->
-
-
-    <!-- 多行文本框区域开始 -->
-      
-    <div class="tabTit">
-                 <div><p>活动介绍</p></div>
-            </div>
-              <el-input
-                type="textarea"
-                :rows="6"
-                resize="none"
-                style="color: black;font-size: 16px;font-weight: 600;"
-                placeholder="请输入内容"
-                v-model="selects.brief">
-              </el-input>
-      <div class="tabTit">
-            <div><p>活动计划</p></div>
-      </div>
-      <div class="textArea">
-        <vue-editor  :editorToolbar="customToolbar" v-model="textareaS[0]"></vue-editor>
-      </div>
-      <div class="tabTit">
-            <div><p>预期目标</p></div>
-      </div>
-      <div class="textArea">
-        <vue-editor  :editorToolbar="customToolbar" v-model="textareaS[1]"></vue-editor>
-
-      </div>
-      <div class="tabTit">
-            <div><p>活动受面</p></div>
-      </div>
-      <div class="textArea">
-        <vue-editor  :editorToolbar="customToolbar" v-model="textareaS[2]"></vue-editor>
-
-      </div>
-      <div class="tabTit">
-            <div><p>经费支出计划</p></div>
-      </div>
-      <div class="textArea">
-        <vue-editor  :editorToolbar="customToolbar" v-model="textareaS[3]"></vue-editor>
-      </div>
-    <!-- 多行文本框区域结束 -->
-    <div class="baseBtn">
-            <div class="blockWidth">
-              <el-button v-show="state==0" type="primary" class="backBtn"  @click="updateActivityDialog" >上传修改</el-button>
-              <el-button v-show="state!=0" disabled style="background: #ccc !important;border: 0;" type="primary" class="backBtn"  @click="updateActivityDialog" >上传修改</el-button>
-            </div>
-          </div>
-
-     <!--添加成员dialog对话框开始 -->
-     <el-dialog
-            :title="isAddMember?'添加指导老师':'修改指导老师'"
-            :visible.sync="addMemberDialog"
-            class="AddMember"
-            :before-close="handleClose">
-
-              <div class="littleBlock">
-                <div class="dialogLabel">姓名</div>
-                <div>
-                  <el-input v-model="Member.Name"></el-input>
-                </div>
-              </div>
-
-              <div class="littleBlock">
-                <div class="dialogLabel">工作单位</div>
-                <div>
-                  <el-input v-model="Member.work"></el-input>
-                </div>
-              </div>
-
-              <div class="littleBlock">
-                <div class="dialogLabel">活动分工</div>
-                <div>
-                  <el-input v-model="Member.takeCharge"></el-input>
-                </div>
-              </div>
-              <div slot="footer" class="footer">
-                <el-button v-show="isAddMember" type="primary" @click="commit" class="AllDialogBtn" >确认提交</el-button>
-                <el-button v-show="!isAddMember"  type="primary" @click="change" class="AllDialogBtn" >确认修改</el-button>
-                <el-button @click="handleClose" class="AllDialogBtn">取消</el-button>
-              </div>
-        </el-dialog>
-      <!--添加成员dialog对话框结束 -->
-      <!-- 修改对话框框开始 -->
-      <el-dialog
-          title="提示"
-          :visible.sync="updateActivity"
-          width="600px"
-          class="projectApplicationfundAddDialog"
-          :before-close="handleClose">
-          <div class="addDialogLogo">LOGO</div>
-          <div class="deleteContent">确定修改?</div>
-          <span slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="submitAll" class="AllDialogBtn">确认提交</el-button>
-            <el-button @click="handleClose"  class="AllDialogBtn">取消</el-button>
-          </span>
-        </el-dialog>
-      <!-- 提交对话框结束 -->
-      <!-- 删除成员对话框开始 -->
-      <el-dialog
-              title="删除指导老师"
-              :visible.sync="delMember"
-              width="600px"
-              class="delMemberDialog">
-              <span class="deleteContent">确定删除指导老师?</span>
-              <span slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="commitDelMember" class="AllDialogBtn">确认删除</el-button>
-                <el-button @click="handleClose" class="AllDialogBtn" >取消</el-button>
-              </span>
-            </el-dialog>
-      <!-- 删除成员对话框结束 -->
-
-
-
-
+        <markeractivityWordShow :wordData="wordData" :total="total"/>
     </div>
 </template>
 
   <script>
-  import { VueEditor } from "vue2-editor";
   // import { uuid } from 'vue-uuid';
+  import markeractivityWordShow from './markeractivityWordShow.vue'
       export default {
-        components:{
-          VueEditor,
-        },
+        components:{markeractivityWordShow},
         data() {
           return {
-            updateActivity:false,
             loading:false,
-            isAddMember:1,
-            state:0,
-            customToolbar: [
-              ["bold", "italic", "underline"], [{ list: "ordered" }, { list: "bullet" }],
-              [{ align: "" }, { align: "center" }, { align: "right"}, { align: "justify"}],
-              [{header:[false,1,2,3,4]}]
-            ],
-            iid:'',        //为删除框储存id
-          delMember:false,   //删除对话框
-          addMemberDialog:false,
-          tableData:[],  //活动指导老师列表
-          selects:{      //基础信息
-            projectName:'',
-            fund:'',
-            leader:'',
-            department:'',
-            tel:'',
-            beginDate:'',
-            studentNum:'',
-            brief:'',
-            classid:"",
-
-          },
-
-          textareaS:[],
-          selectInput: [], //部门下拉框
-          Member:{
-              // Id:"",
-              Name:'',
-              work:'',
-              takeCharge:''
-          },
+            wordData:{
+                  acId:"",//活动ID
+                  applicationDate:'',//申请日期
+                  associatedProjects:"",//关联项目
+                  ProjectName:"",//关联项目名称
+                  activityName:'',//活动名称
+                  pro_leader:"",//活动负责人
+                  college: '',//所在学院ID
+                  collegeName:"",//所在学院名称
+                  tel:'',//联系电话
+                  activityTime:"",//活动时间
+                  student:0,//参与学生人数
+                  member:[
+                    {name:"",collage:"",work:""},
+                    {name:"",collage:"",work:""},
+                    {name:"",collage:"",work:""},
+                    {name:"",collage:"",work:""},
+                    {name:"",collage:"",work:""},
+                  ],
+                  activityPlan:"",//活动计划
+                  expectations:"",//预期目标
+                  eventAudience:"",//活动受众面
+                  fundingPlan:"",//经费支出计划
+                  expenditureMothPlan:['','','','','','','','','','','',''],
+                  fund:{
+                    device:"",
+                    Material:"",
+                    processing:"",
+                    Collaboration:"",
+                    APPRAISAL:"",
+                    entery:"",
+                    activities:"",
+                    Transaction:"",
+                  },//预算经费
+                  type:0,//0 创客活动 1 个人创客
+                  state:1,//项目状态 0未审核 1待报销 2 已审核 3 已报销
+                }
           }
         },
         methods:{
-        
-              getData(){       //获取基础信息
+          getData(){
                 this.loading = true;
-                this.ajax.get(this.$store.state.api+"/GetActivityDetail",{
-                  uid:this.$store.state.userInfo.userid,
-                  // aId:this.$route.query["Id"]
-                  aId:this.$route.query["aid"]
-                }).then(res=>{
-                  if(!res.data[0][0])return this.$message.error("错误")
-                  let data = res.data[0][0];
-                  // console.log(data);
-                  this.selects.projectName=data.title;
-                  this.selects.fund=data.money;
-                  this.selects.leader=data.pro_leader;
-                  this.selects.tel=data.phone;
-                  this.selects.brief=data.brief
-                  this.selects.classid=data.classid
-                  this.selects.beginDate=data.create_at;
-                  this.selects.studentNum=data.students;
-                  this.selects.department=data.classid;
-                  this.tableData=JSON.parse(data.course_teacher)
-                  this.textareaS=JSON.parse(data.chapters)
-                  this.state=data.state
-                  this.loading = false;
+                let pram = {
+                    uid:this.$store.state.userInfo.userid,
+                    acid:this.$route.query['aid']
+                }
+                this.ajax.get(this.$store.state.api+"/getActivityWordData",pram).then(result=>{
+                    let data = result['data'][0][0]
+                    this.wordData['applicationDate'] = data['applicationDate'];
+                    this.wordData['associatedProjects'] = data['pid'];
+                    this.wordData['activityName'] = data['title'];
+                    this.wordData['pro_leader'] = data['pro_leader'];
+                    this.wordData['college'] = data['classid'];
+                    this.wordData['tel'] = data['phone']
+                    this.wordData['activityTime'] = JSON.parse(data['begin_at']);
+                    this.wordData['student'] = data['students'];
+                    this.wordData['member'] = JSON.parse(data['course_teacher']);
+                    this.wordData['expenditureMothPlan'] = JSON.parse(data['MothPlan']);
+                    this.wordData['fund'] = JSON.parse(data['fund']);
+                    this.wordData['type'] = data['type'];
+                    this.wordData['ProjectName'] = data['PName'];
+                    this.wordData['collegeName'] = data['CName'];
+                    this.wordData['acId'] = data['acId']
+                    this.wordData['state'] = data['state']
+                    this.wordData = {...this.wordData,...JSON.parse(data['chapters'])}
+                    this.loading = false;
                 }).catch(err=>{
-                  this.$message.error(err.message)
+                    console.log(err)
                 })
               },
-              getAllClass(){
-                    this.ajax.get(this.$store.state.api+"/SelectAllDepartment",{
-                        uid:this.$store.state.userInfo.userid,
-                    }).then(res=>{
-                        this.selectInput = res.data[0];
-                    }).catch(err=>{
-                        this.$message.error(err.message)
-                    })
-                },
-                handleClose(){
-                    this.addMemberDialog=false
-                    this.updateActivity=false
-                    this.delMember=false
-                    for(let i in this.Member)this.Member[i]='';
-                },
-                addTeacher(){    //添加老师对话框
-                  this.isAddMember=1;
-                  this.addMemberDialog=true;
-                },
-                commit(){  //确定添加老师
-                    if(this.Member.Name=='')return this.$message.error('请输入姓名')
-                    if(this.Member.work=='')return this.$message.error('请输入工作单位')
-                    if(this.Member.takeCharge=='')return this.$message.error('请输入活动分工')
-                    let k={}
-                    this.addMemberDialog=false;
-                    Object.assign(k,this.Member)
-                    this.tableData.push(k);
-                    this.$message.success('添加成功')
-                    for(let i in this.Member)this.Member[i]='';
-              },
-
-              updateTeacher(index){    //修改对话框出现
-                Object.assign(this.Member,this.tableData[index])
-                this.Member['index']=index      //在data中赋值这样谁都可以取到了
-                this.isAddMember=0;
-                this.addMemberDialog = true;
-              },
-              change(){    //确定修改老师
-                if(this.Member.Name=='')return this.$message.error('请输入姓名')
-                if(this.Member.work=='')return this.$message.error('请输入工作单位')
-                if(this.Member.takeCharge=='')return this.$message.error('请输入活动分工')
-
-                Object.assign(this.tableData[this.Member['index']],this.Member)     //this.Member['index']在显示框出现的时候赋值了
-                for(let i in this.Member)this.Member[i]='';
-                this.addMemberDialog = true;
-                this.$message({message:"修改成功",type:"success"})
-                this.addMemberDialog = false;
-              },
-
-              deleteRow(index){   //删除对话框出现
-                this.delMember=true
-                this.iid=index
-              },
-              commitDelMember(){    //确定删除老师
-                this.tableData.splice(this.iid,1)
-                // this.tableData = this.tableData.filter(item=>item.Id!=this.iid);
-                this.$message({message:"删除成功",type:"success"})
-                this.delMember=false
-              },
-              updateActivityDialog(){   //显示修改提交对话框
-                this.updateActivity=true
-              },
-              submitAll(){      //确定提交修改
-                  //保存修改
-                    const param = {
-                      uid:this.$store.state.userInfo.userid,
-                      aid:this.$route.query["aid"],
-                      tit:this.selects.projectName,
-                      con:this.selects.brief,
-                      leader:this.selects.leader,
-                      mon:this.selects.fund,
-                      stu:this.selects.studentNum,
-                      teacher:JSON.stringify(this.tableData),
-                      chap:JSON.stringify(this.textareaS),
-                      pid:this.$route.query['pid'],
-                      cid:this.selects.classid,
-                      ph:this.selects.tel,
-                      beginTime:JSON.stringify(this.selects.beginDate)
-                    }
-
-                    this.ajax.post(this.$store.state.api+"/UpdateActivity",param).then(res=>{
-                      if(res.data==1){
-                        this.$message.success("修改成功");
-                        this.updateActivity=false
-                        this.getData();
-                      }else{
-                        this.$message.error("修改失败"+res.data);
-                      }
-                    }).catch(err=>{
-                      this.$message.error(err.message)
-                    })
-                    console.log(this.tableData)
-              },
-              content(){
-                this.$router.push(`/ProjectManagement1?Id=${this.$route.query['Id']}&pid=${this.$route.query['pid']}`)
-              },
-              remark(){
-                this.$router.push(`/ProjectManagement2?Id=${this.$route.query['Id']}&pid=${this.$route.query['pid']}`)
-              },
-              remark2(){
-                this.$router.push(`/ProjectManagement3?Id=${this.$route.query['Id']}&pid=${this.$route.query['pid']}`)
-              },
-              remark4(){
-                this.$router.push(`/ProjectManagement4?Id=${this.$route.query['Id']}&pid=${this.$route.query['pid']}`)
-              },
-              remark5(){
-                this.$router.push(`/ProjectManagement5?Id=${this.$route.query['Id']}&pid=${this.$route.query['pid']}`)
-              },
-              backBtn2(){
-                this.$router.push('/ProjectManagement1')
-              },
-              // handleSelectionChange(val) {
-              //   this.multipleSelection = val;
-              // },
-         
+             
+        },
+        computed:{
+            total() {
+              let num = 0;
+              for(let i in this.wordData['fund'])num += Number(this.wordData['fund'][i]);
+              return num;
+              // return (this.wordData.fund.facility*1 + this.wordData.fund.materials*1+this.wordData.fund.process*1+ this.input*1+this.wordData.fund.authenticate*1+ this.wordData.fund.match*1+this.wordData.fund.activity*1+this.wordData.fund.affair*1)/10000
+            }
         },
         mounted(){
           this.getData();
-          this. getAllClass();
-          // console.log(this.$route.query["Id"]);
         }
       }
   </script>
 
   <style lang="less">
    
-    .projectApplicationfundAddDialog{  //提交对话框开始
- 
-      .el-dialog{
-        border-radius:5px ;
-        overflow: hidden;
-      }
-      
-      .deleteContent{
-        width: 100%;
-        text-align: center;
-        font-size: 22px;
-        color: #000;
-      }
-      .addDialogLogo{
-        width: 60px;
-        height: 30px;
-        border-radius: 5px;
-        display: flex;
-        justify-content: center;
-        line-height: 30px;
-        background: #f2f2f2;
-        position: absolute;
-        left: 20px; top: 15px; 
-      }
-      .el-dialog__header{
-        background: #32455b;
-      }
-      .el-dialog__title{
-        color:#fff;
-        display: flex;
-        justify-content: center;
-        font-size: 18px;
-        position: relative;
-        top: -2px;
-      }
-      .addDialogMid{
-        box-sizing: border-box;
-        padding:0 60px 0 10px;
-        .addDialogTit{
-          display: flex;
-          span{
-            width: 80px;
-            line-height: 40px;
-            text-align: left;
-          }
-        }
-      .addDialogTit1{
-        display: flex;
-        justify-content: space-between;
-        margin-bottom: 15px;
-      }
-      .addDialogTit2{
-        margin-top: 10px;
-        font-size: 18px;
-        color: #000;
-        text-indent: 2em;
-      }
-      .addDialogCon{
-        margin-top: 20px;
-      }
-      }
-      .dialog-footer{
-      display: flex;
-      justify-content: center;
-      // .btn5{
-      //   height: 40px;
-      //   font-size: 16px;
-      //   background: #0e72e6;
-      //   width: 200px;
-      // }
-      }
-      }
-
-    .delMemberDialog{    //删除对话框
-            font-size: 18px;
-            .el-dialog{
-              border-radius: 5px;
-              overflow: hidden;
-            }
-            .deleteContent{
-              font-size: 22px;
-              color: #000;
-            }
-            .el-dialog__header{
-              background: #32455b;
-              display: flex;
-              justify-content: center;
-            }
-            .el-dialog__title{
-              color:#fff;
-              display: flex;
-              justify-content: center;
-              font-size: 18px;
-              position: relative;
-              top: -2px;
-            }
-            .el-dialog__body{
-              display: flex;
-              justify-content: center;
-            }
-            // .addDialogMid{
-            //   box-sizing: border-box;
-            //   padding:0 60px 0 10px;
-            //   .addDialogTit{
-            //     display: flex;
-            //     span{
-            //       width: 80px;
-            //       font-size: 16px;
-            //       line-height: 40px;
-            //       text-align: left;
-                  
-            //     }
-            //   }
- 
-            // }
-            .dialog-footer{
-              display: flex;
-              justify-content: center;
-              box-sizing: border-box;
-              // .btn5{
-              //   font-size: 16px;
-              // }
-            }
-          }
   </style>
 
   

src/views/projectManage/components/ProjectManagement5.vue

@@ -4,8 +4,8 @@
 
       <div class="pmInp">
           <!-- <el-button type="primary" class="btn" @click="addFile" size="mini">上传文件</el-button> -->
-          <beUpload  @getFile="getFile" v-show="state==2|| state==3" :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload>
-          <el-button  v-show="state==4" style="background: #ccc !important;cursor: no-drop;color: #fff !important;border: 0;font-size: 16px;">上传文件</el-button>
+          <beUpload  @getFile="getFile" v-show="state==3" :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload>
+          <el-button  v-show="state==4 || state==2" style="background: #ccc !important;cursor: no-drop;color: #fff !important;border: 0;font-size: 16px;">上传文件</el-button>
           <!-- <el-button v-show="state==1" style="background: #ccc !important;cursor: no-drop;color: #fff !important;border: 0;font-size: 16px;">上传文件</el-button> -->
 
         </div>

src/views/projectManage/components/markeractivityWordShow.vue

@@ -0,0 +1,293 @@
+<template>
+    <div id="MarkeractivityWord">
+        <div id="title">
+            <div class="school">深圳技师学院</div>
+            <div class="wordTitle">创客专项资金及项目申请表（{{wordData['type']==0?'创客活动':"个人创客"}}）</div>
+            <div class="date">申请日期：{{wordData.applicationDate}}</div>
+        </div>
+        <table border="1" cellspacing="0" class="table">
+            <tr id="one" v-if="wordData['type']==0">
+              <td colspan="4">关联项目</td>
+              <td colspan="12" v-text="wordData['ProjectName']"></td>
+            </tr>
+            <tr id="two">
+                <td colspan="4">活动名称</td>
+                <td colspan="5" v-text="wordData['activityName']"></td>
+                <td colspan="3">预算经费</td>
+                <td @click="goto('#fund')" colspan="4" v-text="total"></td>
+            </tr>
+            <tr id="three">
+                <td colspan="4">项目负责人</td><td colspan="3" v-text="wordData['pro_leader']"></td>
+                <td colspan="2">所在部门</td><td colspan="3" v-text="wordData['collegeName']"></td>
+                <td colspan="2">联系电话</td><td colspan="3" v-text="wordData['tel']"></td>
+            </tr>
+            <tr id="four">
+                <td colspan="4">活动时间</td>
+                <td colspan="5" v-text="wordData['activityTime'][0]+' 至 '+wordData['activityTime'][1]"></td>
+                <td colspan="3">参与学生人数</td><td colspan="5" v-text="wordData['student']"></td>
+            </tr>
+            
+            <tr id="five">
+                <td colspan="2" :rowspan="wordData['member'].length+1"><p>活</p> <p>动</p> <p>指</p> <p>导</p> <p>老</p> <p>师</p></td><td colspan="2">姓名</td><td colspan="3">工作单位/部门</td><td colspan="9">项目分工</td>
+            </tr>
+            <tr v-for="(item,index) in wordData['member']" :key="index+'b'">
+                <td colspan="2" style="border-left: none;" v-text="item['name']"></td>
+                <td colspan="3" v-text="item['collage']"></td>
+                <td colspan="10" v-text="item['work']"></td>
+            </tr>
+            <tr class="textLeft" id="six">
+                <td colspan="2"><p>活动</p><br> <p>计划</p></td><td style="text-align: left;vertical-align: top;height: 200px;" colspan="15" v-text="wordData['activityPlan']"></td>
+            </tr>
+            <tr class="textLeft" id="seven">
+                <td colspan="2"><p>预期</p><br><p>目标</p> </td><td colspan="15" style="text-align: left;vertical-align: top;height: 200px;" v-text="wordData['expectations']"></td>
+            </tr>
+            <tr class="textLeft" id="nine">
+                <td colspan="2"><p>活动受</p><br> <p>众面</p></td><td style="text-align: left;vertical-align: top;height: 200px;" colspan="15" >
+                    <p>参与学生范围：</p>
+                    <span v-text="wordData['eventAudience']"></span>
+                </td>
+            </tr>
+            <!-- <tr class="textLeft">
+                <td colspan="15" style="text-align: left;border-left: none;">
+                  <p>二、创新点</p>
+                    <el-input
+                      type="textarea"
+                      :rows="6"
+                      style="width: 100%;"
+                      resize="none"
+                      v-model="input">
+                    </el-input>
+                </td>
+            </tr> -->
+
+           
+            <tr class="textLeft" id="ten">
+                <td colspan="2"><p>经费</p><br><p>支出</p> <br><p>计划</p></td><td colspan="15" style="text-align: left;vertical-align: top;height: 200px;" v-text="wordData['fundingPlan']"></td>
+            </tr>
+            <tr id="fund">
+                <td rowspan="14"><p>预</p> <p>算</p> <p>经</p> <p>费</p></td>
+            </tr>
+            <tr>
+                <td rowspan="4" style="border-left: none;">总经费</td><td rowspan="4" colspan="2" >{{total}}元</td>
+            </tr>
+            <tr>
+                <td colspan="12" style="border-left: none;">经费月支出计划 (元)</td>
+            </tr>
+            <tr>
+              <td style="border-left: none;">第1个月</td><td>第2个月</td><td>第3个月</td><td>第4个月</td><td>第5个月</td><td>第6个月</td><td>第7个月</td><td>第8个月</td><td>第9个月</td><td>第10个月</td><td>第11个月</td><td>第12个月</td>
+            </tr>
+            <tr>
+                <td v-for="(item,index) in wordData['expenditureMothPlan']" :key="index" style="border-left: none;" v-text="wordData['expenditureMothPlan'][index]"></td>
+            </tr>
+            <tr>
+                <td colspan="4" style="border-left: none;">支出类别</td><td colspan="4">支出项目</td><td colspan="2">金额（元）</td><td colspan="5">备注</td>
+            </tr>
+            <tr>
+              <td rowspan="4" colspan="4" style="border-left: none;">直接经费</td>
+              <td colspan="4">小型仪器设备费</td>
+              <td colspan="2" v-text="wordData['fund']['device']"></td>
+              <td colspan="5">
+                项目开展所需的小型专用仪器设备、工具、配件购置或租赁费用。
+              </td>
+            </tr>
+            <tr>
+              <td colspan="4" style="border-left: none;">材料费</td>
+              <td colspan="2" v-text="wordData['fund']['Material']"></td>
+              <td colspan="5">项目开展需消耗的各种原材料、辅助材料等低值易耗品的采购费用。</td>
+            </tr>
+            <tr>
+              <td colspan="4" style="border-left: none;">测试化验加工费</td>
+              <td colspan="2" v-text="wordData['fund']['processing']"></td>
+              <td colspan="5">项目开展过程中支付给外单位的检验、测试、化验、计算、分析及加工费等费用。</td>
+            </tr>
+            <tr>
+              <td colspan="4" style="border-left: none;">项目协作费</td>
+              <td colspan="2" v-text="wordData['fund']['Collaboration']"></td>
+              <td colspan="5">按合同规定支付给协作单位的费用</td>
+            </tr>
+            <tr>
+              <td rowspan="4" colspan="4" style="border-left: none;">间接经费</td>
+              <td colspan="4">项目成果鉴定费</td>
+              <td colspan="2" v-text="wordData['fund']['APPRAISAL']"></td>
+              <td colspan="5">学术会务费、评审费、鉴定费、成果集制作费等费用。</td>
+            </tr>
+            <tr>
+              <td colspan="4" style="border-left: none;">参展参赛费</td>
+              <td colspan="2" v-text="wordData['fund']['entery']"></td>
+              <td colspan="5">参加创客展会、竞赛等所需的报名费、展位费、布展费、宣传推广费及差旅费等费用。</td>
+            </tr>
+            <tr>
+              <td colspan="4" style="border-left: none;">创客交流活动费</td>
+              <td colspan="2" v-text="wordData['fund']['activities']"></td>
+              <td colspan="5">创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。</td>
+            </tr>
+            <tr>
+              <td colspan="4" style="border-left: none;">知识产权事务费</td>
+              <td colspan="2" v-text="wordData['fund']['Transaction']"></td>
+              <td colspan="5">论文版面费、专利及其他知识产权事务等费用。</td>
+            </tr>
+
+            <tr class="textLeft">
+                <td><p>所在部</p> <p>门意见</p></td><td colspan="15" 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>
+                </td>
+            </tr>
+            <tr>
+                <td v-for="(item,index) in 16" :key="index+'c'" style="border: none;"></td>
+            </tr>
+        </table>
+          <div class="notes">
+            <span>备注：</span>
+            <span>如表格不够可顺延或另附页。</span>
+            <!-- <div style="width: 300px;margin: 20px auto;display: flex;justify-content: space-between;">
+                <el-button @click="applyButton" style="width: 120px;margin: 20px auto;"  type="primary">提交活动</el-button>
+                <el-button style="width: 120px;margin: 20px auto;" type="primary">下载表单</el-button>
+            </div> -->
+          </div>
+    </div>
+    </template>
+      
+    <script>
+    
+      export default {
+        props:['wordData','total'],
+        data() {
+          return {
+
+            }
+        },
+        methods: {
+          goto(str){
+            document.querySelector(str).scrollIntoView({ behavior: "smooth" });
+          },
+        },
+        
+        computed:{   //经费总合
+
+        },
+        mounted(){
+        }
+      };
+    </script>
+      
+    <style lang="less" scoped>
+
+    
+    #MarkeractivityWord{
+        width: 100%;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        background-color: #ffff;
+        margin: 0;
+        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: 500;
+                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;
+            }
+        }
+        .table{
+            border: none;
+            border-top: solid 1px black;
+           
+            tr{
+              position: relative;
+            td{
+              border: none;
+              border-bottom: solid 1px black;
+              border-right: solid 1px black;
+              height: 50px;
+              text-align: center;
+              line-height: 30px;
+              width: 80px;
+              box-sizing: border-box;
+              padding: 5px;
+              &:nth-child(1){
+                border-left:  solid 1px black;
+              }
+              p{
+                font-weight: 600;
+              }
+              :deep(.el-select .el-input .el-select__caret){
+                display: none;
+              }
+              :deep(.el-textarea__inner){
+                // padding: 0;
+                border: none ;
+                border-radius: 0px;
+                text-align: center;
+                font-size: 16px;
+              }
+              :deep(.el-input__inner){
+                border: none ;
+                &::-webkit-outer-spin-button,&::-webkit-inner-spin-button{
+                  -webkit-appearance: none !important;
+                }
+                &[type='number'] {
+                  -moz-appearance: textfield;
+                }
+                
+                border-radius: 0px;
+                text-align: center;
+                font-size: 16px;
+              }
+
+            }
+          }
+            .textLeft{
+              :deep(.el-textarea__inner){
+                // padding: 0;
+                border: none ;
+                border-radius: 0px;
+                text-align: left !important;
+                font-size: 16px;
+              }
+            }
+          }
+        .notes{
+          width: 100%;
+          display: flex;
+          flex-direction:column;
+        }
+    }
+    .operate{
+        right:-85px;
+        width:85px;
+        height: 50px;
+        display:flex;
+        justify-content:space-between;
+        align-items:center;
+        position:absolute;
+        .el-button{
+          max-width:10px;
+          display:flex;
+          justify-content:center;
+          align-items:center;
+          margin-left:10px;
+        }
+    }
+    </style>

src/views/projectSettlement/components/MakerSpaceWordShow.vue

@@ -0,0 +1,786 @@
+<template>
+    <div id="MakerSpaceWord" 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 type="primary" @click="getWord">下载表格</el-button> -->
+    </div>
+    </template>
+      
+    <script>
+    // import {getMakerSpaceWord} from '@/components/tool/getWord'
+      export default {
+        data() {
+          return {
+            loading:false,
+            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: {
+            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;
+      }
+      // .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;
+      }
+    }
+    </style>

src/views/projectSettlement/projectSettlement.vue

@@ -279,8 +279,6 @@
             page:this.table.currentPage,  //当前页
             lim:this.table.packageSize  //限制获取几条数据
           }
-          // return console.log(param);
-          // console.log(param)
           this.ajax    
             .get(this.$store.state.api+'/SelectAllProjectSettlement',param)
               .then(res=>{

src/views/projectSettlement/projectSettlementDetailMain.vue

@@ -10,51 +10,52 @@
         </div>
         <hr>
         <div class="AppBar">
-            <div @click="pageState=0">项目基本内容<div v-if="pageState==0" class="pr1TitBass"></div></div>
-            <div @click="pageState=1">项目详情<div v-if="pageState==1" class="pr1TitBass"></div></div>
-            <div @click="pageState=2">项目附件<div v-if="pageState==2" class="pr1TitBass"></div></div>
-            <div @click="pageState=3">项目结题附件<div v-if="pageState==3" class="pr1TitBass"></div></div>
-            <div @click="pageState=4">结项评语<div v-if="pageState==4" class="pr1TitBass"></div></div>
+            <!-- <div @click="pageState=0">项目基本内容<div v-if="pageState==0" class="pr1TitBass"></div></div> -->
+            <div @click="pageState=0">项目详情<div v-if="pageState==0" class="pr1TitBass"></div></div>
+            <!-- <div @click="pageState=2">项目附件<div v-if="pageState==2" class="pr1TitBass"></div></div> -->
+            <div @click="pageState=1">项目结题附件<div v-if="pageState==1" class="pr1TitBass"></div></div>
+            <!-- <div @click="pageState=4">结项评语<div v-if="pageState==4" class="pr1TitBass"></div></div> -->
         </div>
         <!-- 特色创客空间建设 -->
-        <projectSettlementDetailBase_MakerSpace v-if="pageState==0 && $route.query['tid']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/>
-        <projectSettlementDetail_MakerSpace v-if="pageState==1 && $route.query['tid']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/>
+        <MakerSpaceWordShowVue v-if="pageState==0 && $route.query['tid']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/>
+        <!-- <projectSettlementDetailBase_MakerSpace v-if="pageState==0 && $route.query['tid']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/> -->
+        <!-- <projectSettlementDetail_MakerSpace v-if="pageState==1 && $route.query['tid']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/> -->
         
         <!-- 学生创业项目 -->
-        <projectSettlementDetailBase_StudentVue v-if="pageState==0 && $route.query['tid']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'" ></projectSettlementDetailBase_StudentVue>
-        <projectSettlementDetail_Student v-if="pageState==1 && $route.query['tid']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"></projectSettlementDetail_Student>
+        <!-- <projectSettlementDetailBase_StudentVue v-if="pageState==0 && $route.query['tid']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'" ></projectSettlementDetailBase_StudentVue> -->
+        <!-- <projectSettlementDetail_Student v-if="pageState==1 && $route.query['tid']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"></projectSettlementDetail_Student> -->
 
         <!-- 项目附件 -->
-        <projectSettlementDetailAnnex v-if="pageState==2"/>
+        <!-- <projectSettlementDetailAnnex v-if="pageState==2"/> -->
         <!-- 项目结题附件 -->
-        <projectSettlementDetailConclusion v-if="pageState==3"/>
+        <projectSettlementDetailConclusion v-if="pageState==1"/>
         <!-- 项目评语 -->
-        <projectSettlementDetailComment v-if="pageState==4"/>
+        <!-- <projectSettlementDetailComment v-if="pageState==4"/> -->
       </div>
     </template>
     
     <script>
     //学生创业项目
-    import projectSettlementDetailBase_StudentVue from './components/projectSettlementDetailBase_Student.vue';
-    import projectSettlementDetail_Student from './components/projectSettlementDetail_Student.vue'
+    // import projectSettlementDetailBase_StudentVue from './components/projectSettlementDetailBase_Student.vue';
+    // import projectSettlementDetail_Student from './components/projectSettlementDetail_Student.vue'
 
     //特色创客空间建设项目
-    import projectSettlementDetailBase_MakerSpace from './components/projectSettlementDetailBase_MakerSpace.vue';
-    import projectSettlementDetail_MakerSpace from './components/projectSettlementDetail_MakerSpace.vue';
+    import MakerSpaceWordShowVue from './components/MakerSpaceWordShow.vue';
 
     //共同的项目附件
-    import projectSettlementDetailAnnex from './components/projectSettlementDetailAnnex.vue';
+    // import projectSettlementDetailAnnex from './components/projectSettlementDetailAnnex.vue';
     import projectSettlementDetailConclusion from './components/projectSettlementDetailConclusion.vue';
-    import projectSettlementDetailComment from './components/projectSettlementDetailComment.vue';
+    // import projectSettlementDetailComment from './components/projectSettlementDetailComment.vue';
         export default {
         components:{
-            projectSettlementDetailBase_MakerSpace,
-            projectSettlementDetail_MakerSpace,
-            projectSettlementDetailAnnex,
+          MakerSpaceWordShowVue,
+            // projectSettlementDetailBase_MakerSpace,
+            // projectSettlementDetail_MakerSpace,
+            // projectSettlementDetailAnnex,
             projectSettlementDetailConclusion,
-            projectSettlementDetailComment,
-            projectSettlementDetailBase_StudentVue,
-            projectSettlementDetail_Student
+            // projectSettlementDetailComment,
+            // projectSettlementDetailBase_StudentVue,
+            // projectSettlementDetail_Student
         },
         data() {
           return {

src/views/resultShow/components/resultDetail_MakerSpace.vue

@@ -3,9 +3,9 @@
     <div class="rs1apply" v-loading="loading">
         <!-- 头部展示区开始 -->
         <div class="header">
-            <div class="imgBlock">
+            <!-- <div class="imgBlock">
                 <img :src="TitleMessage.image" alt="">
-            </div>
+            </div> -->
             <div class="headerConcent">
                 <div class="rsHead1Tit">项目名称：<span>{{ TitleMessage.title }}</span></div>
                 <div class="rsHead2Tit rsHead3Tit">
@@ -48,10 +48,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>
@@ -310,7 +310,7 @@
                                       <i class="el-icon-date"></i>
                                       活动开展时间
                                     </template>
-                                    {{ JSON.parse(item.begin_at)[0]+"\t至\t"+JSON.parse(item.begin_at)[1] }}
+                                    {{ JSON.parse(item.begin_at)[0].split(' ')[0]+"\t至\t"+JSON.parse(item.begin_at)[1].split(" ")[0] }}
                                   </el-descriptions-item>
                                   <el-descriptions-item>
                                     <template slot="label">
@@ -340,7 +340,7 @@
                                   border
                                   style="width: 100%">
                                   <el-table-column
-                                    prop="Name"
+                                    prop="name"
                                     label="姓名"
                                     align="center">
                                   </el-table-column>
@@ -350,44 +350,38 @@
                                     align="center">
                                   </el-table-column>
                                   <el-table-column
-                                    prop="takeCharge"
+                                    prop="collage"
                                     align="center"
                                     label="活动分工">
                                   </el-table-column>
                                 </el-table>
                             </div>
-                            <div class="brief_title MarginTop30px">
+                            <!-- <div class="brief_title MarginTop30px">
                                 <img src="@/assets/anliDetail/proOverTwo.png" alt="">
                                 <span>活动简介</span>
                             </div>
-                            <div class="TextView" v-text="item.brief">
-                                <!-- {{ item.brief }} -->
-                            </div>
+                            <div class="TextView" v-text="item.brief"></div> -->
 
                             <div class="brief_title MarginTop30px">
                                 <!-- <img src="@/assets/anliDetail/jdTitle.png" alt=""> -->
                                 <i class="el-icon-edit-outline"></i>
                                 <span>活动计划</span>
                             </div>
-                            <div class="TextView" v-text="JSON.parse(item.chapters)[0]">
-                                <!-- <VueEditor v-model="JSON.parse(item.chapters)[0]" :disabled="true"></VueEditor> -->
+                            <div class="TextView" v-text="JSON.parse(item.chapters)['activityPlan']">
                             </div>
 
                             <div class="brief_title MarginTop30px">
-                                <!-- <img src="@/assets/anliDetail/jdTitle.png" alt=""> -->
                                 <i class="el-icon-data-line"></i>
                                 <span>预期目标</span>
                             </div>
-                            <div class="TextView" v-text="JSON.parse(item.chapters)[1]">
-                                <!-- <VueEditor v-model="JSON.parse(item.chapters)[1]" :disabled="true"></VueEditor> -->
+                            <div class="TextView" v-text="JSON.parse(item.chapters)['expectations']">
                             </div>
 
                             <div class="brief_title MarginTop30px">
-                                <!-- <img src="@/assets/anliDetail/jdTitle.png" alt=""> -->
                                 <i class="el-icon-pie-chart"></i>
                                 <span>活动受面</span>
                             </div>
-                            <div class="TextView" v-text="JSON.parse(item.chapters)[2]">
+                            <div class="TextView" v-text="JSON.parse(item.chapters)['eventAudience']">
                                 <!-- <VueEditor v-model="JSON.parse(item.chapters)[2]" :disabled="true"></VueEditor> -->
                             </div>
 
@@ -396,7 +390,7 @@
                                 <i class="el-icon-money"></i>
                                 <span>经费支出计划</span>
                             </div>
-                            <div class="TextView" v-text="JSON.parse(item.chapters)[3]">
+                            <div class="TextView" v-text="JSON.parse(item.chapters)['fundingPlan']">
                                 <!-- <VueEditor v-model="JSON.parse(item.chapters)[3]" :disabled="true"></VueEditor> -->
                             </div>
                             <div class="brief_title MarginTop30px" v-if="ActivityLookFile[index].url!=''">
@@ -441,7 +435,7 @@
             </div>
             <!-- 活动开展结束 -->
             <!-- 项目附件开始 -->
-            <div class="BaseMessage" v-show="pageState==3">
+            <!-- <div class="BaseMessage" v-show="pageState==3">
                 <div class="BaseTitle" type="3">
                     <span>项目附件</span>
                 </div>
@@ -473,8 +467,8 @@
                         </div>
                     </div>
                 </div>
-                </div>
-
+                </div> -->
+            <!-- 项目附件结束 -->
             <!-- 项目中期报告开始 -->
             <div class="BaseMessage" v-show="pageState==4">
                 
@@ -565,22 +559,26 @@
                     this.TitleMessage['student'] = JSON.parse(this.TitleMessage['student']);
                     //项目详细
                     this.DetailMessage = JSON.parse(FormData[1][0]['chapters']);
+                    //项目附件
                     this.ProjectFile = JSON.parse(FormData[2][0]['projectFile'])
                     if(this.ProjectFile!=null)this.ProjectLookFile = this.ProjectFile[0] 
                     else this.ProjectLookFile = {url:'',type:""};
+                    //项目结题附件
                     this.ProjectEndFile = JSON.parse(FormData[3][0]['endFile']);
                     if(this.ProjectEndFile!=null)this.ProjectEndLookFile = this.ProjectEndFile[0];
                     else this.ProjectEndLookFile = {url:"",type:""}
                     if(FormData[4][0]['title']!=null){
                         this.AllActivity = FormData[4]
                         this.AllActivity.forEach(item=>{
+                            // item['chapter'] = JSON.parse(item['chapter']);
                             if(item['reportFile']!=null&&item['reportFile']!=''){
                                 item['reportFile'] = JSON.parse(item['reportFile']);
                                 this.ActivityLookFile.push({url:item['reportFile'][0].url,fileName:item['reportFile'][0].fileName})
                             }else this.ActivityLookFile.push({url:"",type:""})
                         })
                     };
-                    if(JSON.parse(FormData[5][0]['endProjectRemark'])!=null)this.endProjectRemark = JSON.parse(FormData[5][0]['endProjectRemark']);
+                    console.log(this.AllActivity)
+                    // if(JSON.parse(FormData[5][0]['endProjectRemark'])!=null)this.endProjectRemark = JSON.parse(FormData[5][0]['endProjectRemark']);
                     this.loading = false;
                 }).catch(err=>{
                     console.log(err)

src/views/resultShow/resultsShow.vue

@@ -74,15 +74,114 @@
       </div>
       </div>
       <div class="ProjectManagementQuery">
-        <el-input v-model="input" @change="getData" style="width:240px" placeholder="请输入内容"></el-input>
+        <el-input v-model="input" style="width:240px" placeholder="请输入项目名称/编号"></el-input>
         <el-button type="primary" class="btn" @click="getData" size="mini">查询</el-button>
       </div>
     </div>
     <!-- 搜索栏结束 -->
     
-    
+    <!-- 表格开始 -->
+    <div>
+      <el-table
+        ref="multipleTable"
+        :data="items"
+        tooltip-effect="dark"
+        stripe
+        class="fontSize"
+        :header-cell-style="{ background: '#f2f2f2',color:'#000' }">
+        <el-table-column
+          prop="ProjectNo"
+          label="项目编号"
+          align="center"
+          min-width="9%">
+        </el-table-column>
+        <el-table-column
+          prop="title"
+          label="项目名称"
+          align="center"
+          min-width="10%">
+        </el-table-column>
+        <el-table-column
+          prop="pro_leader"
+          align="center"
+          label="项目负责人"
+          min-width="9%">
+        </el-table-column>
+
+        <el-table-column
+          prop="dName"
+          align="center"
+          label="所在部门"
+          min-width="10%">
+          
+        </el-table-column>
+        <el-table-column
+          prop="tName"
+          align="center"
+          label="分类"
+          min-width="10%">
+        </el-table-column>
+        <el-table-column
+          prop="fund"
+          label="预算(万)"
+          align="center"
+          min-width="8%">
+          <template #default="scope">
+            <div>
+              {{ scope.row.fund/10000 }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="startTime"
+          align="center"
+          label="开始时间"
+          min-width="9%">
+          <template #default="scope">
+            <div>
+              {{ scope.row.startTime }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="endTime"
+          label="结项时间"
+          align="center"
+          min-width="9%">
+          <template #default="scope">
+                <div>
+                  {{ scope.row.endTime}}
+                </div>
+            </template>
+        </el-table-column>
+        <el-table-column
+          prop="phone"
+          align="center"
+          label="联系电话"
+          min-width="10%">
+          <template #default="scope">
+            <div>
+              {{ scope.row.phone!=null||scope.row.phone==''?scope.row.phone:"-" }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="operation"
+          width="200"
+          align="center"
+          label="操作"
+          >
+          <template #default="scope">
+              <div class="operations">
+                <el-button type="primary" @click="rsBtn(scope.row['courseId'],scope.row['typeid'])">成果展示</el-button>
+              </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+<!-- 表格结束 -->
     <!-- 循环展示框列表开始 -->
-    <div class="classBlocks core_dialogue">
+    <!-- <div class="classBlocks core_dialogue">
       <div class="classBlock" v-for="(item,index) in items" :key="index">
         <div class="projectBlockPosition">
           已结题
@@ -103,7 +202,7 @@
               <el-button type="primary" class="bt1" size="mini" @click="rsBtn(item['courseId'],item['typeid'])">项目成果展示</el-button>
         </div>
       </div>
-    </div>
+    </div> -->
     <!-- 展示框列表结束 -->
 
 
@@ -204,15 +303,6 @@
         }
      
       },
-      watch:{
-          input:{
-              handler(){
-                immediate:true
-                deep:true
-                this.getData()
-              }
-          }
-      },
       mounted(){
         this.getData();
       }