内容

src/components/MakerSpaceWord.vue

@@ -643,13 +643,13 @@
               </div>
 
               <div class="fundDataLie">
-                <div class="fundDataValue">知识产权事务费</div>
+                <div class="fundDataValue">论文版面费</div>
                 <div class="fundDataValue">
                   <el-input
                     type="number"
                     autosize
                     resize="none"
-                    placeholder="知识产权事务费"
+                    placeholder="论文版面费"
                     v-model.number="wordData['fund']['Transaction']"
                     @change="getTotal"
                   >
@@ -704,7 +704,7 @@
     <el-button type="primary" @click="test">确认</el-button>
   </div>
 </template>
-  
+
 <script>
 import { getNowDate } from "@/components/tool/Date.js";
 export default {
@@ -1055,7 +1055,7 @@ export default {
   },
 };
 </script>
-  
+
 <style lang="less" scoped>
 #MakerSpaceWord {
   width: 100%;

src/components/MakerSpaceWordPreview.vue

@@ -202,7 +202,7 @@
                   <div class="fundDataValue">{{item['Collaboration']}}</div>
                   <div class="fundDataValue">{{item['CollaborationRemarks']}}</div>
                 </div>
-               
+
               </div>
             </div>
 
@@ -228,11 +228,11 @@
                 </div>
 
                 <div class="fundDataLie">
-                  <div class="fundDataValue">知识产权事务费</div>
+                  <div class="fundDataValue">论文版面费</div>
                   <div class="fundDataValue">{{item['Transaction']}}</div>
                   <div class="fundDataValue">{{item['TransactionRemarks']}}</div>
                 </div>
-               
+
               </div>
             </div>
           </div>
@@ -276,7 +276,7 @@
       </div>
     </div>
 </template>
-  
+
 <script>
 import { getNowDate } from './tool/Date';
 export default {
@@ -310,7 +310,7 @@ export default {
         Transforming:"",//学生创客团队孵化、转化创业项目情况
         condition:"",//立 项基 础及条 件
         fund:[],//预算经费
-        //total：总经费     
+        //total：总经费
         //小型仪器设备费：device        deviceRemarks
         //材料费：Material             MaterialRemarks
         //测试化验加工费：processing    processingRemarks
@@ -350,60 +350,60 @@ export default {
                 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'];
                     }
-    
+
                     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']==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'];
                     }
-    
+
                     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']==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']);
-    
+
                 fundDataArray.push(fundData);
             })
-            
+
             //去除标签
             for(let i in data['chapters']){
                 data['chapters'][i]=data['chapters'][i].replace(/<[^>]+>/g,"");
@@ -437,7 +437,7 @@ export default {
                 Transforming:data['chapters']['Transforming'],//学生创客团队孵化、转化创业项目情况
                 condition:data['chapters']['condition'],//立 项基 础及条 件
                 fund:fundDataArray,//预算经费
-                    //total：总经费     
+                    //total：总经费
                     //小型仪器设备费：device        deviceRemarks
                     //材料费：Material             MaterialRemarks
                     //测试化验加工费：processing    processingRemarks
@@ -455,7 +455,7 @@ export default {
   }
 }
 </script>
-  
+
 <style lang="less" scoped>
 #WordPreview{
   width: 100%;

src/components/MakerSpaceWordShow.vue

@@ -442,7 +442,7 @@
               </div>
 
               <div class="fundDataLie">
-                <div class="fundDataValue">知识产权事务费</div>
+                <div class="fundDataValue">论文版面费</div>
                 <div
                   class="fundDataValue"
                   v-text="wordData['fund']['Transaction']"
@@ -505,7 +505,7 @@
     <el-button type="primary" @click="getWord">下载表格</el-button>
   </div>
 </template>
-      
+
     <script>
 import { getMakerSpaceWord } from "@/components/tool/getWord";
 export default {
@@ -600,7 +600,7 @@ export default {
   },
 };
 </script>
-      
+
     <style lang="less" scoped>
 #MakerSpaceWord {
   width: 100%;

src/components/markerFundWord.vue

@@ -431,13 +431,13 @@
         </td>
       </tr>
       <tr>
-        <td colspan="4" style="border-left: none">知识产权事务费</td>
+        <td colspan="4" style="border-left: none">论文版面费</td>
         <td colspan="2">
           <el-input
             type="textarea"
             autosize
             resize="none"
-            placeholder="知识产权事务费"
+            placeholder="论文版面费"
             v-model.number="wordData['fund']['Transaction']"
             @change="
               convertNumber('Transaction', wordData['fund']['Transaction'])
@@ -576,7 +576,7 @@
     </div>
   </div>
 </template>
-      
+
     <script>
 import { getNowDate } from "@/components/tool/Date.js";
 
@@ -882,7 +882,7 @@ export default {
   },
 };
 </script>
-      
+
     <style lang="less" scoped>
 #markerFundWord {
   width: 100%;

src/components/markeractivityWord.vue

@@ -437,13 +437,13 @@
         </td>
       </tr>
       <tr>
-        <td colspan="4" style="border-left: none">知识产权事务费</td>
+        <td colspan="4" style="border-left: none">论文版面费</td>
         <td colspan="2">
           <el-input
             type="number"
             autosize
             resize="none"
-            placeholder="知识产权事务费"
+            placeholder="论文版面费"
             @change="checkProjectFund('Transaction')"
             v-model.number="wordData['fund']['Transaction']"
           >
@@ -561,7 +561,7 @@
     </div>
   </div>
 </template>
-      
+
     <script>
 import { getNowDate } from "@/components/tool/Date.js";
 
@@ -934,7 +934,7 @@ export default {
   },
 };
 </script>
-      
+
     <style lang="less" scoped>
 #MarkeractivityWord {
   width: 100%;

src/components/studentMakerProjectPreview.vue

@@ -249,7 +249,7 @@
                   <div class="fundDataValue">{{ wordData.fund[0].Collaboration }}</div>
                   <div class="fundDataValue">{{ wordData.fund[0].CollaborationRemarks }}</div>
                 </div>
-               
+
               </div>
             </div>
 
@@ -275,11 +275,11 @@
                 </div>
 
                 <div class="fundDataLie">
-                  <div class="fundDataValue">知识产权事务费</div>
+                  <div class="fundDataValue">论文版面费</div>
                   <div class="fundDataValue">{{ wordData.fund[0].Transaction }}</div>
                   <div class="fundDataValue">{{ wordData.fund[0].TransactionRemarks }}</div>
                 </div>
-               
+
               </div>
             </div>
           </div>
@@ -323,7 +323,7 @@
       </div>
     </div>
 </template>
-  
+
 <script>
 import { getNowDate } from './tool/Date';
 export default {
@@ -374,7 +374,7 @@ export default {
         // Transforming:"",//学生创客团队孵化、转化创业项目情况
         // condition:"",//立 项基 础及条 件
         fund:[],//预算经费
-        //total：总经费     
+        //total：总经费
         //小型仪器设备费：device        deviceRemarks
         //材料费：Material             MaterialRemarks
         //测试化验加工费：processing    processingRemarks
@@ -419,60 +419,60 @@ export default {
                 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'];
                     }
-    
+
                     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']==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'];
                     }
