yuanyiming 1 год назад
Родитель
Сommit
3bd32a87a4

+ 8 - 5
src/components/studentProjectWord.vue

@@ -2,19 +2,19 @@
 <div id="studentProjectWord">
     <div id="title">
         <div class="school">深圳技师学院</div>
-        <div class="wordTitle">学 生 创 客 项 目 申 报 书</div>
+        <div class="wordTitle">学 生 创 客 项 目 申 报 书0000</div>
         <div class="date">申请日期:{{wordData.applicationDate}}</div>
     </div>
     <table border="1" cellspacing="0" class="table">
 
       <tr id="projectName">
-        <td colspan="2" ref="projectName">项目名称</td><td colspan="5" >
+        <td colspan="2" ref="projectName">项目名称</td>
+        <td colspan="5" >
           <el-input
               type="textarea"
               autosize
               style="width: 100%;"
               resize="none"
-              
               placeholder="请输入项目名称"
               v-model="wordData.projectName">
             </el-input>
@@ -207,7 +207,8 @@
         </div> -->
       </tr>
       <tr id="brief">
-        <td rowspan="5" ref="brief">研发内容</td><td style="text-align: left;position: relative;" colspan="6" class="textLeft">
+        <td rowspan="5" ref="brief">研发内容</td>
+        <td style="text-align: left;position: relative;" colspan="6" class="textLeft">
           <p>项目简介(200-300字)</p>
             <el-input
               type="textarea"
@@ -752,7 +753,6 @@ import {getNowDate} from '@/components/tool/Date.js'
             margin-bottom:40px ;
         }
         .date{
-
             font-size: 1em;
             position: absolute;
             bottom: 0;
@@ -772,6 +772,9 @@ import {getNowDate} from '@/components/tool/Date.js'
             font-size: 16px;
           }
         }
