SanHQin 1 mese fa
parent
commit
aa6f527a65

File diff suppressed because it is too large
+ 0 - 0
dist/css/1015.4150bb2c.css


+ 0 - 1
dist/css/4014.6eb785eb.css

@@ -1 +0,0 @@
-.projectApplication .btnClass[data-v-5fcb48f1]{width:70px!important;max-width:70px;min-width:70px}.projectApplication[data-v-5fcb48f1] .el-table__row .el-table__cell{cursor:pointer}.projectApplication[data-v-5fcb48f1] .el-table__row .el-table__cell:last-child{cursor:default}.projectApplication .btnCss[data-v-5fcb48f1]{color:#409eff;border-color:#c6e2ff;background-color:#ecf5ff}

+ 1 - 0
dist/css/8219.4306ea32.css

@@ -0,0 +1 @@
+.projectApplication .btnClass[data-v-5a766513]{width:70px!important;max-width:70px;min-width:70px}.projectApplication[data-v-5a766513] .el-table__row .el-table__cell{cursor:pointer}.projectApplication[data-v-5a766513] .el-table__row .el-table__cell:last-child{cursor:default}.projectApplication .btnCss[data-v-5a766513]{color:#409eff;border-color:#c6e2ff;background-color:#ecf5ff}

File diff suppressed because it is too large
+ 0 - 0
dist/css/865.d4796986.css


File diff suppressed because it is too large
+ 0 - 0
dist/css/9594.c49a3dc0.css


+ 1 - 1
dist/index.html

@@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>双创学院管理系统</title><script defer="defer" src="/js/chunk-vendors.f92325f6.js"></script><script defer="defer" src="/js/app.353b4f6e.js"></script><link href="/css/chunk-vendors.0225060a.css" rel="stylesheet"><link href="/css/app.b3459279.css" rel="stylesheet"></head><body><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>双创学院管理系统</title><script defer="defer" src="/js/chunk-vendors.f92325f6.js"></script><script defer="defer" src="/js/app.5caa6e7a.js"></script><link href="/css/chunk-vendors.0225060a.css" rel="stylesheet"><link href="/css/app.b3459279.css" rel="stylesheet"></head><body><div id="app"></div></body></html>

File diff suppressed because it is too large
+ 0 - 0
dist/js/1015.90e181a5.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/1015.90e181a5.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/1656.388e1683.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/1656.388e1683.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/4014.0dfb17ab.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/4014.0dfb17ab.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/4990.b9b462a6.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/4990.b9b462a6.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/8219.92a6e428.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/8219.92a6e428.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/865.6b81817c.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/865.6b81817c.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/8801.2d3c3832.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/8801.2d3c3832.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/9426.b884c5b1.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/9426.b884c5b1.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/9569.f3a54f7e.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/9569.f3a54f7e.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/9594.7ed07a58.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/9594.7ed07a58.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/app.353b4f6e.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/app.5caa6e7a.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/app.5caa6e7a.js.map


+ 2 - 2
src/views/commission/components/Closingstatement.vue

@@ -6,7 +6,7 @@
 
     <div class="onePage">
       <div class="titSchool">深圳城市职业学院(深圳技师学院)</div>
-      <div class="title">校级创客项目结题申请书</div>
+      <div class="title">校级学生创新创业训练计划项目结题申请书</div>
       <div class="basicInformation">
         <span>项目名称</span>
         <div class="line">{{ myArrayProp[0].title }}</div>
@@ -50,7 +50,7 @@
         创新创业学院制
       </div>
       <div style="font-size: 22px; font-family: \4eff\5b8b; font-weight: bold">
-        {{ nowTime }}
+        {{ myArrayProp[0].endProjectTime?myArrayProp[0].endProjectTime:nowTime.split('年')[1] }}
       </div>
     </div>
     <!-- <table border="1" cellspacing="0" ref="tableBox" v-show="!isDownPdf"> -->

+ 17 - 6
src/views/projectApply/projectApplication.vue

@@ -1060,6 +1060,7 @@ export default {
               let _data = res.data[0];
               let _array = [];
 
+
               _data.forEach((item, index) => {
                 let _json = {};
                 let teacher = item.course_teacher
@@ -1068,6 +1069,9 @@ export default {
                 let student = item.course_student
                   ? JSON.parse(item.course_student)
                   : [];
+                let chapters = item.chapters
+                  ? JSON.parse(item.chapters)
+                  : [];
                 // console.log("👉",i)
                 _json["项目编号"] = item.ProjectNo;
                 _json["项目名称"] = item.title;
@@ -1101,6 +1105,10 @@ export default {
                  ? money["Transaction"]
                  : "0";
                 _json["总经费"] = item.fund;
+
+                _json["项目预期成果、数量及形式(产品原型/发明专利/双创竞赛/成果转化/社会效益)"] = chapters.expectResults ? chapters.expectResults.replace(/<[^>]+>/g, '').replace(/&nbsp;|&#160;/g, '') : ''
+                _json["学生创客人才培养预期成果、数量(教师填写)"] = chapters.expectResultsTeacher ? chapters.expectResultsTeacher.replace(/<[^>]+>/g, '').replace(/&nbsp;|&#160;/g, '') : ''
+                _json["项目预期孵化、转化创业项目情况"] = chapters.expectConversion ? chapters.expectConversion.replace(/<[^>]+>/g, '').replace(/&nbsp;|&#160;/g, '') : ''
 //
                // _json["项目状态"] =
                //   item.isReturn == 0
@@ -1118,16 +1126,16 @@ export default {
 //
 
 //
-               for (let i = 0; i < student.length; i++) {
-                 _json["学生成员" + (i + 1)] = student[i].name;
+              //  for (let i = 0; i < student.length; i++) {
+              //    _json["学生成员" + (i + 1)] = student[i].name;
                	// _json["学生班级" + (i + 1)] = student[i].collage;
                 //  _json["角色分工" + (i + 1)] = student[i].work
-               }
-               for (let i = 0; i < teacher.length; i++) {
-                 _json["指导老师" + (i + 1)] = teacher[i].name;
+              //  }
+              //  for (let i = 0; i < teacher.length; i++) {
+              //    _json["指导老师" + (i + 1)] = teacher[i].name;
                 //  _json["所在学院" + (i + 1)] = teacher[i].collage;
                 //  _json["角色分工" + (i + 1)] = student[i].work
-               }
+              //  }
 
 
 
@@ -1139,6 +1147,9 @@ export default {
                 _array.push(_json);
               });
 
+
+              // return console.log("_array",_array)
+
               let XLSX = require("xlsx");
               const workbook = XLSX.utils.book_new(); //创建一个新的工作簿对象
               let ws = XLSX.utils.json_to_sheet(_array); //将json对象数组转化成工作表

+ 2 - 2
src/views/projectManage/components/Closingstatement.vue

@@ -6,7 +6,7 @@
 
     <div class="onePage">
       <div class="titSchool">深圳城市职业学院(深圳技师学院)</div>
-      <div class="title">校级创客项目结题申请书</div>
+      <div class="title">校级学生创新创业训练计划项目结题申请书</div>
       <div class="basicInformation">
         <span>项目名称</span>
         <div class="line">{{ myArrayProp[0].title }}</div>
@@ -50,7 +50,7 @@
         创新创业学院制
       </div>
       <div style="font-size: 22px; font-family: \4eff\5b8b; font-weight: bold">
-        {{ nowTime }}
+        {{ myArrayProp[0].endProjectTime?myArrayProp[0].endProjectTime:nowTime.split('年')[1] }}
       </div>
     </div>
     <!-- <table border="1" cellspacing="0" ref="tableBox" v-show="!isDownPdf"> -->

+ 1 - 1
src/views/projectSettlement/components/studentProjectWordShow.vue

@@ -2,7 +2,7 @@
     <div id="studentProjectWord" ref="downPDF" v-loading="loading">
         <div id="title">
             <div class="school">深圳城市职业学院(深圳技师学院)11</div>
-            <div class="wordTitle">2024年校级学生创新创业训练计划项目申报书模版</div>
+            <div class="wordTitle">2024年校级学生创新创业训练计划项目申报书</div>
             <div class="date">申请日期:{{downWordData.applicationDate}}</div>
         </div>
         <table border="1" cellspacing="0" class="table">

+ 1 - 1
src/views/projectSettlement/components/studentProjectWordShowNew.vue

@@ -5,7 +5,7 @@
 
             <div id="title">
                 <div class="school">深圳城市职业学院(深圳技师学院)</div>
-                <div class="wordTitle">2024年校级学生创新创业训练计划项目申报书模版</div>
+                <div class="wordTitle">{{downWordData.applicationDate?downWordData.applicationDate.split('年')[0]:2024}}年校级学生创新创业训练计划项目申报书</div>
                 <div class="date">申请日期:{{downWordData.applicationDate}}</div>
             </div>
           <tr id="projectName">

Some files were not shown because too many files changed in this diff