-    
+
                     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']==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']);
-    
+
                 fundDataArray.push(fundData);
             })
-            
+
       //       //去除标签
             for(let i in data['chapters']){
                 data['chapters'][i]=data['chapters'][i].replace(/<[^>]+>/g,"");
@@ -524,7 +524,7 @@ export default {
                 // Transforming:data['chapters']['Transforming'],//学生创客团队孵化、转化创业项目情况
                 // condition:data['chapters']['condition'],//立 项基 础及条 件
                 fund:fundDataArray,//预算经费
-                    //total：总经费     
+                    //total：总经费
                     //小型仪器设备费：device        deviceRemarks
                     //材料费：Material             MaterialRemarks
                     //测试化验加工费：processing    processingRemarks
@@ -542,7 +542,7 @@ export default {
   }
 }
 </script>
-  
+
 <style lang="less" scoped>
 #WordPreview{
   width: 100%;
@@ -804,7 +804,7 @@ export default {
             }
           }
         }
-        .fundData{       
+        .fundData{
           display: flex;
           .fundDataLabel{
             flex:1;

src/components/studentProjectWord.vue

@@ -25,13 +25,13 @@
           <el-radio v-model="wordData.radio" label="ed917c55-f51d-11ed-a3f6-509a4c5b67cf">创意组</el-radio>
         </td>
         <td colspan="4">立项项目为新立项项目，项目成果应具有较好的创意和较为成型的产品原型或能提供较好的商业模式，产生较好的社会效益。</td>
-      </tr> 
+      </tr>
       <tr>
         <td>
           <el-radio v-model="wordData.radio" label="f3068e26-f51d-11ed-a3f6-509a4c5b67cf">初创组</el-radio>
         </td>
         <td colspan="4">立项项目为学校已结题学生创客项目或已入驻学校创业孵化基地的学生初创企业项目（毕业两年内），项目成果应为原结题项目基础上的技术升级、企业注册、规模扩张。</td>
-      </tr> 
+      </tr>
       <tr id="checkList">
         <td colspan="2" ref="checkList">优先支持项目（可多选）</td> <td colspan="5">
           <el-checkbox-group v-model="wordData.checkList">
@@ -110,13 +110,13 @@
       <tr>
         <td colspan="2">项 目 组 人 数</td>
         <td>
-          
+
             {{ wordData.studentS.length + wordData.teacherS.length }}
 
           </td>
         <td>参与学生人数</td>
         <td>
-          
+
             {{ wordData.studentS.length }}
           </td>
           <td>参与教师人数</td>
@@ -472,13 +472,13 @@
         </td>
       </tr>
       <tr>
-        <td colspan="2">知识产权事务费</td><td>
+        <td colspan="2">论文版面费</td><td>
           <el-input
               type="number"
               autosize
               style="width: 100%;"
               resize="none"
-              placeholder="知识产权事务费"
+              placeholder="论文版面费"
               v-model="wordData.fund.affair">
             </el-input>
         </td><td colspan="2">
@@ -493,7 +493,7 @@
       </tr>
       <tr>
         <td style="height: 300px;">财务部门意见</td><td colspan="6" class="textLeft">
-          
+
             <div style="text-align: right;font-size: 18px;width: 80%;position: relative;bottom: -100px;">负责人签章：</div>
             <div style="text-align: right;font-size: 18px;width: 90%;position: relative;bottom: -110px;">年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日</div>
         </td>
@@ -510,11 +510,11 @@
         <span>1.表格可顺延或另附页。</span>
         <span>2.优先支持项目需提供与研发项目相关的实证材料并查看原件。</span>
         <span>3.初创组已结题项目申请需提供结题验收证明、初创企业申请需提供入驻学校孵化基地协议书及公司营业执照。</span>
-        
+
       </div>
 </div>
 </template>
-  
+
 <script>
 import {getNowDate} from '@/components/tool/Date.js'
 // import { getWord } from './tool/getWord';
@@ -522,15 +522,15 @@ import {getNowDate} from '@/components/tool/Date.js'
     props:['wordData'],
     data() {
       return {
-  
+
         allFund:'',
         input:"",
         DepartmentData:[],
 
 
-          
 
-        //total：总经费     
+
+        //total：总经费
         //小型仪器设备费：device        deviceRemarks
         //材料费：Material             MaterialRemarks
         //测试化验加工费：processing    processingRemarks
@@ -724,7 +724,7 @@ import {getNowDate} from '@/components/tool/Date.js'
     }
   };
 </script>
-  
+
 <style lang="less" scoped>
 #studentProjectWord{
     width: 100%;
@@ -810,16 +810,16 @@ import {getNowDate} from '@/components/tool/Date.js'
               -moz-appearance: textfield;
           }
         }
-        
+
     }
     .notes{
       width: 100%;
       display: flex;
       flex-direction:column;
     }
-    
+
 }
