Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/ssti-CollegeManage

src/components/tool/getWord2.js

@@ -115,6 +115,9 @@ function getWord2(val){
 					signTwoPerson:val.signData.filter(i=>i.type==0)[0]?val.signData.filter(i=>i.type==0)[0].username:'',
 					signTwoTime:val.signData.filter(i=>i.type==0)[0]?val.signData.filter(i=>i.type==0)[0].time:'',
 
+
+					expertOpinion:val.opinion,
+
 					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:'',
 					signThreeTime:val.signData.filter(i=>i.type==3)[0]?val.signData.filter(i=>i.type==3)[0].time:'',

src/views/projectApply/projectApplication.vue

@@ -140,7 +140,7 @@
     <div>
       <div>
         <el-button style="font-size: 16px;"  v-if="$store.state.userInfo.type == 0" size="mini" :type="!isPromotion?'primary':''" @click="selectAll">全部</el-button>
-        <el-button style="font-size: 16px;" v-if="$store.state.userInfo.type == 0" size="mini" :type="isPromotion?'primary':''" @click="selectPromotion">晋级项目</el-button>
+        <el-button style="font-size: 16px;" v-if="$store.state.userInfo.type == 0" size="mini" :type="isPromotion?'primary':''" @click="selectPromotion">2024年立项项目</el-button>
         <span style="font-size: 12px; margin-left: 10px"
           >共 {{ table.total }} 条</span
         >