#

src/App.vue

@@ -550,7 +550,7 @@
 
 
       .disa{   //禁用按钮样式
-            background-color: #c8c9cc !important;border-color: #c8c9cc;cursor: no-drop;
+            background-color: #c8c9cc !important;border-color: #c8c9cc;cursor: no-drop !important;
         }
       .fontSize{   //所有表格字体大小
         margin-top: 15px;

src/components/studentMakerProjectPreview.vue

@@ -1,174 +1,225 @@
 <template>
-    <!-- <div id="WordPreview"> -->
+    <div id="WordPreview">
       <div id="title">
         <div class="school">深圳技师学院</div>
-        <div class="wordTitle">二级学院特色创客空间建设项目立项申报书</div>
-        <div class="date">申请日期：{{wordData['year']}}年 {{wordData['month']}}月 {{wordData['day']}}日</div>
+        <div class="wordTitle">学 生 创 客 项 目 申 报 书</div>
+        <div class="date">申请日期：年 月 {{wordData['day']}}日</div>
       </div>
-      <!-- <div id="table">
+      <div id="table">
         <div class="han">
-          <div class="label">项目名称</div><div class="value">{{wordData['projectName']}}</div>
-          <div class="label">所在学院</div><div class="value">{{wordData['college']}}</div>
+          <div class="label">项目名称</div><div class="value" style="width: 80%;">{{ wordData.projectName }}</div>
+          <!-- <div class="label">所在学院</div><div class="value"></div> -->
         </div>
         <div class="status">
           <div class="statusLabel">项目状态</div>
           <div class="ValueDescribe">
             <div class="statusHan">
-              <div class="DescribeLabel">{{wordData['ed']}}已建设</div><div class="DescribeValue">指二级学院已获得政府或学校资助（例：设计学院、信通学院、珠宝学院），已有双创空间（创客实践室）场地、设备设施并已投入运营，需对空间环境优化、规章制度建设、小型设施设备添置、创客项目物料增补，需拓展创客项目培训、辅导，创客讲座、沙龙、论坛，创客路演、竞赛、集市及成果参评、参展等方面的工作而提出的资助申请。</div>
+              <div class="DescribeLabel">{{wordData.ing }}创意组</div><div class="DescribeValue">立项项目为新立项项目，项目成果应具有较好的创意和较为成型的产品原型或能提供较好的商业模式，产生较好的社会效益。</div>
             </div>
             <div class="statusHan">
-              <div class="DescribeLabel">{{wordData['ing']}}待建设</div><div class="DescribeValue">指二级学院拟立项开展学院特色创客空间建设项目，需进行项目前期调研论证、场馆规划、空间图纸设计、设备选型等方面的工作而进行的资助申请。</div>
+              <div class="DescribeLabel">{{wordData.ed }}初创组</div><div class="DescribeValue">立项项目为学校已结题学生创客项目或已入驻学校创业孵化基地的学生初创企业项目（毕业两年内），项目成果应为原结题项目基础上的技术升级、企业注册、规模扩张。</div>
             </div>
           </div>
         </div>
         <div class="han">
-          <div class="label">项目起始时间</div><div class="value">{{wordData['begin_at']}}</div>
-          <div class="label">计划完成时间</div><div class="value">{{wordData['plannedEnd_at']}}</div>
+          <div class="label">优先支持项目（可多选）</div>
+          <div class="value" style="display: flex;justify-content: space-around;flex-wrap: wrap;width: 80%;">
+              <div>{{ wordData.multiSelectProject.includes(1)?"√":"□" }}大赛选拔项目</div>
+              <div>{{ wordData.multiSelectProject.includes(2)?"√":"□" }}落地注册项目</div>
+              <div>{{ wordData.multiSelectProject.includes(3)?"√":"□" }}社会征集项目</div>
+              <div>{{ wordData.multiSelectProject.includes(4)?"√":"□" }}产业命题项目</div>
+          </div>
+          <!-- <div class="label">计划完成时间</div><div class="value"></div> -->
+        </div>
+        <div class="han">
+          <div class="label">美丽校园改造项目（特色项目）</div>
+          <div class="value" style="display: flex;justify-content: space-around;flex-wrap: wrap;width: 80%;">
+            <div>{{ wordData.schoolRemould.includes(1)?"√":"□" }}校园安全项目</div>
+            <div>{{ wordData.schoolRemould.includes(2)?"√":"□" }}环境治理项目</div>
+            <div>{{ wordData.schoolRemould.includes(3)?"√":"□" }}校园服务项目</div>
+            <div>{{ wordData.schoolRemould.includes(4)?"√":"□" }}文创装置项目</div>
+
+          </div>
+        </div>
+
+        <div class="han">
+          <div class="label">项目申请人</div>
+          <div class="value" >{{ wordData.projectApplyperson.includes(1)?"√":"□" }}在校学生</div>
+          <div class="value">{{ wordData.projectApplyperson.includes(2)?"√":"□" }}入驻学校孵化基地的初创企业法人</div>
+        </div>
+        <div class="han">
+          <div class="label">申 请 人 姓 名</div><div class="value" >{{ wordData.pro_leader }}</div>
+          <div class="label">所在学院/公司</div><div class="value" >{{ wordData.department }}</div>
+          <div class="label">联系电话</div><div class="value" style="width: 20%;">{{ wordData.tel }}</div>
         </div>
         <div class="han">
-          <div class="label">项目负责人</div><div class="value">{{wordData['pro_leader']}}</div>
-          <div class="label">学院牵头领导</div><div class="value">{{wordData['lead_leader']}}</div>
+          <div class="label">项 目 起 始 时 间</div><div class="value" style="width: 30%;">{{ wordData.begin_at }}</div>
+          <div class="label">计划完成时间</div><div class="value" style="width: 20%;">{{ wordData.plannedEnd_at }}</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 class="label">项 目 组 人 数</div><div class="value">{{ wordData.studentNum }}</div>
+          <div class="label">参与学生人数</div><div class="value">{{ wordData.plannedEnd_at }}</div>
+          <div class="label">参与教师人数</div><div class="value">{{ wordData.plannedEnd_at }}</div>
         </div>
         <div class="member">
           <div class="memberLabel">
-            <span>项目组</span>
-            <span>教师团队</span>
-            <span>（团队3人以上，</span>
-            <span>至少应包含1名教</span>
-            <span>研室主任）</span> -->
+            项目组教师团队（团队3人以上，至少应包含1名教研室主任）
             <!-- 项目组<br/>教师团队<br/>（团队3人以上，<br/>至少应包含1名教<br/>研室主任） -->
-          <!-- </div> -->
-          <!-- <div class="memberTable">
+          </div>
+          <div class="memberTable">
             <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" style="width: 9.2%;">姓 名</div>
+              <div class="memberValue">所在学院/部门/专业</div>
               <div class="memberValue">项目组角色分工</div>
             </div>
-            <div class="memberHan" v-for="(item,index) in wordData['teacher']" :key="index">
+            <div class="memberHan" v-for="(item,index) in 2" :key="index">
+              <div class="memberValue" style="width: 9.2%;">nihao</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">{{item['name']}}</div>
               <div class="memberValue">{{item['speciality']}}</div>
               <div class="memberValue">{{item['title']}}</div>
               <div class="memberValue">{{ item['education'] }}</div>
               <div class="memberValue">{{ item['section'] }}</div>
               <div class="memberValue">{{ item['work'] }}</div>
-            </div>
-          </div> -->
-        <!-- </div>
+            </div> -->
+          </div>
+        </div>
         <div class="member">
           <div class="memberLabel">
-            <span>项目组</span>
-            <span>学生团队</span>
-            <span>（团队5人以上，</span>
-            <span>学生团队年级结构</span>
-            <span>安排合理）</span> -->
+            项目组学生团队（团队5人以上，学生团队年级结构安排合理）
             <!-- 项目组<br/>教师团队<br/>（团队3人以上，<br/>至少应包含1名教<br/>研室主任） -->
-          <!-- </div>
+          </div>
           <div class="memberTable">
             <div class="memberHan">
-              <div class="memberValue">姓名</div>
-              <div class="memberValue">班级</div>
-              <div class="memberValue">年龄</div>
+              <div class="memberValue" style="width: 9.2%;">姓 名</div>
+              <div class="memberValue">所在学院/部门/专业</div>
               <div class="memberValue">项目组角色分工</div>
             </div>
-            <div class="memberHan" v-for="(item,index) in wordData['student']" :key="index">
+            <div class="memberHan" v-for="(item,index) in 2" :key="index">
+              <div class="memberValue" style="width: 9.2%;">nihao</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">{{item['name']}}</div>
               <div class="memberValue">{{ item['class'] }}</div>
               <div class="memberValue">{{ item['age'] }}</div>
-              <div class="memberValue">{{item['work']}}</div>
-            </div>
+              <div class="memberValue">{{item['work']}}</div> -->
+            <!-- </div> -->
           </div>
         </div>
         <div class="chapters">
           <div class="chaptersLabel">
-            <span>项目</span><span>建设</span><span>内容</span><span>及</span><span>目标</span><span>（说明项目建设内</span><span>容、拟解决的关键</span><span>问题、创新之处、</span><span>主要建设指标）</span>
+            <span>研发内容</span>
           </div>
           <div class="chaptersTable">
               <div class="chaptersValue">
                 <span>项目简介(200-300字)</span><br/>
-                {{wordData['brief']}}
+                
               </div>
               <div class="chaptersValue">
-                <span>建设内容（空间优化/场馆规划方面拟解决的关键问题及主要建设指标）</span><br/>
-                {{wordData['Construction']}}
+                <span>项目研发背景</span><br/>
+
+              </div>
+              <div class="chaptersValue">
+                <span>项目创新点</span><br/>
+
+              </div>
+              <div class="chaptersValue">
+                <span>技术研发路线</span><br/>
+
+              </div>
+              <div class="chaptersValue">
+                <span>项目应用场景</span><br/>
+
               </div>
           </div>
         </div>
         <div class="chapters">
           <div class="chaptersLabel">
-            <span>项目</span><span>建设</span><span>论证</span><span>报告</span>
+            <span>商业模式及社会价值</span>
           </div>
           <div class="chaptersTable">
               <div class="chaptersValue">
-                <span>立项依据(说明本项目的目的、意义以及国内外高校现状、市场预测和发展趋势，预期达到的目标，研究的预期效果分析，成果受益面)</span><br/>
-                {{wordData['ProjectBasis']}}
+                <span>项目商业模式/社会价值</span><br/>
+                
               </div>
           </div>
         </div>
         <div class="chapters">
           <div class="chaptersLabel">
-            <span>预期</span><span>成果</span><span>(项目预期成果、</span><span>数量及形式，结题</span><span>时：须附项目研究</span><span>报告)</span>
+            <span>团队优势</span>
           </div>
           <div class="chaptersTable">
               <div class="chaptersValue">
-                <span>创客空间物理环境、制度建设及软件设施建设情况（环境优化/制度完善/设施改造）</span><br/>
-                {{wordData['development']}}
+                <span>团队构成及优势</span><br/>
+                
+              </div>
+          </div>
+        </div>
+        <div class="chapters">
+          <div class="chaptersLabel">
+            <span>研发成本</span>
+          </div>
+          <div class="chaptersTable">
+              <div class="chaptersValue">
+                <span>研发成本来源及构成</span><br/>
+                
+              </div>
+          </div>
+        </div>
+        <div class="chapters">
+          <div class="chaptersLabel">
+            <span>预期成果</span>
+          </div>
+          <div class="chaptersTable">
+              <div class="chaptersValue">
+                <span>项目预期成果、数量及形式（产品原型/发明专利/双创竞赛/成果转化/社会效益</span><br/>
+                
               </div>
               <div class="chaptersValue">
                 <span>学生创客工作室建设情况（工作室数量及活动开展情况）</span><br/>
-                {{wordData['studio']}}
+                
               </div>
               <div class="chaptersValue">
-                <span>学生创客团队（人才）培养预期成果、数量</span><br/>
-                {{wordData['studentTeam']}}
+                <span>学生创客人才培养预期成果、数量（教师填写）</span><br/>
+                
               </div>
               <div class="chaptersValue">
                 <span>学生创客活动组织实施情况</span><br/>
-                {{wordData['studentActivities']}}
+               
               </div>
               <div class="chaptersValue">
-                <span>学生创客团队孵化、转化创业项目情况</span><br/>
-                {{wordData['Transforming']}}
+                <span>项目预期孵化、转化创业项目情况</span><br/>
+               
               </div>
           </div>
         </div>
         <div class="chapters">
           <div class="chaptersLabel">
-            <span>立项</span>
-            <span>基础</span>
-            <span>及</span>
-            <span>条件</span>
-            <span>(说明已开展的相</span>
-            <span>关研究及基础准备</span>
-            <span>工作，已具备的设</span>
-            <span>备场地条件和技术</span>
-            <span>力量，尚缺少的条</span>
-            <span>件和拟解决的途</span>
-            <span>径)</span>
+           实施计划
           </div>
           <div class="chaptersTable">
               <div class="chaptersValue">
-                <span>基础条件（物理环境/设备设施/项目实施/活动开展/技术力量/社会资源）</span><br/>
-                {{wordData['condition']}}
+                <span>实施计划</span><br/>
+                
               </div>
           </div>
         </div>
 
-        <div class="fund" v-for="(item,index) in wordData['fund']" :key="index">
+        <!-- <div class="fund" v-for="(item,index) in wordData['fund']" :key="index"> -->
+        <div class="fund">
           <div class="fundTitle">
             预算<br/>经费
           </div>
           <div class="fundTable">
             <div class="fundTotal">
               <div class="fundLabel">总经费</div>
-              <div class="fundValue">{{item['total']}}元</div>
+              <div class="fundValue">元</div>
             </div>
             <div class="fundHeader">
               <div class="HeaderLabel">支出类别</div>
@@ -181,26 +232,26 @@
               <div class="fundDataHan">
                 <div class="fundDataLie">
                   <div class="fundDataValue">小型仪器设备费</div>
-                  <div class="fundDataValue">{{ item['device'] }}</div>
-                  <div class="fundDataValue">{{item['deviceRemarks']}}</div>
+                  <div class="fundDataValue"></div>
+                  <div class="fundDataValue"></div>
                 </div>
 
                 <div class="fundDataLie">
                   <div class="fundDataValue">材料费</div>
-                  <div class="fundDataValue">{{ item['Material'] }}</div>
-                  <div class="fundDataValue">{{ item['MaterialRemarks'] }}</div>
+                  <div class="fundDataValue"></div>
+                  <div class="fundDataValue"></div>
                 </div>
 
                 <div class="fundDataLie">
                   <div class="fundDataValue">测试化验加工费</div>
-                  <div class="fundDataValue">{{item['processing']}}</div>
-                  <div class="fundDataValue">{{item['processingRemarks']}}</div>
+                  <div class="fundDataValue"></div>
+                  <div class="fundDataValue"></div>
                 </div>
 
                 <div class="fundDataLie">
                   <div class="fundDataValue">项目协作费</div>
-                  <div class="fundDataValue">{{item['Collaboration']}}</div>
-                  <div class="fundDataValue">{{item['CollaborationRemarks']}}</div>
+                  <div class="fundDataValue"></div>
+                  <div class="fundDataValue"></div>
                 </div>
                
               </div>
@@ -211,26 +262,26 @@
               <div class="fundDataHan">
                 <div class="fundDataLie">
                   <div class="fundDataValue">项目成果鉴定费</div>
-                  <div class="fundDataValue">{{item['APPRAISAL']}}</div>
-                  <div class="fundDataValue">{{item['APPRAISALRemarks']}}</div>
+                  <div class="fundDataValue"></div>
+                  <div class="fundDataValue"></div>
                 </div>
 
                 <div class="fundDataLie">
                   <div class="fundDataValue">参展参赛费</div>
-                  <div class="fundDataValue">{{item['entery']}}</div>
-                  <div class="fundDataValue">{{item['enteryRemarks']}}</div>
+                  <div class="fundDataValue"></div>
+                  <div class="fundDataValue"></div>
                 </div>
 
                 <div class="fundDataLie">
                   <div class="fundDataValue">创客交流活动费</div>
-                  <div class="fundDataValue">{{item['activities']}}</div>
-                  <div class="fundDataValue">{{item['activitiesRemarks']}}</div>
+                  <div class="fundDataValue"></div>
+                  <div class="fundDataValue"></div>
                 </div>
 
                 <div class="fundDataLie">
                   <div class="fundDataValue">知识产权事务费</div>
-                  <div class="fundDataValue">{{item['Transaction']}}</div>
-                  <div class="fundDataValue">{{item['TransactionRemarks']}}</div>
+                  <div class="fundDataValue"></div>
+                  <div class="fundDataValue"></div>
                 </div>
                
               </div>
@@ -266,15 +317,15 @@
               <div class="opinionDate">年 月 日</div>
             </div>
           </div>
-        </div> -->
+        </div>
 
-      <!-- </div> -->
-      <!-- <div class="notes">
+      </div>
+      <div class="notes">
         <span>备注：</span>
         <span>1.表格可顺延或另附页。</span>
         <span>2.项目申报需附相关佐证材料。</span>
-      </div> -->
-    <!-- </div> -->
+      </div>
+    </div>
 </template>
   
 <script>
@@ -283,33 +334,38 @@ export default {
   props:["data"],
   data() {
     return {
+      // data:{},
       wordData:{
-        year:"",  //申请日期年
-        month:"",   //申请日期月
-        day:"",     //申请日期日
-        ing:"", //已建设
-        ed:"",  //待建设
+        // year:"",  //申请日期年
+        // month:"",   //申请日期月
+        // day:"",     //申请日期日
+        ing:"", //创意组
+        ed:"",  //初创组
         projectName:"",//项目名称
-        college:"",//
-        begin_at:"",//项目开始时间
-        plannedEnd_at:"",//计划完成时间
-        pro_leader:"",//项目负责人
-        lead_leader:"",//学院牵头领导
-        people:"",//项目组人数
+        multiSelectProject:[],  //优先支持项目
+        schoolRemould:'',
+        projectApplyperson:'',
+        department:'',
+        tel:'',
+        begin_at:'',
+        plannedEnd_at:'',
+        pro_leader:"",//申请人姓名
+        // lead_leader:"",//学院牵头领导
+        // people:"",//项目组人数
         teacherNum:"",//参与教师人数
         studentNum:"",//参与学生人数
         teacher:[],   //教师组//name：姓名  speciality：专业  title：职称 education：学历    section：所在教研室    work：项目组角色分工
         student:[],   //学生组//name：姓名    class：班级 age：年龄   work：项目组任务分工
-        brief:"",//项目简介
-        Construction:"",//建设内容
-        ProjectBasis:"",//立项依据
-        development:"",//创客空间物理环境、制度建设及软件设施建设情况
-        studio:"",//学生创客工作室建设情况
-        studentTeam:"",//学生创客团队（人才）培养预期成果、数量
-        studentActivities:"",//学生创客活动组织实施情况
-        Transforming:"",//学生创客团队孵化、转化创业项目情况
-        condition:"",//立 项基 础及条 件
-        fund:[],//预算经费
+        // brief:"",//项目简介
+        // Construction:"",//建设内容
+        // ProjectBasis:"",//立项依据
+        // development:"",//创客空间物理环境、制度建设及软件设施建设情况
+        // studio:"",//学生创客工作室建设情况
+        // studentTeam:"",//学生创客团队（人才）培养预期成果、数量
+        // studentActivities:"",//学生创客活动组织实施情况
+        // Transforming:"",//学生创客团队孵化、转化创业项目情况
+        // condition:"",//立 项基 础及条 件
+        // fund:[],//预算经费
         //total：总经费     
         //小型仪器设备费：device        deviceRemarks
         //材料费：Material             MaterialRemarks
@@ -325,116 +381,129 @@ export default {
   methods:{
     handleData(){
       //处理项目数据
+      // return console.log(this.data);
       let data = this.data[0];
-      let fund = this.data[1];
-      data['chapters'] = JSON.parse(data['chapters']);
+      console.log(this.data);
+
+      let nowDate = getNowDate().split(' ')[0]
+      // console.log(nowDate);
+      // return console.log(data);
+      // let fund = this.data[1];
+      // data['chapters'] = JSON.parse(data['chapters']);
       data['course_teacher'] = JSON.parse(data['course_teacher']);
       data['course_student'] = JSON.parse(data['course_student']);
       //处理资金使用情况
-      let fundDataArray = [];
-            fund.forEach(item=>{
-                let fundData = {
-                    total:"",
-                    device:"",deviceRemarks:"",
-                    Material:"",MaterialRemarks:"",
-                    processing:"",processingRemarks:"",
-                    Collaboration:"",CollaborationRemarks:"",
-                    APPRAISAL:"",APPRAISALRemarks:"",
-                    entery:"",enteryRemarks:"",
-                    activities:"",activitiesRemarks:"",
-                    Transaction:"",TransactionRemarks:""
-                }
-                //直接经费
-                let direct = JSON.parse(item['directFund']);
-                //间接经费
-                let indirect = JSON.parse(item['indirectFund']);
+      // let fundDataArray = [];
+      //       fund.forEach(item=>{
+      //           let fundData = {
+      //               total:"",
+      //               device:"",deviceRemarks:"",
+      //               Material:"",MaterialRemarks:"",
+      //               processing:"",processingRemarks:"",
+      //               Collaboration:"",CollaborationRemarks:"",
+      //               APPRAISAL:"",APPRAISALRemarks:"",
+      //               entery:"",enteryRemarks:"",
+      //               activities:"",activitiesRemarks:"",
+      //               Transaction:"",TransactionRemarks:""
+      //           }
+      //           //直接经费
+      //           let direct = JSON.parse(item['directFund']);
+      //           //间接经费
+      //           let indirect = JSON.parse(item['indirectFund']);
     
-                direct.forEach(item2=>{
-                    if (item2['directFundData']==1) {
-                        fundData['device'] = direct.filter(item=>item['directFundData']==1)[0]['budget'];
-                        // console.log(fundData['device']);
-                        fundData['deviceRemarks'] = direct.filter(item=>item['directFundData']==1)[0]['reason'];
-                    }
+      //           direct.forEach(item2=>{
+      //               if (item2['directFundData']==1) {
+      //                   fundData['device'] = direct.filter(item=>item['directFundData']==1)[0]['budget'];
+      //                   // console.log(fundData['device']);
+      //                   fundData['deviceRemarks'] = direct.filter(item=>item['directFundData']==1)[0]['reason'];
+      //               }
     
-                    if (item2['directFundData']==2) {
-                        fundData['Material'] = direct.filter(item=>item['directFundData']==2)[0]['budget']
-                        fundData['MaterialRemarks'] = direct.filter(item=>item['directFundData']==2)[0]['reason'];
-                    }
+      //               if (item2['directFundData']==2) {
+      //                   fundData['Material'] = direct.filter(item=>item['directFundData']==2)[0]['budget']
+      //                   fundData['MaterialRemarks'] = direct.filter(item=>item['directFundData']==2)[0]['reason'];
+      //               }
                     
-                    if (item2['directFundData']==3) {
-                        fundData['processing'] = direct.filter(item=>item['directFundData']==3)[0]['budget']
-                        fundData['processingRemarks'] = direct.filter(item=>item['directFundData']==3)[0]['reason'];
-                    }
+      //               if (item2['directFundData']==3) {
+      //                   fundData['processing'] = direct.filter(item=>item['directFundData']==3)[0]['budget']
+      //                   fundData['processingRemarks'] = direct.filter(item=>item['directFundData']==3)[0]['reason'];
+      //               }
                     
         
-                    if (item2['directFundData']==4) {
-                        fundData['Collaboration'] = direct.filter(item=>item['directFundData']==4)[0]['budget']
-                        fundData['CollaborationRemarks'] = direct.filter(item=>item['directFundData']==4)[0]['reason'];
-                    }
+      //               if (item2['directFundData']==4) {
+      //                   fundData['Collaboration'] = direct.filter(item=>item['directFundData']==4)[0]['budget']
+      //                   fundData['CollaborationRemarks'] = direct.filter(item=>item['directFundData']==4)[0]['reason'];
+      //               }
     
-                })
+      //           })
                 
-                indirect.forEach(item3=>{
-                    if (item3['indirectFundData']==1) {
-                        fundData['APPRAISAL'] = indirect.filter(item=>item['indirectFundData']==1)[0]['budget']
-                        fundData['APPRAISALRemarks'] = indirect.filter(item=>item['indirectFundData']==1)[0]['reason'];
-                    }
+      //           indirect.forEach(item3=>{
+      //               if (item3['indirectFundData']==1) {
+      //                   fundData['APPRAISAL'] = indirect.filter(item=>item['indirectFundData']==1)[0]['budget']
+      //                   fundData['APPRAISALRemarks'] = indirect.filter(item=>item['indirectFundData']==1)[0]['reason'];
+      //               }
     
-                    if (item3['indirectFundData']==2) {
-                        fundData['entery'] = indirect.filter(item=>item['indirectFundData']==2)[0]['budget']
-                        fundData['enteryRemarks'] = indirect.filter(item=>item['indirectFundData']==2)[0]['reason'];
-                    }
+      //               if (item3['indirectFundData']==2) {
+      //                   fundData['entery'] = indirect.filter(item=>item['indirectFundData']==2)[0]['budget']
+      //                   fundData['enteryRemarks'] = indirect.filter(item=>item['indirectFundData']==2)[0]['reason'];
+      //               }
     
-                    if (item3['indirectFundData']==3) {
-                        fundData['activities'] = indirect.filter(item=>item['indirectFundData']==3)[0]['budget']
-                        fundData['activitiesRemarks'] = indirect.filter(item=>item['indirectFundData']==3)[0]['reason'];
-                    }
+      //               if (item3['indirectFundData']==3) {
+      //                   fundData['activities'] = indirect.filter(item=>item['indirectFundData']==3)[0]['budget']
+      //                   fundData['activitiesRemarks'] = indirect.filter(item=>item['indirectFundData']==3)[0]['reason'];
+      //               }
     
-                    if (item3['indirectFundData']==4) {
-                        fundData['Transaction'] = indirect.filter(item=>item['indirectFundData']==4)[0]['budget']
-                        fundData['TransactionRemarks'] = indirect.filter(item=>item['indirectFundData']==4)[0]['reason'];
+      //               if (item3['indirectFundData']==4) {
+      //                   fundData['Transaction'] = indirect.filter(item=>item['indirectFundData']==4)[0]['budget']
+      //                   fundData['TransactionRemarks'] = indirect.filter(item=>item['indirectFundData']==4)[0]['reason'];
         
-                    }
-                })
+      //               }
+      //           })
     
-                fundData['total'] = Number(fundData['device'])+Number(fundData['Material'])+Number(fundData['processing'])+Number(fundData['Collaboration'])+Number(fundData['APPRAISAL'])+Number(fundData['entery'])+Number(fundData['activities'])+Number(fundData['Transaction']);
+      //           fundData['total'] = Number(fundData['device'])+Number(fundData['Material'])+Number(fundData['processing'])+Number(fundData['Collaboration'])+Number(fundData['APPRAISAL'])+Number(fundData['entery'])+Number(fundData['activities'])+Number(fundData['Transaction']);
     
-                fundDataArray.push(fundData);
-            })
+      //           fundDataArray.push(fundData);
+      //       })
             
-            //去除标签
-            for(let i in data['chapters']){
-                data['chapters'][i]=data['chapters'][i].replace(/<[^>]+>/g,"");
-            }
+      //       //去除标签
+      //       for(let i in data['chapters']){
+      //           data['chapters'][i]=data['chapters'][i].replace(/<[^>]+>/g,"");
+      //       }
 
-            let nowDate = getNowDate().split(' ')[0]
             this.wordData = {
-                year:nowDate.split('-')[0],  //申请日期年
-                month:nowDate.split('-')[1],   //申请日期月
-                day:nowDate.split('-')[2],     //申请日期日
-                ing:data['typeName']==0?"√":"□", //已建设
-                ed:data['typeName']==0?"□":"√",  //待建设
+                // year:nowDate.split('-')[0],  //申请日期年
+                // month:nowDate.split('-')[1],   //申请日期月
+                // day:nowDate.split('-')[2],     //申请日期日
+                ing:data['typeName']=='ed917c55-f51d-11ed-a3f6-509a4c5b67cf'?"√":"□", //创意组
+                ed:data['typeName']=='f3068e26-f51d-11ed-a3f6-509a4c5b67cf'?"√":"□",  //初创组
                 projectName:data['title'],//项目名称
-                college:data['name'],//
-                begin_at:data['begin_at'],//项目开始时间
-                plannedEnd_at:data['plannedEnd_at'],//计划完成时间
-                pro_leader:data['pro_leader'],//项目负责人
-                lead_leader:data['lead_leader'],//学院牵头领导
-                people:(data['course_teacher'].length+data['course_student'].length),//项目组人数
+                multiSelectProject:JSON.parse(data['multiSelectProject']),
+                schoolRemould:data['schoolRemould'],
+                projectApplyperson:data['projectApplyperson'],
+                pro_leader:data['pro_leader'],
+                department:data['name'],
+                tel:data['phone'],
+                plannedEnd_at:data['plannedEnd_at'],
+                begin_at:data['begin_at'],
+                // college:data['name'],//
+                // begin_at:data['begin_at'],//项目开始时间
+                // plannedEnd_at:data['plannedEnd_at'],//计划完成时间
+                // pro_leader:data['pro_leader'],//项目负责人
+                // lead_leader:data['lead_leader'],//学院牵头领导
+                // people:(data['course_teacher'].length+data['course_student'].length),//项目组人数
                 teacherNum:data['course_teacher'].length,//参与教师人数
                 studentNum:data['course_student'].length,//参与学生人数
                 teacher:data['course_teacher'],   //教师组//name：姓名  speciality：专业  title：职称 education：学历    section：所在教研室    work：项目组角色分工
                 student:data['course_student'],   //学生组//name：姓名    class：班级 age：年龄   work：项目组任务分工
-                brief:data['brief'],//项目简介
-                Construction:data['chapters']['Construction'],//建设内容
-                ProjectBasis:data['chapters']['ProjectBasis'],//立项依据
-                development:data['chapters']['development'],//创客空间物理环境、制度建设及软件设施建设情况
-                studio:data['chapters']['studio'],//学生创客工作室建设情况
-                studentTeam:data['chapters']['studentTeam'],//学生创客团队（人才）培养预期成果、数量
-                studentActivities:data['chapters']['studentActivities'],//学生创客活动组织实施情况
-                Transforming:data['chapters']['Transforming'],//学生创客团队孵化、转化创业项目情况
-                condition:data['chapters']['condition'],//立 项基 础及条 件
-                fund:fundDataArray,//预算经费
+                // brief:data['brief'],//项目简介
+                // Construction:data['chapters']['Construction'],//建设内容
+                // ProjectBasis:data['chapters']['ProjectBasis'],//立项依据
+                // development:data['chapters']['development'],//创客空间物理环境、制度建设及软件设施建设情况
+                // studio:data['chapters']['studio'],//学生创客工作室建设情况
+                // studentTeam:data['chapters']['studentTeam'],//学生创客团队（人才）培养预期成果、数量
+                // studentActivities:data['chapters']['studentActivities'],//学生创客活动组织实施情况
+                // Transforming:data['chapters']['Transforming'],//学生创客团队孵化、转化创业项目情况
+                // condition:data['chapters']['condition'],//立 项基 础及条 件
+                // fund:fundDataArray,//预算经费
                     //total：总经费     
                     //小型仪器设备费：device        deviceRemarks
                     //材料费：Material             MaterialRemarks
@@ -450,7 +519,6 @@ export default {
   },
   mounted(){
     this.handleData();
-    console.log(this.data);
   }
 }
 </script>
@@ -494,32 +562,37 @@ export default {
     flex-direction: column;
     .han{
       display: flex;
+      width: 100%;
       height: auto;
       box-sizing: border-box;
       border-bottom:solid 1px black;
       .label{
-        flex:1;
         display: flex;
+        text-align: center;
         justify-content: center;
         align-items: center;
+        width: 20%;
         box-sizing: border-box;
         padding: 10px;
         border-right: solid 1px black;
       }
       .value{
-        flex: 2;
+        // flex: 2;
+        width: 10%;
         display: flex;
+        text-align: center;
         justify-content: center;
         align-items: center;
         box-sizing: border-box;
-        padding: 10px;
+        // padding: 10px;
         &:not(:nth-last-child(1)){
           border-right: solid 1px black;
         }
       }
       &:nth-child(5){
         .label{
-          flex: 1;
+          // flex: 1;
+          justify-content: center;
           padding: 10px 12px;
         }
         .value{
@@ -533,7 +606,8 @@ export default {
       height: auto;
       box-sizing: border-box;
       .statusLabel{
-        flex:1;
+        // flex:1;
+        width: 20%;
         display: flex;
         justify-content: center;
         align-items: center;
@@ -574,28 +648,35 @@ export default {
     .member{
       display: flex;
       .memberLabel{
-        flex:1;
+        // flex:1;
+        width: 12%;
         display: flex;
         flex-direction: column;
         align-items: center;
+        text-align: center;
         justify-content: center;
         box-sizing: border-box;
-        padding: 3.5px;
+        padding: 10px;
         border-right: solid 1px black;
         border-bottom: solid 1px black;
       }
       .memberTable{
         flex: 5;
+        // width: 100%;
         display: flex;
         flex-direction: column;
         .memberHan{
           display: flex;
           box-sizing: border-box;
           border-bottom: solid 1px black;
+          // height: auto;
+          flex: 1;
+
           .memberValue{
             padding: 10px;
             box-sizing: border-box;
-            flex: 1;
+            width: 45%;
+            // flex:1;
             display: flex;
             justify-content: center;
             align-items: center;
@@ -612,7 +693,10 @@ export default {
     .chapters{
       display: flex;
       .chaptersLabel{
-        flex:1;
+        // flex:1;
+        font-size: 18px;
+        font-weight: 600;
+        width: 20%;
         display: flex;
         flex-direction: column;
         align-items: center;
@@ -642,7 +726,8 @@ export default {
     .fund{
       display: flex;
       .fundTitle{
-        flex:1;
+        // flex:1;
+        width: 20%;
         display: flex;
         flex-direction: column;
         align-items: center;
@@ -734,7 +819,8 @@ export default {
     .opinion{
       display: flex;
       .opinionLabel{
-        flex:1;
+        // flex:1;
+        width: 20%;
         display: flex;
         flex-direction: column;
         align-items: center;

src/views/projectApply/projectApplication.vue

@@ -276,8 +276,7 @@
         class="addDialog">
         <div class="addDialogLogo">LOGO</div>
         <MakerSpaceWordPreview v-if="PreviewTid == '5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'" :data="PreviewData"/>
-        <studentMakerProjectPreview v-if="PreviewTid == '2f4c6e78-f2e7-11ed-a3f6-509a4c5b67cf'" :data="PreviewData"/>
-
+        <studentMakerProjectPreview v-if="PreviewTid == '5e21b204-c206-11ed-a4cd-509a4c5b67cf'" :data="PreviewData"/>
         <span slot="footer" class="dialog-footer">
           <el-button type="primary" @click="downWord" class="AllDialogBtn">下载文档</el-button>
           <el-button @click="WordPreview = false" class="AllDialogBtn" >取消</el-button>
@@ -506,7 +505,7 @@ import studentMakerProjectPreview from '@/components/studentMakerProjectPreview.
             .get(this.$store.state.api+'/SelectAllProject',param)
               .then(res=>{
                 let data=res.data;
-                console.log(data);
+                // console.log(data);
                 if (data[0].length==0 && data[5][0]['total'] != 0) {
                   this.table.currentPage=1
                   return this.getData()

src/views/projectApply/projectApplicationApplyMain.vue

@@ -64,8 +64,8 @@
           >
           <!-- <div class="addDialogLogo">LOGO</div> -->
           <div class="TypeBox">
-            <div class="selectType" v-for="item in projectApplicationApply1.sortOptions">
-              <el-tooltip class="item" v-for="item2 in item['children']" effect="dark" :content="item.label+'('+item2.label+')'" placement="top">
+            <div class="selectType" v-for="(item,index) in projectApplicationApply1.sortOptions" :key="index">
+              <el-tooltip class="item" v-for="(item2,index2) in item['children']" :key="index2" effect="dark" :content="item.label+'('+item2.label+')'" placement="top">
               <div class="TypeCard" @click="changeType(item.value,item2.value)">
                 <img src="@/assets/img/file.png" alt="">
                 <span>{{item.label}}</span>