-   
+
 .operate{
     right:-85px;
     width:85px;

src/components/tool/getWord2.js

@@ -38,7 +38,7 @@ function getWord2(val){
 					return base64DataURLToArrayBuffer(value)
 				},
 				getSize:(arrayValue,value,tagName)=>{
-					let imgObj = ImageList.find(i=>i.tagName==tagName) 
+					let imgObj = ImageList.find(i=>i.tagName==tagName)
 					let newWidth = 550;
 					let newHeight = (newWidth*imgObj.height)/imgObj.width;
 					return [newWidth,newHeight]
@@ -48,7 +48,7 @@ function getWord2(val){
 			doc.loadZip(zip);
 
 			doc.attachModule(new ImageModule(opts));
-			
+
 			//填写数据
 			doc.setData({
 					nowTime:getNowDate(1),//申请日期
@@ -116,8 +116,8 @@ function getWord2(val){
 					signTwoTime:val.signData.filter(i=>i.type==0)[0]?val.signData.filter(i=>i.type==0)[0].time:'',
 
 
-					expertOpinion:val.opinion,
-					promotion:val.promotion!=-1?'经专家组评审，一致通过，同意该项目立项。':'',
+					expertOpinion:val.opinion.find(i=>i.type=='1'),
+					promotion:val.opinion.find(i=>i.type=='1')?val.opinion.find(i=>i.type=='1').text:'',
 
 					signThree:val.signData.filter(i=>i.type==3)[0]?val.signData.filter(i=>i.type==3)[0].text:'',
 					signThreePerson:val.signData.filter(i=>i.type==3)[0]?val.signData.filter(i=>i.type==3)[0].username:'',
@@ -166,7 +166,7 @@ function getImage(elList){
 	})
 }
 
-// 
+//
 
 function base64DataURLToArrayBuffer(dataURL) {
   const base64Regex = /^data:image\/(png|jpg|svg|svg\+xml);base64,/;

src/views/activityManage/components/NomMarkerWord.vue

@@ -74,7 +74,7 @@
                       </el-input>
                 </td>
             </tr>
-            
+
             <tr id="five">
                 <td colspan="2" :rowspan="wordData['member'].length+1"><p>活</p> <p>动</p> <p>指</p> <p>导</p> <p>老</p> <p>师</p></td><td colspan="2">姓名</td><td colspan="3">工作单位/部门</td><td colspan="9">项目分工</td>
             </tr>
@@ -272,13 +272,13 @@
               <td colspan="5">创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。</td>
             </tr>
             <tr>
-              <td colspan="4" style="border-left: none;">知识产权事务费</td>
+              <td colspan="4" style="border-left: none;">论文版面费</td>
               <td colspan="2">
                 <el-input
                       type="number"
                       autosize
                       resize="none"
-                      placeholder="知识产权事务费"
+                      placeholder="论文版面费"
                       v-model.number="wordData['fund']['Transaction']">
                     </el-input>
               </td>
@@ -287,7 +287,7 @@
 
             <tr class="textLeft">
                 <td><p>所在部</p> <p>门意见</p></td><td colspan="15" style="height: 200px;">
-                 
+
                     <div style="text-align: right;font-size: 18px;width: 80%;margin-bottom: 20px;">负责人签章：</div>
                     <div style="text-align: right;font-size: 18px;width: 90%;">年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日</div>
                 </td>
@@ -302,9 +302,9 @@
           </div>
     </div>
     </template>
-      
+
     <script>
-    
+
       export default {
         props:['wordData','total'],
         data() {
@@ -346,7 +346,7 @@
             document.querySelector(str).scrollIntoView({ behavior: "smooth" });
           },
         },
-        
+
         computed:{   //经费总合
 
         },
@@ -358,10 +358,10 @@
 				}
       };
     </script>
-      
+
     <style lang="less" scoped>
 
-    
+
     #MarkeractivityWord{
         width: 100%;
         display: flex;
@@ -389,7 +389,7 @@
                 margin-bottom:40px ;
             }
             .date{
-    
+
                 font-size: 1em;
                 position: absolute;
                 bottom: 0;
@@ -400,7 +400,7 @@
         .table{
             border: none;
             border-top: solid 1px black;
-           
+
             tr{
               position: relative;
               .bold{
@@ -417,7 +417,7 @@
                 &:nth-child(1){
                   border-left:  solid 1px black;
                 }
-              
+
                 p{
                   font-weight: 600;
                 }
@@ -442,7 +442,7 @@
                   &[type='number'] {
                     -moz-appearance: textfield;
                   }
-                  
+
                   border-radius: 0px;
                   text-align: center;
                   font-size: 16px;

src/views/activityManage/components/markeractivityWord.vue

@@ -1,6 +1,6 @@
 <template>
     <div id="MarkeractivityWord">
-       
+
         <table border="1" cellspacing="0" class="table">
           <div id="title">
             <div class="school">深圳技师学院</div>
@@ -34,7 +34,7 @@
                 </td>
                 <td colspan="3" class="bold">预算经费</td>
                 <td @click="goto('#fund')" colspan="4" v-text="total">
-                    
+
                 </td>
             </tr>
             <tr id="three">
@@ -96,7 +96,7 @@
                       </el-input>
                 </td>
             </tr>
-            
+
             <tr id="five">
                 <td colspan="2" :rowspan="wordData['member'].length+1"><p>活</p> <p>动</p> <p>指</p> <p>导</p> <p>老</p> <p>师</p></td><td colspan="2">姓名</td><td colspan="3">工作单位/部门</td><td colspan="9">项目分工</td>
             </tr>
@@ -178,7 +178,7 @@
                 </td>
             </tr> -->
 
-           
+
             <tr class="textLeft" id="ten">
                 <td colspan="2"><p>经费</p><br><p>支出</p> <br><p>计划</p></td><td colspan="15" style="text-align: left;">
                     <el-input
@@ -315,13 +315,13 @@
               <td colspan="5">创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。</td>
             </tr>
             <tr>
-              <td colspan="4" style="border-left: none;">知识产权事务费</td>
+              <td colspan="4" style="border-left: none;">论文版面费</td>
               <td colspan="2">
                 <el-input
                       type="number"
                       autosize
                       resize="none"
-                      placeholder="知识产权事务费"
+                      placeholder="论文版面费"
                       @change="checkProjectFund('Transaction')"
                       v-model.number="wordData['fund']['Transaction']">
                     </el-input>
@@ -349,9 +349,9 @@
           </div>
     </div>
     </template>
-      
+
     <script>
-    
+
       export default {
         props:['wordData','total'],
         data() {
@@ -360,7 +360,7 @@
             // myselfFund:0,
             DepartmentData:[],
             ProjectData:[],
-        
+
             }
         },
         methods: {
@@ -420,14 +420,14 @@
           //     // console.log(result);
           //     let data = result['data'][1]
           //     let total = Number(result['data'][0][0]['fund']);
- 
+
           //     if(!this.wordData['acId']){
           //       this.wordData['college'] = result['data'][0][0]['classid'];
           //       this.wordData['tel'] = result['data'][0][0]['phone'];
           //       this.wordData['pro_leader'] = result['data'][0][0]['pro_leader'];
           //     }
-              
-              
+
+
           //     let isUse = 0;
           //     let myFund = 0;
           //     // let istrue=false;
@@ -487,7 +487,7 @@
             document.querySelector(str).scrollIntoView({ behavior: "smooth" });
           },
         },
-        
+
         computed:{   //经费总合
 
         },
@@ -502,10 +502,10 @@
 				}
       };
     </script>
-      
+
     <style lang="less" scoped>
 
-    
+
     #MarkeractivityWord{
         width: 100%;
         display: flex;
@@ -534,7 +534,7 @@
                 margin-bottom:40px ;
             }
             .date{
-    
+
                 font-size: 1em;
                 position: absolute;
                 bottom: 0;
@@ -544,7 +544,7 @@
         }
         .table{
             border: none;
-            border-top: solid 1px black;  
+            border-top: solid 1px black;
             position: relative;
             margin-top: 130px;
             .bold{
@@ -587,7 +587,7 @@
                 &[type='number'] {
                   -moz-appearance: textfield;
                 }
-                
+
                 border-radius: 0px;
                 text-align: center;
                 font-size: 16px;

src/views/activityManage/components/markeractivityWordShow.vue

@@ -26,7 +26,7 @@
                 <td colspan="5" v-text="wordData['activityTime'][0].split(' ')[0]+' 至 '+wordData['activityTime'][1].split(' ')[0]"></td>
                 <td colspan="3">参与学生人数</td><td colspan="5" v-text="wordData['student']"></td>
             </tr>
-            
+
             <tr id="five">
                 <td colspan="2" :rowspan="wordData['member'].length+1"><p>活</p> <p>动</p> <p>指</p> <p>导</p> <p>老</p> <p>师</p></td><td colspan="2">姓名</td><td colspan="3">工作单位/部门</td><td colspan="9">项目分工</td>
             </tr>
@@ -60,7 +60,7 @@
                 </td>
             </tr> -->
 
-           
+
             <tr class="textLeft" id="ten">
                 <td colspan="2"><p>经费</p><br><p>支出</p> <br><p>计划</p></td><td colspan="15" style="text-align: left;vertical-align: top;height: 200px;" v-text="wordData['fundingPlan']"></td>
             </tr>
@@ -122,14 +122,14 @@
               <td colspan="5">创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。</td>
             </tr>
             <tr>
-              <td colspan="4" style="border-left: none;">知识产权事务费</td>
+              <td colspan="4" style="border-left: none;">论文版面费</td>
               <td colspan="2" v-text="wordData['fund']['Transaction']"></td>
               <td colspan="5">论文版面费、专利及其他知识产权事务等费用。</td>
             </tr>
 
             <tr class="textLeft">
                 <td><p>所在部</p> <p>门意见</p></td><td colspan="15" style="height: 200px;">
-                 
+
                     <div style="text-align: right;font-size: 18px;width: 80%;margin-bottom: 20px;">负责人签章：</div>
                     <div style="text-align: right;font-size: 18px;width: 90%;">年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日</div>
                 </td>
@@ -148,9 +148,9 @@
           </div>
     </div>
     </template>
-      
+
     <script>
-    
+
       export default {
         props:['wordData','total'],
         data() {
@@ -163,7 +163,7 @@
             document.querySelector(str).scrollIntoView({ behavior: "smooth" });
           },
         },
-        
+
         computed:{   //经费总合
 
         },
@@ -171,10 +171,10 @@
         }
       };
     </script>
-      
+
     <style lang="less" scoped>
 
-    
+
     #MarkeractivityWord{
         width: 1200px;
         display: flex;
@@ -202,7 +202,7 @@
                 margin-bottom:40px ;
             }
             .date{
-    
+
                 font-size: 1em;
                 position: absolute;
                 bottom: 0;
@@ -250,7 +250,7 @@
                 &[type='number'] {
                   -moz-appearance: textfield;
                 }
-                
+
                 border-radius: 0px;
                 text-align: center;
                 font-size: 16px;

src/views/commission/components/projectLookSpace.vue

@@ -334,7 +334,7 @@
               </div>
 
               <div class="fundDataLie">
-                <div class="fundDataValue">知识产权事务费</div>
+                <div class="fundDataValue">论文版面费</div>
                 <div
                   class="fundDataValue"
                   v-text="wordData['fund']['Transaction']"
@@ -356,7 +356,7 @@
               </div>
             </div>
           </div>
-  
+
           <div class="opinion">
             <div class="opinionLabel">财务部门<br/>意 见</div>
             <div class="opinionValue">
@@ -366,7 +366,7 @@
               </div>
             </div>
           </div>
-  
+
           <div class="opinion">
             <div class="opinionLabel">创新创业学院<br/>审 核 意 见</div>
             <div class="opinionValue">
@@ -385,7 +385,7 @@
     <!-- <el-button v-if="downFile" type="primary" @click="getWord">下载表格</el-button> -->
   </div>
 </template>
-    
+
   <script>
 // import {getMakerSpaceWord} from '@/components/tool/getWord'
 
@@ -508,7 +508,7 @@ export default {
   },
 };
 </script>
-    
+
   <style lang="less" scoped>
 #MakerSpaceWord {
   width: 100%;

src/views/commission/components/projectLookstudnt.vue

@@ -293,7 +293,7 @@
             </td>
           </tr>
           <tr>
-            <td colspan="2">知识产权事务费</td><td v-text="downWordData.fund.Transaction">
+            <td colspan="2">论文版面费</td><td v-text="downWordData.fund.Transaction">
             </td><td colspan="2">
               论文版面费、专利及其他知识产权事务等费用。
             </td>

src/views/fundManage/makerfundDetails.vue

@@ -257,7 +257,7 @@ export default {
             "创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。",
         },
         {
-          fundName: "知识产权事务费",
+          fundName: "论文版面费",
           budget: "",
           havePaid: 0,
           thisApply: "",

src/views/fundManage/newMarkerfundApply.vue

@@ -207,7 +207,7 @@ export default {
             "创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。",
         },
         {
-          fundName: "知识产权事务费",
+          fundName: "论文版面费",
           budget: "",
           havePaid: 0,
           thisApply: "",

src/views/fundManage/newNomMarkerFundApply.vue

@@ -28,7 +28,7 @@
     </div>
     <hr>
     <table border="1" cellspacing="0" class="table">
-       
+
         <tr>
             <td colspan="2">经济支出类别</td><td>预算</td><td>已支付</td><td>本次申请</td><td>余额</td><td colspan="3">备注</td>
         </tr>
@@ -74,7 +74,7 @@
         <tr>
             <td v-for="(i,k) in 9" :key="k" style="border: none;"></td>
         </tr>
-        
+
     </table>
     <div class="baseBtn">
         <div class="blockWidth">
@@ -91,7 +91,7 @@
       width="600px"
       class="pageSubmitData"
     >
-      
+
       <span class="deleteContent">确定生成Excel?</span>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="downLoadExcel" class="AllDialogBtn">确认</el-button>
@@ -107,7 +107,7 @@
       width="600px"
       class="pageSubmitData"
     >
-      
+
       <span class="deleteContent">确定提交?</span>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitAll" class="AllDialogBtn">确认</el-button>
@@ -131,7 +131,7 @@ export default {
       },
     data() {
         return {
-            projectFilter:[],    //项目名称列表            
+            projectFilter:[],    //项目名称列表
             projectName:'',      //所选名称
             downLoadExcelDig:false,//下载Excel对话框
             submitDataDig:false,//提交对话框
@@ -144,7 +144,7 @@ export default {
                 {fundName:'项目成功鉴定费',budget:'',havePaid:0,thisApply:'',remark:'学术会务费、评审费、鉴定费、成果集制作费等费用。'},
                 {fundName:'参展参赛费',budget:'',havePaid:0,thisApply:'',remark:'参加创客展会、竞赛等所需的报名费、展位费、布展费、宣传推广费及差旅费等费用。'},
                 {fundName:'创客交流活动费',budget:'',havePaid:0,thisApply:'',remark:'创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。'},
-                {fundName:'知识产权事务费',budget:'',havePaid:0,thisApply:'',remark:'论文版面费、专利及其他知识产权事务等费用。'},
+                {fundName:'论文版面费',budget:'',havePaid:0,thisApply:'',remark:'论文版面费、专利及其他知识产权事务等费用。'},
             ],
             intro:'',   //事由
             tit:'',
@@ -163,15 +163,15 @@ export default {
                     let data=res.data[0]
                     // console.log(data);
                     this.projectFilter=data
-                   
+
                 },err=>{
                     console.log(err);
                 })
         },
-         
+
         getFundData(){
             // console.log(this.projectName);
-            //total：总经费     
+            //total：总经费
             //小型仪器设备费：device        deviceRemarks
             //材料费：Material             MaterialRemarks
             //测试化验加工费：processing    processingRemarks
@@ -193,11 +193,11 @@ export default {
                 // console.log(data);
                 this.fundList[0].budget=data.device
                 this.fundList[1].budget=data.Material
-                this.fundList[2].budget=data.processing 
-                this.fundList[3].budget=data.Collaboration 
+                this.fundList[2].budget=data.processing
+                this.fundList[3].budget=data.Collaboration
                 this.fundList[4].budget=data.APPRAISAL
-                this.fundList[5].budget=data.entery 
-                this.fundList[6].budget=data.activities 
+                this.fundList[5].budget=data.entery
+                this.fundList[6].budget=data.activities
                 this.fundList[7].budget=data.Transaction
                 this.tit=res.data[0][0].title
                 this.ty=res.data[0][0].type
@@ -257,13 +257,13 @@ export default {
             if (data.length==8) return this.$message.error('请填写本次申请金额')
             let arr=[this.fundList[0].thisApply,this.fundList[1].thisApply,this.fundList[2].thisApply,this.fundList[3].thisApply,this.fundList[4].thisApply,this.fundList[5].thisApply,this.fundList[6].thisApply,this.fundList[7].thisApply]
             let arr2=[this.fundList[0].havePaid,this.fundList[1].havePaid,this.fundList[2].havePaid,this.fundList[3].havePaid,this.fundList[4].havePaid,this.fundList[5].havePaid,this.fundList[6].havePaid,this.fundList[7].havePaid]
-            
+
             let fund=arr.reduce((prev,cur,index,arr) => {
                 return prev + cur*1;
-            },0); 
+            },0);
             let fund2=arr2.reduce((prev,cur,index,arr) => {
                 return prev + cur*1;
-            },0); 
+            },0);
             // return console.log(fund,fund2);
             if (fund+fund2>this.allFund) return this.$message.error('申请金额已大于预算')
             this.submitDataDig=true
@@ -356,10 +356,10 @@ export default {
     //         display: flex;
     //         margin-bottom: 10px;
     //     }
-        
+
     // }
 
-    .table{ 
+    .table{
         border: none;
         border-top: solid 1px black;
         // border-right:  solid 1px black;
@@ -382,7 +382,7 @@ export default {
             text-align: center;
             line-height: 30px;
             width: 100px;
-           
+
           &:nth-child(1){
                 border-left:  solid 1px black;
               }
@@ -415,7 +415,7 @@ export default {
             }
           }
         }
-        
+
     }
     .textLeft{
           :deep(.el-textarea__inner){

src/views/printView/components/studentProjectWordShow.vue

@@ -568,7 +568,7 @@
         </td>
       </tr>
       <tr>
-        <td colspan="2">知识产权事务费</td>
+        <td colspan="2">论文版面费</td>
         <td v-text="downWordData.fund.Transaction"></td>
         <td colspan="2">论文版面费、专利及其他知识产权事务等费用。</td>
       </tr>
@@ -629,7 +629,7 @@
       <tr>
         <td><span class="jc">专家意见</span></td>
         <td colspan="6" class="textLeft">
-					<span v-if="downWordData.promotion>=0" style="position: absolute;left: 15px;top: 15px;">经专家组评审，一致通过，同意该项目立项。</span>
+					<span v-if="downWordData.opinion.find(i=>i.type=='1')" style="position: absolute;left: 15px;top: 15px;">{{downWordData.opinion.find(i=>i.type=='1').text}}</span>
           <!-- <el-button type="primary" style="position: absolute; right: 130px; top: 5px" v-if="![1,2].includes($store.state.userInfo.type)" @click="$emit('saveFile')">保存</el-button> -->
           <!-- <beUpload
             v-if="![1, 2].includes($store.state.userInfo.type)"
@@ -652,6 +652,7 @@
               class="fileBlock"
               v-for="(item, index) in downWordData.opinion"
               :key="index + 'l'"
+              v-show="item.type=='1'"
             >
               <div class="fileBox">
                 <div

src/views/projectApply/components/MakerSpaceWord.vue

@@ -672,13 +672,13 @@
               </div>
 
               <div class="fundDataLie">
-                <div class="fundDataValue">知识产权事务费</div>
+                <div class="fundDataValue">论文版面费</div>
                 <div class="fundDataValue">
                   <el-input
                     type="number"
                     autosize
                     resize="none"
-                    placeholder="知识产权事务费"
+                    placeholder="论文版面费"
                     v-model.number="wordData['fund']['Transaction']"
                   >
                   </el-input>
@@ -732,7 +732,7 @@
     </div>
   </div>
 </template>
-  
+
 <script>
 import EditorBar from "@/components/tool/wangEnduit";
 export default {
@@ -808,7 +808,7 @@ export default {
   },
 };
 </script>
-  
+
 <style lang="less" scoped>
 #MakerSpaceWord {
   width: 1400px;

src/views/projectApply/components/MakerSpaceWordShow.vue

@@ -101,7 +101,7 @@
                   <div class="chaptersValue" id="seven">
                     <span>项目简介(200-300字)</span><br/>
                     <p v-text="wordData['brief']"></p>
-                    
+
                   </div>
                   <div class="chaptersValue" id="eight">
                     <span>建设内容（空间优化/场馆规划方面拟解决的关键问题及主要建设指标）</span><br/>
@@ -120,7 +120,7 @@
                   <div class="chaptersValue" id="nine">
                     <span>立项依据(说明本项目的目的、意义以及国内外高校现状、市场预测和发展趋势，预期达到的目标，研究的预期效果分析，成果受益面)</span><br/>
                     <p v-text="wordData['ProjectBasis']"></p>
-                    
+
                   </div>
               </div>
             </div>
@@ -134,22 +134,22 @@
                   <div class="chaptersValue" id="ten">
                     <span>创客空间物理环境、制度建设及软件设施建设情况（环境优化/制度完善/设施改造）</span><br/>
                     <p v-text="wordData['development']"></p>
-                    
+
                   </div>
                   <div class="chaptersValue" id="eleven">
                     <span>学生创客工作室建设情况（工作室数量及活动开展情况）</span><br/>
                     <p v-text="wordData['studio']"></p>
-                   
+
                   </div>
                   <div class="chaptersValue" id="twelve">
                     <span>学生创客团队（人才）培养预期成果、数量</span><br/>
                     <p v-text="wordData['studentTeam']"></p>
-                   
+
                   </div>
                   <div class="chaptersValue" id="thirteen">
                     <span>学生创客活动组织实施情况</span><br/>
                     <p v-text="wordData['studentActivities']"></p>
-                    
+
                   </div>
                   <div class="chaptersValue" id="fourteen">
                     <span>学生创客团队孵化、转化创业项目情况</span><br/>
@@ -175,11 +175,11 @@
                   <div class="chaptersValue" id="fifteen">
                     <span>基础条件（物理环境/设备设施/项目实施/活动开展/技术力量/社会资源）</span><br/>
                     <p v-text="wordData['condition']"></p>
-                   
+
                   </div>
               </div>
             </div>
-    
+
             <div class="fund">
               <div class="fundTitle">
                 预算<br/>经费
@@ -201,69 +201,69 @@
                     <div class="fundDataLie">
                       <div class="fundDataValue">小型仪器设备费</div>
                       <div class="fundDataValue" v-text="wordData['fund']['device']">
-                      
+
                       </div>
                       <div class="fundDataValue"><span>项目开展所需的小型专用仪器设备、工具、配件购置或租赁费用。</span></div>
                     </div>
-    
+
                     <div class="fundDataLie">
                       <div class="fundDataValue">材料费</div>
                       <div class="fundDataValue" v-text="wordData['fund']['Material']">
-                        
+
                       </div>
                       <div class="fundDataValue"><span>项目开展需消耗的各种原材料、辅助材料等低值易耗品的采购费用。</span></div>
                     </div>
-    
+
                     <div class="fundDataLie">
                       <div class="fundDataValue">测试化验加工费</div>
                       <div class="fundDataValue" v-text="wordData['fund']['processing']">
-                       
+
                       </div>
                       <div class="fundDataValue"><span>项目开展过程中支付给外单位的检验、测试、化验、计算、分析及加工费等费用。</span></div>
                     </div>
-    
+
                     <div class="fundDataLie">
                       <div class="fundDataValue">项目协作费</div>
                       <div class="fundDataValue" v-text="wordData['fund']['Collaboration']">
-                       
+
                       </div>
                       <div class="fundDataValue"><span>按合同规定支付给协作单位的费用</span></div>
                     </div>
-                   
+
                   </div>
                 </div>
-    
+
                 <div class="fundData">
                   <div class="fundDataLabel">间接费用</div>
                   <div class="fundDataHan">
                     <div class="fundDataLie">
                       <div class="fundDataValue">项目成果鉴定费</div>
                       <div class="fundDataValue" v-text="wordData['fund']['APPRAISAL']">
-                       
+
                       </div>
                       <div class="fundDataValue"><span>学术会务费、评审费、鉴定费、成果集制作费等费用。</span></div>
                     </div>
-    
+
                     <div class="fundDataLie">
                       <div class="fundDataValue">参展参赛费</div>
                       <div class="fundDataValue" v-text="wordData['fund']['entery']">
-                        
+
                       </div>
                       <div class="fundDataValue"><span>参加创客展会、竞赛等所需的报名费、展位费、布展费、宣传推广费及差旅费等费用。</span></div>
                     </div>
-    
+
                     <div class="fundDataLie">
                       <div class="fundDataValue">创客交流活动费</div>
                       <div class="fundDataValue" v-text="wordData['fund']['activities']">
-                        
+
                       </div>
                       <div class="fundDataValue"><span>创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。</span></div>
                     </div>
-    
+
                     <div class="fundDataLie">
                       <div class="fundDataValue">知识产权事务费</div>
                       <div class="fundDataValue" v-text="wordData['fund']['Transaction']">
-                        
+
                       </div>
                       <div class="fundDataValue"><span>论文版面费、专利及其他知识产权事务等费用。</span></div>
                     </div>
@@ -280,7 +280,7 @@
                 </div>
               </div>
             </div>
-    
+
             <div class="opinion">
               <div class="opinionLabel">财务部门<br/>意 见</div>
               <div class="opinionValue">
@@ -290,7 +290,7 @@
                 </div>
               </div>
             </div>
-    
+
             <div class="opinion">
               <div class="opinionLabel">创新创业学院<br/>审 核 意 见</div>
               <div class="opinionValue">
@@ -581,7 +581,7 @@
         </td>
       </tr>
       <tr>
-        <td colspan="2">知识产权事务费</td>
+        <td colspan="2">论文版面费</td>
         <td v-text="wordData['fund']['Transaction']"></td>
         <td colspan="3">论文版面费、专利及其他知识产权事务等费用。</td>
       </tr>
@@ -624,7 +624,7 @@
     <!-- <el-button type="primary" @click="getWord">下载表格</el-button> -->
   </div>
 </template>
-      
+
     <script>
 import { getMakerSpaceWord } from "@/components/tool/getWord";
 export default {
@@ -698,7 +698,7 @@ export default {
   },
 };
 </script>
-      
+
     <style lang="less" scoped>
 #MakerSpaceWord {
   max-width:1400px;

src/views/projectApply/components/studentProjectWord.vue

@@ -747,7 +747,7 @@
       <tr>
         <td colspan="2">
 					<el-tooltip class="item" effect="dark" content="统一双创学院支出，此费用修改为0，原来在这个部分的费用可分摊到其他项目。" placement="top">
-    			  <span>知识产权事务费</span>
+    			  <span>论文版面费</span>
     			</el-tooltip></td>
         <td>
 					<el-tooltip class="item" effect="dark" content="统一双创学院支出，此费用修改为0，原来在这个部分的费用可分摊到其他项目。" placement="top">
@@ -756,7 +756,7 @@
             autosize
             style="width: 100%"
             resize="none"
-            placeholder="知识产权事务费"
+            placeholder="论文版面费"
             v-model="wordData.fund.Transaction"
           >
           </el-input>
@@ -833,9 +833,9 @@
           class="textLeft"
           style="height: 200px; position: relative"
         >
-				<span v-if="wordData.promotion>=0" style="position: absolute;left: 15px;top: 15px;">经专家组评审，一致通过，同意该项目立项。</span>
+				<span v-if="wordData.opinion.find(i=>i.type=='1')" style="position: absolute;left: 15px;top: 15px;">{{ wordData.opinion.find(i=>i.type=='1').text }}</span>
           <!-- <el-button type="primary" style="position: absolute; right: 130px; top: 5px" v-if="![1,2].includes($store.state.userInfo.type) && wordData.courseId" @click="$emit('saveFile')">保存</el-button> -->
-          <beUpload
+          <!-- <beUpload
             v-if="
               ![1, 2].includes($store.state.userInfo.type) && wordData.courseId
             "
@@ -850,7 +850,7 @@
             :percentage="progress.value"
             :format="ProgressFormat"
             style="width: 80%"
-          ></el-progress>
+          ></el-progress> -->
           <div
             v-if="wordData.opinion"
             :class="wordData.opinion.length > 0 ? 'bigBlock' : 'noFileBox'"
@@ -858,6 +858,7 @@
             <div
               class="fileBlock"
               v-for="(item, index) in wordData.opinion"
+              v-show="item.type=='1'"
               :key="index + 'l'"
             >
               <div class="fileBox">
@@ -873,7 +874,7 @@
                   class="fileBoxRight"
                   v-if="![1, 2].includes($store.state.userInfo.type)"
                 >
-                  <div class="chapter_upload_ud" style="z-index: 99">
+                  <!-- <div class="chapter_upload_ud" style="z-index: 99">
                     <div
                       class="chapter_upload_up"
                       @click="$emit('fileOption', item, index, '1')"
@@ -890,7 +891,7 @@
                   <div
                     class="chapter_upload_ic_r"
                     @click="$emit('fileOption', item, index, '4')"
-                  ></div>
+                  ></div> -->
                 </div>
               </div>
             </div>

src/views/projectApply/components/studentProjectWordShow.vue

@@ -512,7 +512,7 @@
         </td>
       </tr>
       <tr>
-        <td colspan="2">知识产权事务费</td>
+        <td colspan="2">论文版面费</td>
         <td v-text="downWordData.fund.Transaction"></td>
         <td colspan="2">论文版面费、专利及其他知识产权事务等费用。</td>
       </tr>
@@ -573,9 +573,9 @@
       <tr>
         <td><span class="jc">专家意见</span></td>
         <td colspan="6" class="textLeft">
-					<span v-if="downWordData.promotion>=0" style="position: absolute;left: 15px;top: 15px;">经专家组评审，一致通过，同意该项目立项。</span>
+					<span v-if="downWordData.opinion.find(i=>i.type=='1')" style="position: absolute;left: 15px;top: 15px;">{{downWordData.opinion.find(i=>i.type=='1').text}}</span>
           <!-- <el-button type="primary" style="position: absolute; right: 130px; top: 5px" v-if="![1,2].includes($store.state.userInfo.type)" @click="$emit('saveFile')">保存</el-button> -->
-          <beUpload
+          <!-- <beUpload
             v-if="![1, 2].includes($store.state.userInfo.type)"
             style="position: absolute; right: 10px; top: 5px"
             @getFile="getFile"
@@ -588,13 +588,14 @@
             :percentage="progress.value"
             :format="ProgressFormat"
             style="width: 80%"
-          ></el-progress>
+          ></el-progress> -->
           <div
             :class="downWordData.opinion.length > 0 ? 'bigBlock' : 'noFileBox'"
           >
             <div
               class="fileBlock"
               v-for="(item, index) in downWordData.opinion"
+              v-show="item.type=='1'"
               :key="index + 'l'"
             >
               <div class="fileBox">
@@ -610,7 +611,7 @@
                   class="fileBoxRight"
                   v-if="![1, 2].includes($store.state.userInfo.type)"
                 >
-                  <div class="chapter_upload_ud" style="z-index: 99">
+                  <!-- <div class="chapter_upload_ud" style="z-index: 99">
                     <div
                       class="chapter_upload_up"
                       @click="$emit('fileOption', item, index, '1')"
@@ -627,7 +628,7 @@
                   <div
                     class="chapter_upload_ic_r"
                     @click="$emit('fileOption', item, index, '4')"
-                  ></div>
+                  ></div> -->
                 </div>
               </div>
             </div>

src/views/projectManage/components/Closingstatement.vue

@@ -1153,7 +1153,7 @@
           </td>
         </tr>
         <tr>
-          <td>知识产权事务费</td>
+          <td>论文版面费</td>
           <td>-</td>
           <td>
             <el-input-number
@@ -1326,15 +1326,16 @@
         <tr style="height: 350px">
           <td class="vertical">专家意见</td>
           <td colspan="7" style="position: relative">
-            <!-- <span
-              v-if="myArrayProp[0]['promotion'] != -1"
+            <span
+              v-if="myArrayProp[0].opinion.find(i=>i.type==2)"
               style="position: absolute; left: 15px; top: 15px"
-              >经专家组评审，一致通过，同意该项目立项。</span
-            > -->
-            <!-- <div :class="!!myArrayProp[0].opinion ? 'bigBlock' : 'noFileBox'">
+              >{{ myArrayProp[0].opinion.find(i=>i.type==2).text}}</span
+            >
+            <div :class="!!myArrayProp[0].opinion ? 'bigBlock' : 'noFileBox'">
               <div
                 class="fileBlock"
                 v-for="(item, index) in myArrayProp[0].opinion"
+                v-show="item.type==2"
                 :key="index + 'l'"
               >
                 <div class="fileBox">
@@ -1344,8 +1345,8 @@
                   </div>
                 </div>
               </div>
-            </div> -->
-            <!-- <div
+            </div>
+            <div
               v-if="myArrayProp[0]['promotion'] != -1"
               style="
                 width: 95%;
@@ -1355,7 +1356,7 @@
               "
             >
               2024年4月16日
-            </div> -->
+            </div>
           </td>
         </tr>
       </tbody>

src/views/projectManage/components/FundDetail.vue

@@ -35,7 +35,7 @@
             按合同规定支付给协作单位的费用
           </td>
         </tr>
-  
+
         <tr>
           <td rowspan="5">间接费用</td>
         </tr>
@@ -58,7 +58,7 @@
           </td>
         </tr>
         <tr>
-          <td colspan="2">知识产权事务费</td><td v-text="data['Transaction']">
+          <td colspan="2">论文版面费</td><td v-text="data['Transaction']">
           </td><td colspan="2">
             论文版面费、专利及其他知识产权事务等费用。
           </td>
@@ -154,7 +154,7 @@ mounted(){
           box-sizing: border-box;
           padding: 5px;
           }
-      }      
+      }
   }
 }
 </style>

src/views/projectManage/components/MakerSpaceWordShow.vue

@@ -334,7 +334,7 @@
               </div>
 
               <div class="fundDataLie">
-                <div class="fundDataValue">知识产权事务费</div>
+                <div class="fundDataValue">论文版面费</div>
                 <div
                   class="fundDataValue"
                   v-text="wordData['fund']['Transaction']"
@@ -388,7 +388,7 @@
     <!-- <el-button v-if="downFile" type="primary" @click="getWord">下载表格</el-button> -->
   </div>
 </template>
-      
+
     <script>
 // import {getMakerSpaceWord} from '@/components/tool/getWord'
 
@@ -523,7 +523,7 @@ export default {
 	}
 };
 </script>
