#

src/views/activityManage/makerActivityWordDetail.vue

@@ -11,8 +11,8 @@
         <NomMarkerWord v-if="wordData['type']==1 && wordData['state']==0" :wordData="wordData" :total="total"/>
         <markeractivityWordShow v-if="wordData['state']!=0" :wordData="wordData" :total="total"/>
         <div>
-            <el-button type="primary" v-if="wordData['state']==0" @click="test">立即修改</el-button>
             <el-button type="primary" @click="getActivityWord">下载表单</el-button>
+            <el-button type="primary" v-if="wordData['state']==0" @click="test">立即修改</el-button>
         </div>
         <el-dialog
           title="提示"

src/views/projectApply/components/MakerSpaceWordDetail.vue

@@ -3,8 +3,8 @@
         <MakerSpaceWord :wordData="wordData" v-if="state==0"/>
         <MakerSpaceWordShow :wordData="wordData" v-if="state!=0"/>
         <div>
-            <el-button type="primary" @click="test" v-if="state==0">立即修改</el-button>
             <el-button type="primary" @click="getWord">下载表格</el-button>
+            <el-button type="primary" @click="test" v-if="state==0">立即修改</el-button>
         </div>
         <el-dialog
           title="提示"

src/views/projectApply/components/studentProjectWordDetail.vue

@@ -3,8 +3,8 @@
         <studentProjectWord v-if="isupload==0" :wordData="wordData" :reversedMessage="reversedMessage"/>
         <studentProjectWordShow v-if="isupload!=0" :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="test" type="primary" v-if="isupload==0">立即修改</el-button>
               <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>
           </div>
           <!-- 立即修改开始 -->
                 <el-dialog
@@ -51,7 +51,56 @@
             DepartmentData:[], //部门学院
             downloadDig:false,  //下载文档对话框
             updatedWordDig:false, //立即修改对话框
-            downWordData:{},
+            downWordData:{
+              applicationDate:getNowDate(1),//申请日期
+                projectName:'',
+                radio:'',
+                checkList:[],
+                schoolRadio:'',
+                applyParsonRadio:'',
+                applyParsonName:'',
+                college:'',
+                tel:'',
+                beginTime:'',
+                endTime:'',
+                studentS:[
+                    {name:'',collage:'',work:''},
+                    {name:'',collage:'',work:''},
+                    {name:'',collage:'',work:''},
+                    {name:'',collage:'',work:''},
+                    {name:'',collage:'',work:''},
+                    {name:'',collage:'',work:''},
+                ],
+                teacherS:[
+                    {name:'',collage:'',work:''},
+                    {name:'',collage:'',work:''},
+                ],
+                brief:'',
+                introduce:{
+                    back:'',
+                    innovate:'',
+                    path:'',
+                    scene:'',
+                    worth:'',
+                    team:'',
+                    cost:'',
+                    expectResults:'',
+                    expectResultsTeacher:'',
+                    expectConversion:'',
+                    plan:''
+                },
+                total:'',
+                fund:{
+                    facility:'',
+                    materials:'',
+                    process:'',
+                    assist:'',
+                    authenticate:'',
+                    match:'',
+                    activity:'',
+                    affair:''
+                }
+            },
             wordData:{
                 applicationDate:getNowDate(1),//申请日期
                 projectName:'',

src/views/projectManage/components/MakerSpaceWordShow.vue

@@ -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,6 +349,10 @@
           };
         },
         methods: {
+            getWord(){
+              this.$message.info("正在下载表格")
+              getMakerSpaceWord(this.wordData);
+            },
             getData(){
                 this.loading = true;
                 this.ajax.get(this.$store.state.api+'/getMakerSpaceWordData',{

src/views/projectManage/components/studentProjectWordShow.vue

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

src/views/projectSettlement/components/MakerSpaceWordShow.vue

@@ -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,6 +349,10 @@
           };
         },
         methods: {
+            getWord(){
+              this.$message.info("正在下载表格")
+              getMakerSpaceWord(this.wordData);
+            },
             getData(){
                 this.loading = true;
                 this.ajax.get(this.$store.state.api+'/getMakerSpaceWordData',{

src/views/projectSettlement/components/studentProjectWordShow.vue

@@ -90,7 +90,9 @@
           <tr id="brief">
             <td rowspan="5" ref="brief">研发内容</td><td colspan="6" class="textLeft">
               <p>项目简介（200-300字）</p>
-              <span v-text="downWordData.brief"></span>
+              <span>
+                {{ downWordData.brief }}
+              </span>
             </td>
           </tr>
           <tr>
@@ -250,10 +252,12 @@
             <span>2.优先支持项目需提供与研发项目相关的实证材料并查看原件。</span>
             <span>3.初创组已结题项目申请需提供结题验收证明、初创企业申请需提供入驻学校孵化基地协议书及公司营业执照。</span>
           </div>
+          <el-button style="margin-top:20px" type="primary" @click="work">下载表格</el-button>
     </div>
     </template>
       
     <script>
+      import {getWord} from '@/components/tool/getWord'
       export default {
         data() {
           return {
@@ -311,6 +315,10 @@
             }
         },
         methods: {
+          work(){
+            this.$message.info("正在下载表格")
+            getWord(this.downWordData)
+          },
           getData(){
               let param={
                   uid:this.$store.state.userInfo.userid,
@@ -393,6 +401,7 @@
         }
         .table{
             border: none;
+            width: 100%;
             border-top: solid 1px black;
             border-right:  solid 1px black;
             border-left:  solid 1px black;
@@ -404,7 +413,7 @@
               height: 200px;
               // white-space: nowrap;
               span{
-                // white-space: nowrap
+                // white-space: nowrap;
                 word-wrap: break-word;
                 word-break: break-all;
               }
@@ -424,7 +433,7 @@
                 height: 50px;
                 text-align: center;
                 line-height: 30px;
-                min-width: 80px;
+                width: 70px;
                 box-sizing: border-box;
                 padding: 5px;
               p{