Q-ABAB 1 year ago
parent
commit
b1099da806

+ 1 - 1
src/views/activityManage/components/markeractivityWordShow.vue

@@ -1,5 +1,5 @@
 <template>
-    <div id="MarkeractivityWord">
+    <div id="MarkeractivityWord" ref="pdfShow">
         <div id="title">
             <div class="school">深圳技师学院</div>
             <div class="wordTitle">创客专项资金及项目申请表({{wordData['type']==0?'创客活动':"个人创客"}})</div>

+ 34 - 10
src/views/activityManage/makerActivityWordDetail.vue

@@ -9,9 +9,9 @@
         </div>
         <markeractivityWord v-if="wordData['type']==0 && wordData['state']==0" :wordData="wordData" :total="total" :changeFund="changeFund" :allFund="wordData['allFund']"/>
         <NomMarkerWord v-if="wordData['type']==1 && wordData['state']==0" :wordData="wordData" :total="total"/>
-        <markeractivityWordShow v-if="wordData['state']!=0" :wordData="wordData" :total="total"/>
+        <markeractivityWordShow ref="myChild" v-if="wordData['state']!=0 || downloadDig" :wordData="wordData" :total="total"/>
         <div>
-            <el-button type="primary" @click="getActivityWord">下载表单</el-button>
+            <el-button type="primary" @click="downloadDig=true">下载表单</el-button>
             <el-button type="primary" v-if="wordData['state']==0" @click="test">立即修改</el-button>
         </div>
         <el-dialog
@@ -26,6 +26,20 @@
             <el-button @click="submitHint=false" class="AllDialogBtn">取消</el-button>
           </span>
         </el-dialog>
+         <!-- 下载文档开始 -->
+         <el-dialog
+                title="下载文档"
+                :visible.sync="downloadDig"
+                width="600px"
+                class="pageSubmitData">
+                
+                <div class="deleteContent">确定下载文档?</div>
+                <span slot="footer" class="dialog-footer">
+                    <el-button type="primary" @click="downloadWord" class="AllDialogBtn">确认</el-button>
+                    <el-button @click="downloadDig=false" class="AllDialogBtn" >取消</el-button>
+                </span>
+            </el-dialog>
+            <!-- 下载文档结束-->
     </div>
   </template>
   
@@ -34,12 +48,14 @@
   import NomMarkerWord from './components/NomMarkerWord.vue'
   import markeractivityWordShow from './components/markeractivityWordShow.vue'
   import {makerActivityWord} from '@/components/tool/getWord'