-      
+
     <style lang="less" scoped>
 #MakerSpaceWord {
   width: 1400px;

src/views/projectManage/components/markeractivityWordShow.vue

@@ -26,7 +26,7 @@
                 <td colspan="5" v-text="wordData['activityTime'][0].split(' ')[0]+' 至 '+wordData['activityTime'][1].split(' ')[0]"></td>
                 <td colspan="3"><span class="jc">参与学生人数</span></td><td colspan="5" v-text="wordData['student']"></td>
             </tr>
-            
+
             <tr id="five">
                 <td colspan="2" :rowspan="wordData['member'].length+1"><p>活</p> <p>动</p> <p>指</p> <p>导</p> <p>老</p> <p>师</p></td><td colspan="2">姓名</td><td colspan="3">工作单位/部门</td><td colspan="9">项目分工</td>
             </tr>
@@ -60,7 +60,7 @@
                 </td>
             </tr> -->
 
-           
+
             <tr class="textLeft" id="ten">
                 <td colspan="2"><p>经费</p><br><p>支出</p> <br><p>计划</p></td><td colspan="15" style="text-align: left;vertical-align: top;height: 200px;" v-text="wordData['fundingPlan']"></td>
             </tr>
@@ -122,14 +122,14 @@
               <td colspan="5">创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。</td>
             </tr>
             <tr>