+        .jc{
+            font-weight: 600;
+          }
         tr td{
           border: none;
           border-bottom: solid 1px black;

+ 9 - 7
src/views/fundManage/makerfund.vue

@@ -184,9 +184,9 @@
               <div class="operations">
                 <el-button type="primary" size="mini" @click="details(scope.row.fid,scope.row.title,scope.row.acId)">查看详情</el-button>
 
-                <el-button type="primary" v-show="scope.row.state==0" size="mini" @click="Audit(scope.row,0)">审核</el-button>
-                <el-button type="primary"  v-show="scope.row.state==1" class="disa" size="mini">已审核</el-button>
-                <el-button type="primary"  v-show="scope.row.state!=1 && scope.row.state!=0" class="disa" size="mini">已审核</el-button>
+                <el-button type="primary" v-show="scope.row.state==0" size="mini" @click="Audit(scope.row,0)">提交审核</el-button>
+                <el-button type="primary"  v-show="scope.row.state==1" class="disa" size="mini">已提交</el-button>
+                <el-button type="primary"  v-show="scope.row.state!=1 && scope.row.state!=0" class="disa" size="mini">已提交</el-button>
 
                 <!-- <el-button type="primary"  v-show="scope.row.state==2" class="disa" size="mini">已审核</el-button> -->
 
@@ -406,10 +406,12 @@
       },
       methods:{
         Audit(val,num){          //显示审核对话框
-
-          // if (val.actualuse==0) return this.$message.error('请填写实际使用金额')
-
-          console.log(val);
+          // console.log(val);
+          // return 
+          if (val.actualuse==0){
+            this.$router.push(`/makerfundDetails?Id=${val.fid}&tit=${val.title}&aid=${val.acId}`)
+            return this.$message.error('请填写实际使用金额')
+          } 
           this.isManager=num
           this.ProjectFundData=val;
           this.dialogVisible=true;

+ 10 - 5
src/views/fundManage/makerfundDetails.vue

@@ -41,14 +41,14 @@
             <td>
                {{ item.thisApply }}
             </td>
-            <td v-if="!state">
+            <td v-if="!state" style="background-color: rgb(234, 252, 186);">
                 <el-input
                 type="number"
                 autosize
                 style="width: 100%;"
                 resize="none"
                 onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"
-                placeholder="实际使用"
+                placeholder="请输入金额"
                 v-model="item.actualuse">
                 </el-input>
             </td>
@@ -411,6 +411,7 @@ export default {
           }
           :deep(.el-input__inner){
             border: none ;
+            background: rgb(234, 252, 186);
             border-radius: 0px;
             text-align: center;
             font-size: 16px;
@@ -434,8 +435,12 @@ export default {
             font-size: 16px;
           }
         }
-        :depp(.el-input.is-disabled){
-            color: black !important;
+    :depp(.el-input.is-disabled){
+        color: black !important;
 
-        }
+    }
+
+    :deep(.el-select .el-input.is-disabled .el-input__inner){    //项目名称字体颜色
+        color: #000;
+    }
 </style>

+ 28 - 25
src/views/projectApply/components/studentProjectWord.vue

@@ -8,7 +8,7 @@
         <table border="1" cellspacing="0" class="table">
     
           <tr id="projectName">
-            <td colspan="2" ref="projectName"><span style="color:red">*</span>项目名称</td><td colspan="5" >
+            <td colspan="2" ref="projectName" class="bold"><span style="color:red">*</span>项目名称</td><td colspan="5" >
               <el-input
                   type="textarea"
                   autosize
@@ -21,7 +21,7 @@
             </td>
           </tr>
           <tr id="radio">
-            <td rowspan="2" colspan="2" ref="radio"><span style="color:red">*</span>项目分组</td><td>
+            <td rowspan="2" colspan="2" ref="radio" class="bold"><span style="color:red">*</span>项目分组</td><td>
               <el-radio v-model="wordData.radio" label="ed917c55-f51d-11ed-a3f6-509a4c5b67cf">创意组</el-radio>
             </td>
             <td colspan="4">立项项目为新立项项目,项目成果应具有较好的创意和较为成型的产品原型或能提供较好的商业模式,产生较好的社会效益。</td>
@@ -33,7 +33,7 @@
             <td colspan="4">立项项目为学校已结题学生创客项目或已入驻学校创业孵化基地的学生初创企业项目(毕业两年内),项目成果应为原结题项目基础上的技术升级、企业注册、规模扩张。</td>
           </tr> 
           <tr id="checkList">
-            <td colspan="2" ref="checkList"><span style="color:red">*</span>优先支持项目(可多选)</td> <td colspan="5">
+            <td colspan="2" ref="checkList" class="bold"><span style="color:red">*</span>优先支持项目(可多选)</td> <td colspan="5">
               <el-checkbox-group v-model="wordData.checkList">
                 <el-checkbox label="1">大赛选拔项目</el-checkbox>
                 <el-checkbox label="2">落地注册项目</el-checkbox>
@@ -43,7 +43,7 @@
             </td>
           </tr>
           <tr id="schoolRadio">
-            <td colspan="2" ref="schoolRadio"><span style="color:red">*</span>美丽校园改造项目(特色项目)</td> <td colspan="5">
+            <td colspan="2" ref="schoolRadio" class="bold"><span style="color:red" >*</span>美丽校园改造项目(特色项目)</td> <td colspan="5">
               <el-radio v-model="wordData.schoolRadio" label="1">校园安全项目</el-radio>
               <el-radio v-model="wordData.schoolRadio" label="2">环境治理项目</el-radio>
               <el-radio v-model="wordData.schoolRadio" label="3">校园服务项目</el-radio>
@@ -51,14 +51,14 @@
             </td>
           </tr>
           <tr id="applyParsonRadio">
-            <td colspan="2" ref="applyParsonRadio" ><span style="color:red">*</span>项 目 申 请 人</td><td colspan="2">
+            <td colspan="2" ref="applyParsonRadio" class="bold"><span style="color:red">*</span>项 目 申 请 人</td><td colspan="2">
               <el-radio v-model="wordData.applyParsonRadio" label="1">在校学生</el-radio>
             </td><td colspan="3">
               <el-radio v-model="wordData.applyParsonRadio" label="2">入驻学校孵化基地的初创企业法人</el-radio>
             </td>
           </tr>
           <tr id="applyParsonName">
-            <td colspan="2" ref="applyParsonName"><span style="color:red">*</span>申 请 人 姓 名</td><td colspan="1">
+            <td colspan="2" ref="applyParsonName" class="bold"><span style="color:red">*</span>申 请 人 姓 名</td><td colspan="1">
               <el-input
                   type="textarea"
                   autosize
@@ -68,7 +68,7 @@
                   v-model="wordData.applyParsonName">
                 </el-input>
             </td>
-            <td ref="college"><span style="color:red">*</span>参与学院/公司</td>
+            <td ref="college" class="bold"><span style="color:red">*</span>参与学院/公司</td>
             <td>
               <el-select v-model="wordData.college" style="width: 100%;" placeholder="请选择所在学院">
                   <el-option
@@ -78,12 +78,12 @@
                     :value="item.id">
                   </el-option>
                 </el-select>
-            </td><td ref="tel"><span style="color:red">*</span>联系电话</td><td>
+            </td><td ref="tel" class="bold"><span style="color:red">*</span>联系电话</td><td>
                 <el-input type="number" v-model="wordData.tel"  @blur="getText(wordData.tel)" placeholder="请输入联系方式"></el-input>
             </td>
           </tr>
           <tr id="beginTime">
-            <td colspan="2" ref="beginTime"><span style="color:red">*</span>项 目 起 始 时 间</td>
+            <td colspan="2" ref="beginTime" class="bold"><span style="color:red">*</span>项 目 起 始 时 间</td>
             <td colspan="2">
               <el-date-picker
                   v-model="wordData.beginTime"
@@ -94,7 +94,7 @@
                   <!-- value-format="yyyy-MM-dd HH:mm:ss"> -->
     
                 </el-date-picker></td>
-                <td ref="endTime"><span style="color:red">*</span>计划完成时间</td>
+                <td ref="endTime" class="bold"><span style="color:red">*</span>计划完成时间</td>
                 <td colspan="2">
                   <el-date-picker
                     v-model="wordData.endTime"
@@ -108,24 +108,24 @@
               </td>
           </tr>
           <tr>
-            <td colspan="2">项 目 组 人 数</td>
+            <td colspan="2" class="bold">项 目 组 人 数</td>
             <td>
               
                 {{ wordData.studentS.length + wordData.teacherS.length }}
     
               </td>
-            <td>参与学生人数</td>
+            <td class="bold">参与学生人数</td>
             <td>
               
                 {{ wordData.studentS.length }}
               </td>
-              <td>参与教师人数</td>
+              <td class="bold">参与教师人数</td>
               <td>
                 {{ wordData.teacherS.length }}
               </td>
           </tr>
           <tr id="studentS">
-            <td :rowspan="wordData.studentS.length+1" ref="studentS">项目组学生成员(至少2个学院以上学生构成,团队5人以上)</td><td><span style="color:red">*</span>姓名</td><td colspan="2">所在学院/部门/专业</td><td colspan="3">项目组角色分工</td>
+            <td :rowspan="wordData.studentS.length+1" ref="studentS"><span class="bold">项目组</span><br><span class="bold">学生成员</span><br> (至少2个学院以上学生构成,团队5人以上)</td><td><span style="color:red">*</span>姓名</td><td colspan="2">所在学院/部门/专业</td><td colspan="3">项目组角色分工</td>
           </tr>
           <tr style="position: relative;" v-for="(item,index) in wordData.studentS" :key="index+'a'">
             <td>
@@ -164,7 +164,7 @@
             </div>
           </tr>
           <tr id="teacherS">
-            <td :rowspan="wordData.teacherS.length+1" ref="teacherS">项目组指导教师(2个学院以上,团队2-3人)</td><td><span style="color:red">*</span>姓名</td><td colspan="2">所在学院/部门/专业</td><td colspan="3">项目组角色分工</td>
+            <td :rowspan="wordData.teacherS.length+1" ref="teacherS"><span class="bold">项目组</span><br><span class="bold">指导教师</span><br> (2个学院以上,团队2-3人)</td><td><span style="color:red">*</span>姓名</td><td colspan="2">所在学院/部门/专业</td><td colspan="3">项目组角色分工</td>
           </tr>
           <tr style="position: relative !important;" v-for="(item,index) in wordData.teacherS" :key="index+'b'">
             <td>
@@ -207,7 +207,7 @@
             </div> -->
           </tr>
           <tr id="brief">
-            <td rowspan="5" ref="brief">研发内容</td><td style="text-align: left;position: relative;" colspan="6" class="textLeft">
+            <td rowspan="5" ref="brief" class="bold">研发内容</td><td style="text-align: left;position: relative;" colspan="6" class="textLeft">
               <p>项目简介(200-300字)</p>
                 <el-input
                   type="textarea"
@@ -269,7 +269,7 @@
             </td>
           </tr>
           <tr>
-            <td>商业模式及社会价值</td>
+            <td class="bold">商业模式及社会价值</td>
             <td style="text-align: left;" colspan="6" class="textLeft">
               <p>项目商业模式/社会价值</p>
               <el-input
@@ -282,7 +282,7 @@
             </td>
           </tr>
           <tr>
-            <td>团队优势</td>
+            <td class="bold">团队优势</td>
             <td style="text-align: left;" colspan="6" class="textLeft">
               <p>团队构成及优势</p>
               <el-input
@@ -295,7 +295,7 @@
             </td>
           </tr>
           <tr>
-            <td>研发成本</td>
+            <td class="bold">研发成本</td>
             <td style="text-align: left;" colspan="6" class="textLeft">
               <p>研发成本来源及构成</p>
               <el-input
@@ -308,7 +308,7 @@
             </td>
           </tr>
           <tr>
-            <td rowspan="3">预期成果</td>
+            <td rowspan="3" class="bold">预期成果</td>
             <td style="text-align: left;" colspan="6" class="textLeft">
               <p>项目预期成果、数量及形式(产品原型/发明专利/双创竞赛/成果转化/社会效益)</p>
               <el-input
@@ -345,7 +345,7 @@
             </td>
           </tr>
           <tr>
-            <td>实施计划</td>
+            <td class="bold">实施计划</td>
             <td style="text-align: left;" colspan="6" class="textLeft">
               <el-input
                   type="textarea"
@@ -357,7 +357,7 @@
             </td>
           </tr>
           <tr id="fund">
-            <td rowspan="12" ref="fund"><span style="color:red">*</span>预算经费</td><td>总经费</td><td colspan="5">
+            <td rowspan="12" ref="fund" class="bold"><span style="color:red">*</span>预算经费</td><td>总经费</td><td colspan="5">
                       {{ reversedMessage==0?'':reversedMessage}}元
             </td>
           </tr>
@@ -485,19 +485,19 @@
             </td>
           </tr>
           <tr>
-            <td>所在学院/部门意见</td><td colspan="6" class="textLeft" style="height:200px">
+            <td class="bold">所在学院/部门意见</td><td colspan="6" class="textLeft" 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>
           </tr>
           <tr>
-            <td>财务部门意见</td><td colspan="6" class="textLeft" style="height:200px">
+            <td class="bold">财务部门意见</td><td colspan="6" class="textLeft" 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>
           </tr>
           <tr>
-            <td>创新创业学院审核意见</td><td colspan="6" class="textLeft" style="height:200px">
+            <td class="bold">创新创业学院审核意见</td><td colspan="6" class="textLeft" 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>
@@ -601,6 +601,9 @@
                 font-size: 16px;
               }
             }
+            .bold{
+              font-weight: 600;
+            }
             tr td{
               border: none;
               border-bottom: solid 1px black;

+ 1 - 0
src/views/projectApply/newStudentProjectApply.vue

@@ -8,6 +8,7 @@
     
          <!-- 学生项目立项 -->
         <studentProjectWord :wordData="wordData" :reversedMessage="reversedMessage"/>   
+
         <div style="position: fixed;bottom: 5%;right: 2%;">
             <el-button  @click="test" type="primary">提交项目</el-button>
         </div>