+  import {downloadPDF} from '@/components/tool/pdf'
       export default {
         components:{markeractivityWord,NomMarkerWord,markeractivityWordShow},
         data() {
               return {
                 loading:false,
                 submitHint:false,
+                downloadDig:false,
                 wordData:{
                   allFund:0,
                   acId:"",//活动ID
@@ -253,14 +269,22 @@
                 console.log(err)
               })
             },
-            getActivityWord(){
-              // if(this.wordData['type']==0){
-                // this.$message.info("正在下载创客活动表单");
-                makerActivityWord(this.wordData,this.total)
-              // }else if(this.wordData['type']==1){
-                // this.$message.info("正在下载个人创客表单")
-              // }
-            }
+            downloadWord(){
+              downloadPDF(this.$refs.myChild.$refs.pdfShow)
+              this.downloadDig = false;
+              // this.wordData['total']=this.wordData.fund.facility*1 + this.wordData.fund.materials*1+this.wordData.fund.process*1+ this.wordData.fund.assist*1+this.wordData.fund.authenticate*1+ this.wordData.fund.match*1+this.wordData.fund.activity*1+this.wordData.fund.affair*1
+              // return console.log(this.wordData);
+              // getWord(this.downWordData)
+              // this.downloadDig=false;
+            },
+            // getActivityWord(){
+            //   // if(this.wordData['type']==0){
+            //     // this.$message.info("正在下载创客活动表单");
+            //     makerActivityWord(this.wordData,this.total)
+            //   // }else if(this.wordData['type']==1){
+            //     // this.$message.info("正在下载个人创客表单")
+            //   // }
+            // }
           },
           computed:{
             total() {

+ 9 - 7
src/views/projectApply/components/MakerSpaceWord.vue

@@ -543,13 +543,14 @@
             </div>
           </div>
         </div>
-        <div class="notes">
-          <span>备注:</span>
-          <span>1.表格可顺延或另附页。</span>
-          <span>2.项目申报需附相关佐证材料。</span>
-        </div>
       </div>
       
+    <div class="notes">
+        <span>备注:</span>
+        <span>1.表格可顺延或另附页。</span>
+        <span>2.项目申报需附相关佐证材料。</span>
+    </div>
+      
 </div>
 </template>
   
@@ -606,6 +607,7 @@
     background-color: white;
     padding:40px 100px;
     box-sizing:border-box;
+    margin-bottom: 50px;
     #title{
         width: 100%;
         display: flex;
@@ -952,8 +954,8 @@
   .notes{
     width: 100%;
     display: flex;
-    position: absolute;
-    bottom: -80px;
+    // position: absolute;
+    // bottom: -80px;
     flex-direction:column;
   }
   :deep(.el-input__inner){

+ 22 - 4
src/views/projectApply/components/MakerSpaceWordDetail.vue

@@ -1,9 +1,9 @@
 <template>
     <div id="MakerSpaceWordDetail" v-loading="loading">
         <MakerSpaceWord :wordData="wordData" v-if="state==0"/>
-        <MakerSpaceWordShow :wordData="wordData" v-show="state!=0"/>
+        <MakerSpaceWordShow ref="myChild" :wordData="wordData" v-if="state!=0 || downloadDig"/>
         <div>
-            <el-button type="primary" @click="getWord">下载表格</el-button>
+            <el-button type="primary" @click="downloadDig=true">下载表格</el-button>
             <el-button type="primary" @click="test" v-if="state==0">立即修改</el-button>
         </div>
         <el-dialog
@@ -18,6 +18,21 @@
             <el-button @click="submitHint=false" class="AllDialogBtn">取消</el-button>
           </span>
         </el-dialog>
+        
+        <!-- 下载文档开始 -->
+        <el-dialog
+            title="下载文档"
+            :visible.sync="downloadDig"
+            width="600px"
+            class="pageSubmitData">
+            
+            <div class="deleteContent">确定下载文档?</div>
+            <span slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="getWord" class="AllDialogBtn">确认</el-button>
+                <el-button @click="downloadDig=false" class="AllDialogBtn" >取消</el-button>
+            </span>
+        </el-dialog>
+        <!-- 下载文档结束-->
     </div>
   </template>
   
@@ -25,10 +40,12 @@
   import MakerSpaceWord from './MakerSpaceWord.vue';
   import MakerSpaceWordShow from './MakerSpaceWordShow.vue';
   import {getMakerSpaceWord} from '@/components/tool/getWord'
+  import {downloadPDF} from '@/components/tool/pdf'
       export default {
         components:{MakerSpaceWord,MakerSpaceWordShow},
           data() {
               return {
+                downloadDig:false,
                 wordData:{
                     applicationDate:"",//申请日期
                     projectName:"",//项目名称
@@ -108,8 +125,9 @@
                 })
             },
             getWord(){//下载表格
-                this.$message.info("正在下载表单")
-                getMakerSpaceWord(this.wordData)
+              // console.log(this.$refs.myChild.$refs.downPDF)
+                downloadPDF(this.$refs.myChild.$refs.downPDF)
+                this.downloadDig=false;
             },
             changeWord(){//修改表格数据
                 this.loading = true;

+ 5 - 6
src/views/projectApply/components/MakerSpaceWordShow.vue

@@ -1,6 +1,5 @@
 <template>
-    <div id="MakerSpaceWord">
-        
+    <div id="MakerSpaceWord" ref="downPDF">
         <div id="table">
           <div id="title">
               <div class="school">深圳技师学院</div>
@@ -352,11 +351,11 @@
                 </div>
               </div>
             </div>
-            <div class="notes">
+          </div>
+          <div class="notes">
               <span>备注:</span>
               <span>1.表格可顺延或另附页。</span>
               <span>2.项目申报需附相关佐证材料。</span>
-            </div>
           </div>
           
           <!-- <el-button type="primary" @click="getWord">下载表格</el-button> -->
@@ -784,8 +783,8 @@
         width: 100%;
         display: flex;
         flex-direction:column;
-        position: absolute;
-        bottom: -80px;
+        // position: absolute;
+        // bottom: -80px;
       }
       :deep(.el-input__inner){
         height: 100%;

+ 1 - 6
src/views/projectApply/components/studentProjectWord.vue

@@ -517,12 +517,10 @@
             <!-- </td> -->
           <!-- </tr> -->
         </table>
-         <button @click="downpdf">pdf</button>
     </div>
     </template>
       
     <script>
-  import {downloadPDF} from '@/components/tool/pdf'
 
       export default {
         props:["wordData",'reversedMessage'],
@@ -532,9 +530,6 @@
             }
         },
         methods: {
-          downpdf(){
-              downloadPDF(this.$refs.pdf)
-          },
           getText(value) {     //电话验证
               let verify = /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/; //获取正则表达式 存放到verify变量中
               let result = verify.test(value.trim()); //判断输入框内容是否符合 正则表达式
@@ -582,7 +577,7 @@
         margin: 0;
         padding:40px 100px;
         box-sizing:border-box;
-        
+        margin-bottom: 50px;
         .table{
             border: none;
             border-bottom: solid 1px black;

+ 4 - 5
src/views/projectApply/components/studentProjectWordDetail.vue

@@ -1,7 +1,7 @@
 <template>
     <div id="studentProjectWordDetail">
         <studentProjectWord v-if="isupload==0" :wordData="wordData" :reversedMessage="reversedMessage"/>
-        <studentProjectWordShow ref="myChild" v-if="isupload!=0" :downWordData="downWordData" :reversedMessage="reversedMessage"/>
+        <studentProjectWordShow ref="myChild" v-if="isupload!=0 || downloadDig" :downWordData="downWordData" :reversedMessage="reversedMessage"/>
           <div style="width: 300px;margin: 20px auto;display: flex;justify-content: space-between;">
               <el-button style="width: 120px;margin: 20px auto;" @click="downloadDig=true" type="primary">下载文档</el-button>
               <el-button style="width: 120px;margin: 20px auto;" @click="test" type="primary" v-if="isupload==0">立即修改</el-button>
@@ -394,12 +394,11 @@
                 })
           },
           downloadWord(){
-            // console.log(this.document.studentProjectWord);
-            return downloadPDF(this.$refs.myChild.$refs.pdfShow)
+            downloadPDF(this.$refs.myChild.$refs.pdfShow)
             // this.wordData['total']=this.wordData.fund.facility*1 + this.wordData.fund.materials*1+this.wordData.fund.process*1+ this.wordData.fund.assist*1+this.wordData.fund.authenticate*1+ this.wordData.fund.match*1+this.wordData.fund.activity*1+this.wordData.fund.affair*1
             // return console.log(this.wordData);
-            getWord(this.downWordData)
-            this.downloadDig=false;
+            // getWord(this.downWordData)
+            // this.downloadDig=false;
           }
         },
         computed:{   //经费总合

+ 24 - 4
src/views/projectManage/ProjectManagementMain.vue

@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div id="ProjectManagementMain">
         <div class="vfpHeader">
             <div class="titleOne">项目管理</div>
             <div class="smallTitle" style="left: 100px;">项目进展详情</div>
@@ -15,9 +15,13 @@
             </div>
         </div>
         <!-- 创客项目 -->
-        <studentProjectWordShow v-if="show==0 && $route.query['Id']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"/>
+        <studentProjectWordShow ref="student" v-if="show==0 && $route.query['Id']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"/>
         <!-- 特色创客空间建设 -->
-        <MakerSpaceWordShow v-if="show==0 && $route.query['Id']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/>
+        <MakerSpaceWordShow ref='maker' v-if="show==0 && $route.query['Id']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/>
+        <!-- 下载表单 -->
+        <div class="downBtn">
+            <el-button v-if="show==0" type="primary" @click="getWord">下载表格</el-button>
+        </div>
         <!-- 活动开展 -->
         <ProjectManagementActivity :changeShow="goto" v-if="show==1"/>
         <!-- 活动开展详细 -->
@@ -39,6 +43,8 @@
     import MakerSpaceWordShow from './components/MakerSpaceWordShow.vue'
     //创客空间
     import studentProjectWordShow from './components/studentProjectWordShow.vue'
+    //下载pdf
+    import {downloadPDF} from '@/components/tool/pdf'
     export default {
         components:{
             MakerSpaceWordShow,
@@ -65,6 +71,12 @@
                 this.show = val
                 this.AidShow = aid;
             },
+            getWord(){
+                let page;
+                if(this.$route.query['Id']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf')page=this.$refs.student.$refs.downPDF;
+                if(this.$route.query['Id']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf')page=this.$refs.maker.$refs.downPDF;
+                downloadPDF(page);
+            }
         },
         mounted(){
             console.log(this.$route.query['Id']);
@@ -73,5 +85,13 @@
 </script>
 
 <style lang="less"> 
-
+#ProjectManagementMain{
+    display: flex;
+    flex-direction: column;
+    .downBtn{
+        width: 100%;
+        display: flex;
+        justify-content: center;
+    }
+}
 </style>

+ 11 - 5
src/views/projectManage/components/MakerSpaceWordShow.vue

@@ -1,5 +1,5 @@
 <template>
-    <div id="MakerSpaceWord" v-loading="loading">
+    <div id="MakerSpaceWord" ref="downPDF" v-loading="loading">
         <div id="title">
             <div class="school">深圳技师学院</div>
             <div class="wordTitle">二级学院特色创客空间建设项目立项申报书</div>
@@ -292,16 +292,18 @@
             <span>1.表格可顺延或另附页。</span>
             <span>2.项目申报需附相关佐证材料。</span>
           </div>
-          <el-button type="primary" @click="getWord">下载表格</el-button>
+          <!-- <el-button v-if="downFile" type="primary" @click="getWord">下载表格</el-button> -->
     </div>
     </template>
       
     <script>
-    import {getMakerSpaceWord} from '@/components/tool/getWord'
+    // import {getMakerSpaceWord} from '@/components/tool/getWord'
+
       export default {
         data() {
           return {
             loading:false,
+            downFile:true,
             wordData:{
                 applicationDate:"",//申请日期
                 projectName:"",//项目名称
@@ -350,8 +352,12 @@
         },
         methods: {
             getWord(){
-              this.$message.info("正在下载表格")
-              getMakerSpaceWord(this.wordData);
+              this.downFile = false;
+              // console.log(this.$refs.downPDF)
+              downloadPDF(this.$refs.downPDF);
+              this.downFile = true;
+              // this.$message.info("正在下载表格")
+              // getMakerSpaceWord(this.wordData);
             },
             getData(){
                 this.loading = true;

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

@@ -1,5 +1,5 @@
 <template>
-    <div id="studentProjectWord">
+    <div id="studentProjectWord" ref="downPDF">
         <div id="title">
             <div class="school">深圳技师学院</div>
             <div class="wordTitle">学 生 创 客 项 目 申 报 书</div>

+ 7 - 7
src/views/projectSettlement/components/MakerSpaceWordShow.vue

@@ -1,5 +1,5 @@
 <template>
-    <div id="MakerSpaceWord" v-loading="loading">
+    <div id="MakerSpaceWord" v-loading="loading" ref="downPDF">
         <div id="title">
             <div class="school">深圳技师学院</div>
             <div class="wordTitle">二级学院特色创客空间建设项目立项申报书</div>
@@ -292,12 +292,12 @@
             <span>1.表格可顺延或另附页。</span>
             <span>2.项目申报需附相关佐证材料。</span>
           </div>
-          <el-button type="primary" @click="getWord">下载表格</el-button>
+          <!-- <el-button type="primary" @click="getWord">下载表格</el-button> -->
     </div>
     </template>
       
     <script>
-    import {getMakerSpaceWord} from '@/components/tool/getWord'
+    // import {getMakerSpaceWord} from '@/components/tool/getWord'
       export default {
         data() {
           return {
@@ -349,10 +349,10 @@
           };
         },
         methods: {
-            getWord(){
-              this.$message.info("正在下载表格")
-              getMakerSpaceWord(this.wordData);
-            },
+            // getWord(){
+            //   this.$message.info("正在下载表格")
+            //   getMakerSpaceWord(this.wordData);
+            // },
             getData(){
                 this.loading = true;
                 this.ajax.get(this.$store.state.api+'/getMakerSpaceWordData',{

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

@@ -1,5 +1,5 @@
 <template>
-    <div id="studentProjectWord">
+    <div id="studentProjectWord" ref="downPDF">
         <div id="title">
             <div class="school">深圳技师学院</div>
             <div class="wordTitle">学 生 创 客 项 目 申 报 书</div>
@@ -252,12 +252,12 @@
             <span>2.优先支持项目需提供与研发项目相关的实证材料并查看原件。</span>
             <span>3.初创组已结题项目申请需提供结题验收证明、初创企业申请需提供入驻学校孵化基地协议书及公司营业执照。</span>
           </div>
-          <el-button style="margin-top:20px" type="primary" @click="work">下载表格</el-button>
+          <!-- <el-button style="margin-top:20px" type="primary" @click="work">下载表格</el-button> -->
     </div>
     </template>
       
     <script>
-      import {getWord} from '@/components/tool/getWord'
+      // import {getWord} from '@/components/tool/getWord'
       export default {
         data() {
           return {
@@ -315,10 +315,10 @@
             }
         },
         methods: {
-          work(){
-            this.$message.info("正在下载表格")
-            getWord(this.downWordData)
-          },
+          // work(){
+          //   this.$message.info("正在下载表格")
+          //   getWord(this.downWordData)
+          // },
           getData(){
               let param={
                   uid:this.$store.state.userInfo.userid,

+ 19 - 4
src/views/projectSettlement/projectSettlementDetailMain.vue

@@ -17,15 +17,18 @@
             <!-- <div @click="pageState=4">结项评语<div v-if="pageState==4" class="pr1TitBass"></div></div> -->
         </div>
         <!-- 特色创客空间建设 -->
-        <MakerSpaceWordShowVue v-if="pageState==0 && $route.query['tid']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/>
+        <MakerSpaceWordShowVue ref="maker" 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'"/> -->
         
         <!-- 学生创业项目 -->
-        <studentProjectWordShow v-if="pageState==0 && $route.query['tid']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"/>
+        <studentProjectWordShow ref="student" v-if="pageState==0 && $route.query['tid']=='5e21b204-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> -->
-
+        <!-- 下载PDF -->
+        <div class="downBtn">
+            <el-button v-if="pageState==0" type="primary" @click="getWord">下载表格</el-button>
+        </div>
         <!-- 项目附件 -->
         <!-- <projectSettlementDetailAnnex v-if="pageState==2"/> -->
         <!-- 项目结题附件 -->
@@ -46,6 +49,8 @@
     // import projectSettlementDetailAnnex from './components/projectSettlementDetailAnnex.vue';
     import projectSettlementDetailConclusion from './components/projectSettlementDetailConclusion.vue';
     // import projectSettlementDetailComment from './components/projectSettlementDetailComment.vue';
+    //下载pdf
+    import {downloadPDF} from '@/components/tool/pdf'
         export default {
         components:{
           MakerSpaceWordShowVue,
@@ -64,7 +69,12 @@
           }
         },
         methods:{
-         
+          getWord(){
+                let page;
+                if(this.$route.query['tid']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf')page=this.$refs.student.$refs.downPDF;
+                if(this.$route.query['tid']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf')page=this.$refs.maker.$refs.downPDF;
+                downloadPDF(page);
+            }
         },
         mounted(){
             console.log(this.$route)
@@ -80,6 +90,11 @@
           text-align: left;
           font-size: 16px;
       }
+      .downBtn{
+        width: 100%;
+        display: flex;
+        justify-content: center;
+      }
     }
     .projectApplicationfundAddDialog{