-              <td colspan="4" style="border-left: none;">知识产权事务费</td>
+              <td colspan="4" style="border-left: none;">论文版面费</td>
               <td colspan="2" v-text="wordData['fund']['Transaction']"></td>
               <td colspan="5">论文版面费、专利及其他知识产权事务等费用。</td>
             </tr>
 
             <tr class="textLeft">
                 <td><p>所在部</p> <p>门意见</p></td><td colspan="15" style="height: 200px;">
-                 
+
                     <div style="text-align: right;font-size: 18px;width: 80%;margin-bottom: 20px;">负责人签章：</div>
                     <div style="text-align: right;font-size: 18px;width: 90%;">年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日</div>
                 </td>
@@ -148,9 +148,9 @@
           </div>
     </div>
     </template>
-      
+
     <script>
-    
+
       export default {
         props:['wordData','total'],
         data() {
@@ -163,7 +163,7 @@
             document.querySelector(str).scrollIntoView({ behavior: "smooth" });
           },
         },
-        
+
         computed:{   //经费总合
 
         },
@@ -171,10 +171,10 @@
         }
       };
     </script>
-      
+
     <style lang="less" scoped>
 
-    
+
     #MarkeractivityWord{
         width: 100%;
         display: flex;
@@ -202,7 +202,7 @@
                 margin-bottom:40px ;
             }
             .date{
-    
+
                 font-size: 1em;
                 position: absolute;
                 bottom: 0;
@@ -213,7 +213,7 @@
         .table{
             border: none;
             border-top: solid 1px black;
-           
+
             tr{
               position: relative;
             td{
@@ -250,7 +250,7 @@
                 &[type='number'] {
                   -moz-appearance: textfield;
                 }
-                
+
                 border-radius: 0px;
                 text-align: center;
                 font-size: 16px;

src/views/projectManage/components/studentProjectWordShow.vue

@@ -325,7 +325,7 @@
         </td>
       </tr>
       <tr>
-        <td colspan="2">知识产权事务费</td>
+        <td colspan="2">论文版面费</td>
         <td v-text="downWordData.fund.Transaction"></td>
         <td colspan="2">论文版面费、专利及其他知识产权事务等费用。</td>
       </tr>

src/views/projectSettlement/components/MakerSpaceWordShow.vue

@@ -334,7 +334,7 @@
               </div>
 
               <div class="fundDataLie">
-                <div class="fundDataValue">知识产权事务费</div>
+                <div class="fundDataValue">论文版面费</div>
                 <div
                   class="fundDataValue"
                   v-text="wordData['fund']['Transaction']"
@@ -356,7 +356,7 @@
                 </div>
               </div>
             </div>
-    
+
             <div class="opinion">
               <div class="opinionLabel">财务部门<br/>意 见</div>
               <div class="opinionValue">
@@ -366,7 +366,7 @@
                 </div>
               </div>
             </div>
-    
+
             <div class="opinion">
               <div class="opinionLabel">创新创业学院<br/>审 核 意 见</div>
               <div class="opinionValue">
@@ -385,7 +385,7 @@
     <!-- <el-button type="primary" @click="getWord">下载表格</el-button> -->
   </div>
 </template>
-      
+
     <script>
 // import {getMakerSpaceWord} from '@/components/tool/getWord'
 export default {
@@ -505,7 +505,7 @@ export default {
 	}
 };
 </script>
-      
+
     <style lang="less" scoped>
 #MakerSpaceWord {
   width: 100%;

src/views/projectSettlement/components/projectSettlementBook.vue

@@ -966,7 +966,7 @@
         </td>
       </tr>
       <tr>
-        <td>知识产权事务费</td>
+        <td>论文版面费</td>
         <td>-</td>
         <td>{{ myArrayProp[0]["money"].Transaction }}</td>
         <td colspan="3">论文版面费、专利及其他知识产权事务等费用。</td>

src/views/projectSettlement/components/studentProjectWordShow.vue

@@ -6,7 +6,7 @@
             <div class="date">申请日期：{{downWordData.applicationDate}}</div>
         </div>
         <table border="1" cellspacing="0" class="table">
-    
+
           <tr id="projectName">
             <td colspan="2" ref="projectName">项目名称</td><td colspan="5" v-text='downWordData.projectName'></td>
           </tr>
@@ -14,19 +14,19 @@
             <td rowspan="2" colspan="2" ref="radio">项目分组</td><td v-text="downWordData.radio=='ed917c55-f51d-11ed-a3f6-509a4c5b67cf'?'√ 创意组':'□ 创意组'">
             </td>
             <td colspan="4">立项项目为新立项项目，项目成果应具有较好的创意和较为成型的产品原型或能提供较好的商业模式，产生较好的社会效益。</td>
-          </tr> 
+          </tr>
           <tr>
             <td v-text="downWordData.radio=='ed917c55-f51d-11ed-a3f6-509a4c5b67cf'?'□ 初创组':'√ 初创组'">
             </td>
             <td colspan="4">立项项目为学校已结题学生创客项目或已入驻学校创业孵化基地的学生初创企业项目（毕业两年内），项目成果应为原结题项目基础上的技术升级、企业注册、规模扩张。</td>
-          </tr> 
+          </tr>
           <tr id="checkList" class="checkArea">
             <td colspan="2" ref="checkList">优先支持项目（可多选）</td> <td colspan="5">
               <span><span v-text="downWordData['checkList'].indexOf('1')!=-1?'√ ':'□ '"></span><span>大赛选拔项目</span></span>
               <span><span v-text="downWordData['checkList'].indexOf('2')!=-1?'√ ':'□ '"></span><span>落地注册项目</span></span>
               <span><span v-text="downWordData['checkList'].indexOf('3')!=-1?'√ ':'□ '"></span><span>社会征集项目</span></span>
               <span><span v-text="downWordData['checkList'].indexOf('4')!=-1?'√ ':'□ '"></span><span>产业命题项目</span></span>
-              
+
               <!-- <el-checkbox-group v-model="downWordData.checkList">
                 <el-checkbox label="1">大赛选拔项目</el-checkbox>
                 <el-checkbox label="2">大赛选拔项目</el-checkbox>
@@ -199,7 +199,7 @@
               按合同规定支付给协作单位的费用
             </td>
           </tr>
-    
+
           <tr>
             <td rowspan="5">间接费用</td>
           </tr>
@@ -222,7 +222,7 @@
             </td>
           </tr>
           <tr>
-            <td colspan="2">知识产权事务费</td><td v-text="downWordData.fund.affair">
+            <td colspan="2">论文版面费</td><td v-text="downWordData.fund.affair">
             </td><td colspan="2">
               论文版面费、专利及其他知识产权事务等费用。
             </td>
@@ -254,7 +254,7 @@
           <!-- <el-button style="margin-top:20px" type="primary" @click="work">下载表格</el-button> -->
     </div>
     </template>
-      
+
     <script>
       // import {getWord} from '@/components/tool/getWord'
       export default {
@@ -366,7 +366,7 @@
         }
       };
     </script>
-      
+
     <style lang="less" scoped>
     #studentProjectWord{
         width: 100%;
@@ -395,7 +395,7 @@
                 margin-bottom:40px ;
             }
             .date{
-    
+
                 font-size: 1em;
                 position: absolute;
                 bottom: 0;
@@ -468,14 +468,14 @@
               }
             }
           }
-            
+
         }
         .notes{
           width: 100%;
           display: flex;
           flex-direction:column;
         }
-        
+
     }
       .checkArea{
         td{
@@ -488,5 +488,5 @@
         }
 
       }
-    
+
     </style>

src/views/projectSettlement/components/studentProjectWordShowNew.vue

@@ -267,7 +267,7 @@
             </td>
           </tr>
           <tr>
-            <td colspan="2">知识产权事务费</td><td v-text="downWordData.fund.Transaction">
+            <td colspan="2">论文版面费</td><td v-text="downWordData.fund.Transaction">
             </td><td colspan="2">
               论文版面费、专利及其他知识产权事务等费用。
             </td>