#

src/components/MakerSpaceWordPreview.vue

@@ -14,10 +14,10 @@
           <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>
@@ -287,8 +287,8 @@ export default {
         year:"",  //申请日期年
         month:"",   //申请日期月
         day:"",     //申请日期日
-        ing:"", //已建设
-        ed:"",  //待建设
+        ing:"", //待建设
+        ed:"",  //已建设
         projectName:"",//项目名称
         college:"",//
         begin_at:"",//项目开始时间
@@ -325,8 +325,9 @@ export default {
   methods:{
     handleData(){
       //处理项目数据
-      let data = this.data[0];
-      let fund = this.data[1];
+      let data = {},fund = [];
+      Object.assign(data,this.data[0])
+      Object.assign(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']);
@@ -412,8 +413,8 @@ export default {
                 year:nowDate.split('-')[0],  //申请日期年
                 month:nowDate.split('-')[1],   //申请日期月
                 day:nowDate.split('-')[2],     //申请日期日
-                ing:data['typeName']==0?"√":"□", //已建设
-                ed:data['typeName']==0?"□":"√",  //待建设
+                ing:data['typeName']=='已建设'?"√":"□", //已建设
+                ed:data['typeName']=='待建设'?"√":"□",  //待建设
                 projectName:data['title'],//项目名称
                 college:data['name'],//
                 begin_at:data['begin_at'],//项目开始时间
@@ -448,7 +449,7 @@ export default {
             console.log(this.wordData)
     },
   },
-  mounted(){
+  created(){
     this.handleData();
   }
 }

src/components/tool/getWord.js

@@ -21,6 +21,7 @@ function MakerSpaceWord(data,fund){
             const zip = new PizZip(binary);
             // 将模板内容加载到 Docxtemplater 中
             const doc = new Docxtemplater().loadZip(zip);
+            console.log(data)
             //处理项目数据
             data['chapters'] = JSON.parse(data['chapters']);
             data['course_teacher'] = JSON.parse(data['course_teacher']);
@@ -40,6 +41,7 @@ function MakerSpaceWord(data,fund){
                     Transaction:"",TransactionRemarks:""
                 }
                 //直接经费
+
                 let direct = JSON.parse(item['directFund']);
                 //间接经费
                 let indirect = JSON.parse(item['indirectFund']);
@@ -109,8 +111,8 @@ function MakerSpaceWord(data,fund){
                 year:nowDate.split('-')[0],  //申请日期年
                 month:nowDate.split('-')[1],   //申请日期月
                 day:nowDate.split('-')[2],     //申请日期日
-                ing:data['typeName']==0?"√":"□", //已建设
-                ed:data['typeName']==0?"□":"√",  //待建设
+                ing:data['typeName']=='待建设'?"√":"□", //已建设
+                ed:data['typeName']=='已建设'?"√":"□",  //待建设
                 projectName:data['title'],//项目名称
                 college:data['name'],//
                 begin_at:data['begin_at'],//项目开始时间

src/views/projectApply/projectApplication.vue

@@ -282,6 +282,19 @@
           <el-button @click="WordPreview = false" class="AllDialogBtn" >取消</el-button>
         </span>
         </el-dialog>
+      <el-dialog
+      title="文档预览"
+      :visible.sync="WordPreview"
+      width="60%"
+      class="addDialog">
+      <div class="addDialogLogo">LOGO</div>
+      <MakerSpaceWordPreview v-if="PreviewTid == '5f7a66d5-c206-11ed-a4cd-509a4c5b67cf' && WordPreview" :data="PreviewData"/>
+      <studentMakerProjectPreview v-if="PreviewTid == '2f4c6e78-f2e7-11ed-a3f6-509a4c5b67cf' && WordPreview" :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>
+      </span>
+      </el-dialog>
       <!-- 文档预览结束 -->
   </div>
 </template>
@@ -494,6 +507,7 @@ import studentMakerProjectPreview from '@/components/studentMakerProjectPreview.
             tid:this.selectInp.sort,    //分类
             leader:this.selectInp.person,  //负责人
             st:this.selectInp.state,  //审核状态
+            endState:"",
             year:"",
             textInp:'',
             page:this.table.currentPage,  //当前页

src/views/projectManage/ProjectManagement.vue

@@ -101,9 +101,9 @@
       <div class="classBlock" v-for="(item,index) in items" :key="index">
         <div class="projectBlockPosition">
           <!-- {{ item.isupload }} -->
-          <span v-if="item.isupload==0">未结题</span>
-          <span v-if="item.isupload==1">进行中</span>
-          <span v-if="item.isupload==2">已结题</span>
+          <span v-if="item.endProject==0">进行中</span>
+          <span v-if="item.endProject==1">待结题</span>
+          <span v-if="item.endProject==2">已结题</span>
 
         </div>
         <img :src="item.image" alt="">
@@ -120,10 +120,10 @@
             <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==1 && (item.endFile==null)"  @click="finish(item.courseId,item.title)">结项</span>
-              <span v-show="item.isupload==1 && (item.endFile!=null)"  @click="amendFinish(item.courseId,item.title)" >修改结项</span>
-              <span v-show="item.isupload==2" style="color: gray;cursor: no-drop;">已结项</span>
+              <!-- <span v-show="item.isupload==0"  @click="$message.error('请先进行项目立项审核')">结项</span> -->
+              <span v-show="item.endProject==0"  @click="finish(item.courseId,item.title)">结项</span>
+              <span v-show="item.endProject==1"  @click="amendFinish(item.courseId,item.title)" >修改结项</span>
+              <span v-show="item.endProject==2" style="color: gray;cursor: no-drop;">已结项</span>
         
                           
             </div>
@@ -245,15 +245,15 @@ import { getNowDate } from '@/components/tool/Date';
               },
               {
                 value:0,
-                label:'未审核'
+                label:'进行中'
               },
               {
                 value:1,
-                label:'正在审核'
+                label:'待结题'
               },
               {
                 value:2,
-                label:"已审核"
+                label:"已结题"
               },
             ],
             yearData:[],
@@ -295,7 +295,6 @@ import { getNowDate } from '@/components/tool/Date';
             uid:this.$store.state.userInfo.userid,
             pid:val
           }).then(res=>{
-            console.log(res.data);
             this.checkFundEndData = res.data[1].filter(i=>{
               return (i.fund !=i.usedFund)
             })
@@ -323,7 +322,6 @@ import { getNowDate } from '@/components/tool/Date';
             file:JSON.stringify(this.file),
             num:1
           }).then(res=>{
-            console.log(res);
             if(res.data==1){
               this.$message.success("结项成功");
               this.endDialog = false;
@@ -338,7 +336,6 @@ import { getNowDate } from '@/components/tool/Date';
           this.endDialog=false;
         },
         scheduleDetail(val,tid){           //进度详情
-          // localStorage.setItem('pid',JSON.stringify(val))
           this.$router.push(`/ProjectManagementMain?Id=${tid}&pid=${val}`)
         },
         fundStatus(Id){     //资金情况
@@ -373,7 +370,6 @@ import { getNowDate } from '@/components/tool/Date';
               this.checkFundEndData=res.data[2].filter(i=>{
                 return (i.fund !=i.usedFund)
               })
-              console.log(this.checkFundEndData);
               this.iid=val;
               this.tit=tit;
               this.endDialog=true;
@@ -396,8 +392,9 @@ import { getNowDate } from '@/components/tool/Date';
             did:this.selectInp.department,  //部门
             tid:this.selectInp.sort,    //分类
             leader:this.selectInp.leader,  //负责人
-            st:this.selectInp.state,  //审核状态
-            year:this.selectInp.year,
+            st:2,  //审核状态
+            endState:this.selectInp.state,
+            year:this.selectInp.year, //年份
             // year:'',
             textInp:this.selectText,
             page:this.table.currentPage,  //当前页

src/views/projectManage/components/ProjectManagement1.vue

@@ -353,7 +353,8 @@
     <div class="baseBtn">
       <div class="blockWidth">
         <el-button type="primary" v-show="apIsupload==0"  @click="audit">立即修改</el-button>
-          <el-button type="primary" v-show="apIsupload==1" class="disa">立即修改</el-button>
+        <el-button type="primary" v-show="apIsupload==1" class="disa">立即修改</el-button>
+        <el-button type="primary" v-show="apIsupload==2" class="disa">立即修改</el-button>
       </div>
     </div>
 
@@ -683,7 +684,7 @@
                         this.content.textarea=data.brief
                         this.content.dialogImageUrl=data.image
                         this.pageType=[data.typeid,data.typeName]
-                        this.isUpload=data.isupload
+                        this.isUpload=data.endProject
                         this.endProject=data.endProject
                         this.loading = false;
                         this.apIsupload=data.apIsupload

src/views/projectManage/components/ProjectManagement1_MakerSpace.vue

@@ -609,7 +609,7 @@
                     this.dialogImageUrl=data.image;
                     this.select.departmentData = data['classid']
                     this.select.sort = [data['typeid'],data['typeName']]
-                    this.isUpload=data['isupload']
+                    this.isUpload=data['endProject']
                     this.select.lead_leader = data['lead_leader']
                     this.teacherData = JSON.parse(data['course_teacher'])
                     this.studentData = JSON.parse(data['course_student'])