Q-ABAB il y a 2 ans
Parent
commit
e1d7bb7f14

+ 3 - 3
src/router/index.js

@@ -126,9 +126,9 @@ const routes = [{
 
             },
             { //创客资金详情
-                name: 'newMarkerfundDetails',
-                path: '/newMarkerfundDetails',
-                component: () =>import ('@/views/fundManage/newMarkerfundDetails.vue'),
+                name: 'makerfundDetails',
+                path: '/makerfundDetails',
+                component: () =>import ('@/views/fundManage/makerfundDetails.vue'),
                 meta: { isAuth: true }
             },
             { //消息通知

+ 5 - 5
src/views/activityManage/components/NomMarkerWord.vue

@@ -7,7 +7,7 @@
         </div>
         <table border="1" cellspacing="0" class="table">
             <tr id="two">
-                <td colspan="4">活动名称</td>
+                <td colspan="4"><span style="color:red">*</span>活动名称</td>
                 <td colspan="5">
                     <el-input
                         type="textarea"
@@ -22,7 +22,7 @@
                 </td>
             </tr>
             <tr id="three">
-                <td colspan="4">项目负责人</td><td colspan="3">
+                <td colspan="4"><span style="color:red">*</span>项目负责人</td><td colspan="3">
                     <el-input
                         type="textarea"
                         autosize
@@ -30,7 +30,7 @@
                         placeholder="请输入负责人"
                         v-model="wordData['pro_leader']">
                     </el-input>
-                </td><td colspan="2">所在部门</td><td colspan="3">
+                </td><td colspan="2"><span style="color:red">*</span>所在部门</td><td colspan="3">
                     <el-select v-model="wordData['college']" style="width: 100%;" placeholder="请选择所在学院">
                       <el-option
                         v-for="item in DepartmentData"
@@ -39,7 +39,7 @@
                         :value="item.id">
                       </el-option>
                     </el-select>
-                </td><td colspan="2">联系电话</td><td colspan="3">
+                </td><td colspan="2"><span style="color:red">*</span>联系电话</td><td colspan="3">
                     <el-input
                         type="textarea"
                         autosize
@@ -50,7 +50,7 @@
                 </td>
             </tr>
             <tr id="four">
-                <td colspan="4">活动时间</td>
+                <td colspan="4"><span style="color:red">*</span>活动时间</td>
                 <td colspan="5">
                   <el-date-picker
                     v-model="wordData['activityTime']"

+ 11 - 25
src/views/activityManage/components/markeractivityWord.vue

@@ -7,7 +7,7 @@
         </div>
         <table border="1" cellspacing="0" class="table">
             <tr id="one">
-              <td colspan="4">关联项目</td>
+              <td colspan="4"><span style="color:red">*</span>关联项目</td>
               <td colspan="12">
                 <el-select v-model="wordData['associatedProjects']" @change="getProjectFund()" style="width: 100%;" placeholder="请选择关联项目">
                   <el-option
@@ -20,7 +20,7 @@
               </td>
             </tr>
             <tr id="two">
-                <td colspan="4">活动名称</td>
+                <td colspan="4"><span style="color:red">*</span>活动名称</td>
                 <td colspan="5">
                     <el-input
                         type="textarea"
@@ -42,7 +42,7 @@
                 </td>
             </tr>
             <tr id="three">
-                <td colspan="4">项目负责人</td><td colspan="3">
+                <td colspan="4"><span style="color:red">*</span>项目负责人</td><td colspan="3">
                     <el-input
                         type="textarea"
                         autosize
@@ -50,7 +50,7 @@
                         placeholder="请输入负责人"
                         v-model="wordData['pro_leader']">
                     </el-input>
-                </td><td colspan="2">所在部门</td><td colspan="3">
+                </td><td colspan="2"><span style="color:red">*</span>所在部门</td><td colspan="3">
                     <!-- <el-input
                         type="textarea"
                         autosize
@@ -66,7 +66,7 @@
                         :value="item.id">
                       </el-option>
                     </el-select>
-                </td><td colspan="2">联系电话</td><td colspan="3">
+                </td><td colspan="2"><span style="color:red">*</span>联系电话</td><td colspan="3">
                     <el-input
                         type="textarea"
                         autosize
@@ -77,7 +77,7 @@
                 </td>
             </tr>
             <tr id="four">
-                <td colspan="4">活动时间</td>
+                <td colspan="4"><span style="color:red">*</span>活动时间</td>
                 <td colspan="5">
                   <el-date-picker
                     v-model="wordData['activityTime']"
@@ -419,32 +419,18 @@
               this.wordData['expenditureMothPlan'][index]=0;
             }
           },
-          // checkProjectMoney(){
-          //   // if(!this.wordData['acId']){
-          //   //   this.wordData['expenditureMothPlan'] = ['','','','','','','','','','','',''];
-          //   //   this.wordData['fund'] = {
-          //   //     total:0,
-          //   //     device:"",
-          //   //     Material:"",
-          //   //     processing:"",
-          //   //     Collaboration:"",
-          //   //     APPRAISAL:"",
-          //   //     entery:"",
-          //   //     activities:"",
-          //   //     Transaction:"",
-          //   //   }
-          //   // };
-          //   this.getProjectFund();
-
-          // },
           getProjectFund(){
             if(this.wordData['associatedProjects']=='')return;
             this.ajax.get(this.$store.state.api+"/getProjectFund",{
               uid:this.$store.state.userInfo.userid,
               pid:this.wordData['associatedProjects'],
             }).then(result=>{
-              console.log(result)
               let total = Number(result['data'][0][0]['fund']);
+              console.log(result['data'][0][0])
+              console.log(this.wordData)
+              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;
               result['data'][1].forEach(item=>isUse+=Number(item['money']))

+ 4 - 2
src/views/activityManage/makerActvity.vue

@@ -151,7 +151,9 @@
           label="活动时间"
           min-width="12%">
           <template #default="scope">
-            {{ GetTime(scope.row.begin_at)}}
+            {{ scope.row.createTime }}
+            <!-- {{ scope.row.createTime.split(' ')[0] }}<br/>{{ scope.row.createTime.split(' ')[1] }} -->
+            <!-- {{ GetTime(scope.row.begin_at)}} -->
           </template>
         </el-table-column>
         <el-table-column
@@ -503,7 +505,7 @@ import { ActivityWord } from '@/components/tool/getWord';
    
         },
         ending(){   //完结提交
-          if(this.endTable.file.length<=0)return this.$message.error("请上传完结报告");
+          // if(this.endTable.file.length<=0)return this.$message.error("请上传完结报告");
           this.ajax.post(this.$store.state.api+"/UploadActivityFile",{
             uid:this.$store.state.userInfo.userid,
             aid:this.endTable.Id,

+ 19 - 19
src/views/activityManage/newMarkerActivity.vue

@@ -7,7 +7,9 @@
       <hr>
          <!-- 创客专项资金及项目申请表(创客活动) -->
         <markeractivityWord :wordData="wordData" :total="total"/>
-        <el-button type="primary" @click="test">提交项目</el-button>
+        <div style="position: fixed;bottom: 5%;right: 2%;">
+          <el-button type="primary" @click="test">提交活动</el-button>
+        </div>
         <el-dialog
           title="提示"
           :visible.sync="submitHint"
@@ -128,23 +130,23 @@
                   return false;;
                 }
                 break;
-              case "member":
-                  let num = 0;
-                  this.wordData[i].forEach(item=>{
-                    if(cEmpty.test(item['name']))num++;
-                    // for(let j in item){
-                    //   if(cEmpty.test(item[j])){
-                    //     num++;
-                    //   }
-                    // }
+              // case "member":
+              //     let num = 0;
+              //     this.wordData[i].forEach(item=>{
+              //       if(cEmpty.test(item['name']))num++;
+              //       // for(let j in item){
+              //       //   if(cEmpty.test(item[j])){
+              //       //     num++;
+              //       //   }
+              //       // }
                   
-                  })
-                  if(num>0){
-                    this.$message.error("指导老师姓名不能为空");
-                    document.querySelector('#five').scrollIntoView({ behavior: "smooth" });
-                    return false;
-                  }
-                break;
+              //     })
+              //     if(num>0){
+              //       this.$message.error("指导老师姓名不能为空");
+              //       document.querySelector('#five').scrollIntoView({ behavior: "smooth" });
+              //       return false;
+              //     }
+              //   break;
               // case "activityPlan":
               //   if(cEmpty.test(this.wordData[i][0])){
               //     this.$message.error("请输入活动计划");
@@ -202,8 +204,6 @@
             mp:JSON.stringify(this.wordData['expenditureMothPlan']),
             t:0,//活动分类 0 创客活动
           }
-
-          console.log(pram)
           this.ajax.post(this.$store.state.api+'/ActivityApply',pram).then(result=>{
             if(result['data']==1){
               this.$message.success("活动提交成功");

+ 19 - 17
src/views/activityManage/newNomMarkerActivity.vue

@@ -7,7 +7,9 @@
     <hr>
        <!-- 创客专项资金及项目申请表(创客活动) -->
       <NomMarkerWord :wordData="wordData" :total="total"/>
-      <el-button type="primary" @click="test">提交项目</el-button>
+      <div style="position: fixed;bottom: 5%;right: 2%;">
+          <el-button type="primary" @click="test">提交活动</el-button>
+        </div>
       <el-dialog
         title="提示"
         :visible.sync="submitHint"
@@ -122,23 +124,23 @@ export default {
                 return false;;
               }
               break;
-            case "member":
-                let num = 0;
-                this.wordData[i].forEach(item=>{
-                  if(cEmpty.test(item['name']))num++;
-                  // for(let j in item){
-                  //   if(cEmpty.test(item[j])){
-                  //     num++;
-                  //   }
-                  // }
+            // case "member":
+            //     let num = 0;
+            //     this.wordData[i].forEach(item=>{
+            //       if(cEmpty.test(item['name']))num++;
+            //       // for(let j in item){
+            //       //   if(cEmpty.test(item[j])){
+            //       //     num++;
+            //       //   }
+            //       // }
                 
-                })
-                if(num>0){
-                  this.$message.error("请填完指导老师信息");
-                  document.querySelector('#five').scrollIntoView({ behavior: "smooth" });
-                  return false;
-                }
-              break;
+            //     })
+            //     if(num>0){
+            //       this.$message.error("请填完指导老师信息");
+            //       document.querySelector('#five').scrollIntoView({ behavior: "smooth" });
+            //       return false;
+            //     }
+            //   break;
             // case "activityPlan":
             //   if(cEmpty.test(this.wordData[i][0])){
             //     this.$message.error("请输入活动计划");

+ 1 - 1
src/views/fundManage/makerfund.vue

@@ -540,7 +540,7 @@
         },
         details(Id,tit,aid){       //跳转详情页面
           // return console.log(Id,tit,aid);
-          this.$router.push(`/newMarkerfundDetails?Id=${Id}&tit=${tit}&aid=${aid}`)
+          this.$router.push(`/makerfundDetails?Id=${Id}&tit=${tit}&aid=${aid}`)
         }
       },
       mounted(){

Fichier diff supprimé car celui-ci est trop grand
+ 280 - 1301
src/views/fundManage/makerfundDetails.vue


+ 0 - 437
src/views/fundManage/newMarkerfundDetails.vue

@@ -1,437 +0,0 @@
-<template>
-    <!-- 创客资金申请表单 -->
-  <div>
-    <div class="vfpHeader">
-        <div class="titleOne">创客活动资金申请</div>
-    </div>
-    <hr>
-    <!-- 项目名称、类型开始 -->
-    <div class="Apply1">
-        <div class="inpInterval">项目名称</div>
-        <el-select disabled v-model="projectName"  style="width: 30%;" placeholder="请选择">
-            <el-option
-            v-for="item in projectFilter"
-            :key="item.id"
-            :label="item.title"
-            :value="item.id">
-            </el-option>
-        </el-select>
-    </div>
-
-    <div class="tabTit">
-            <div>
-                <p>经费支出类别(单位:元)</p>
-            </div>
-    </div>
-    <hr>
-    <table border="1" cellspacing="0" class="table">
-       
-        <tr>
-            <td colspan="2">经济支出类别</td><td>预算</td><td>已支付</td><td>本次申请</td><td>实际使用</td><td>余额</td><td colspan="3">备注</td>
-        </tr>
-        <tr v-for="(item,index) in fundList" :key="index">
-            <td colspan="2">{{ item.fundName }}</td>
-            <td>
-                {{item.budget}}
-            </td>
-            <td>
-                {{item.havePaid}}
-            </td>
-            <td>
-               {{ item.thisApply }}
-            </td>
-            <td v-if="!state">
-                <el-input
-                type="number"
-                autosize
-                style="width: 100%;"
-                resize="none"
-                onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"
-                placeholder="实际使用"
-                v-model="item.actualuse">
-                </el-input>
-            </td>
-            <td v-if="state>0">
-                {{ item.actualuse }}
-            </td>
-            <td>
-                {{ item.budget-item.havePaid-item.actualuse }}
-            </td>
-            <td colspan="3" style="box-sizing: border-box;padding: 0 10px;">
-                {{ item.remark }}
-            </td>
-        </tr>
-        <tr>
-            <td>事由</td>
-            <td colspan="10" class="textLeft">
-                <el-input
-                type="textarea"
-                :autosize="{ minRows: 6, maxRows: 20}"
-                style="width: 100%;"
-                resize="none"
-                placeholder=""
-                v-model="intro">
-                </el-input>
-            </td>
-        </tr>
-        <tr>
-            <td v-for="(i,k) in 9" :key="k" style="border: none;"></td>
-        </tr>
-        
-    </table>
-    <div class="baseBtn">
-        <div class="blockWidth">
-            <el-button type="primary" @click="download">生成表单</el-button>
-            <el-button type="primary" v-if="!state" @click="submitData">提交</el-button>
-            <el-button type="primary" v-if="state>0" class="disa">提交</el-button>
-        </div>
-    </div>
-
-
-    <!-- 下载文档开始 -->
-    <el-dialog
-      title="生成Excel"
-      :visible.sync="downLoadExcelDig"
-      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>
-        <el-button @click="downLoadExcelDig = false" class="AllDialogBtn">取消</el-button>
-      </span>
-    </el-dialog>
-    <!-- 下载文档结束-->
-
-    <!-- 提交文档开始 -->
-    <el-dialog
-      title="提交"
-      :visible.sync="submitDataDig"
-      width="600px"
-      class="pageSubmitData"
-    >
-      
-      <span class="deleteContent">确定提交?</span>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitAll" class="AllDialogBtn">确认</el-button>
-        <el-button @click="submitDataDig = false" class="AllDialogBtn">取消</el-button>
-      </span>
-    </el-dialog>
-    <!-- 提交文档结束-->
-
-
-  </div>
-</template>
-
-<script>
-    import getFundNo from '@/components/tool/getProjectNo';
-    import BeUpload from "../../components/tool/beUpload.vue";
-    // import getExcel from "@/components/tool/getExcel";
-    import {getExcel2} from '@/components/tool/downloadExcel'
-export default {
-    components: {
-        BeUpload,
-      },
-    data() {
-        return {
-            projectFilter:[],    //项目名称列表            
-            projectName:'',      //所选名称
-            downLoadExcelDig:false,//下载Excel对话框
-            submitDataDig:false,//提交对话框
-            allFund:'',//总经费
-            fundList:[   //table遍历数据
-                {fundName:'小型仪器设备费',budget:'',havePaid:0,thisApply:'',actualuse:'',remark:'项目开展所需的小型专用仪器设备、工具、配件购置或租赁费用。'},
-                {fundName:'材料费',budget:'',havePaid:0,thisApply:'',actualuse:'',remark:'项目开展需消耗的各种原材料、辅助材料等低值易耗品的采购费用。'},
-                {fundName:'测试化验加工费',budget:'',havePaid:0,thisApply:'',actualuse:'',remark:'项目开展过程中支付给外单位的检验、测试、化验、计算、分析及加工费等费用。'},
-                {fundName:'项目协作费',budget:'',havePaid:0,thisApply:'',actualuse:'',remark:'按合同规定支付给协作单位的费用'},
-                {fundName:'项目成功鉴定费',budget:'',havePaid:0,thisApply:'',actualuse:'',remark:'学术会务费、评审费、鉴定费、成果集制作费等费用。'},
-                {fundName:'参展参赛费',budget:'',havePaid:0,thisApply:'',actualuse:'',remark:'参加创客展会、竞赛等所需的报名费、展位费、布展费、宣传推广费及差旅费等费用。'},
-                {fundName:'创客交流活动费',budget:'',havePaid:0,thisApply:'',actualuse:'',remark:'创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。'},
-                {fundName:'知识产权事务费',budget:'',havePaid:0,thisApply:'',actualuse:'',remark:'论文版面费、专利及其他知识产权事务等费用。'},
-            ],
-            haveFund:'', //已支付经费
-            intro:'',   //事由
-            tit:'',//活动名称
-            ty:'',//活动类型
-            state:0,
-        }
-    },
-    methods:{
-        // console.log(this.projectName);
-            //total:总经费     
-            //小型仪器设备费:device        
-            //材料费:Material             
-            //测试化验加工费:processing  
-            //项目协作费:Collaboration   
-            //项目成果鉴定费:APPRAISAL  
-            //参展参赛费:entery        
-            //创客交流活动费:activities   
-            //知识产权事务费:Transaction  
-
-        getData(){         //获取活动经费的数据
-            let param={
-                uid:this.$store.state.userInfo.userid,
-                fid:this.$route.query['Id'],
-                aid:this.$route.query['aid'],
-            }
-            this.ajax
-            .get(this.$store.state.api+'/selectActivityFundDetail',param)
-            .then(res=>{
-                console.log(res.data);
-                let data=res.data[0][0]
-                // console.log(data);
-                let applyfund=JSON.parse(data['applyfund'])
-                let fund=JSON.parse(data['fund'])
-                let usedFund=JSON.parse(data['usedFund'])
-                let actualuse=JSON.parse(data['actualuse'])
-                this.tit=data.title;
-                this.ty=data.type;
-
-                let arr= res['data'][1].filter(e=>{
-                    return e.actualuse!=null
-                })
-                // console.log(arr);
-
-                let isUse = arr;
-                if (arr) {
-                    // console.log(111);
-                    isUse.forEach(item=>{
-                    let JP = JSON.parse(item['actualuse']);
-                        this.fundList[0]['havePaid']+=Number(JP['device']);
-                        this.fundList[1]['havePaid']+=Number(JP['Material']);
-                        this.fundList[2]['havePaid']+=Number(JP['processing']);
-                        this.fundList[3]['havePaid']+=Number(JP['Collaboration']);
-                        this.fundList[4]['havePaid']+=Number(JP['APPRAISAL']);
-                        this.fundList[5]['havePaid']+=Number(JP['entery']);
-                        this.fundList[6]['havePaid']+=Number(JP['activities']);
-                        this.fundList[7]['havePaid']+=Number(JP['Transaction']);
-                    })
-                }
-                
-
-
-                
-                // console.log(applyfund);
-                this.fundList[0].budget=fund.device
-                this.fundList[1].budget=fund.Material
-                this.fundList[2].budget=fund.processing
-                this.fundList[3].budget=fund.Collaboration
-                this.fundList[4].budget=fund.APPRAISAL
-                this.fundList[5].budget=fund.entery
-                this.fundList[6].budget=fund.activities 
-                this.fundList[7].budget=fund.Transaction
-
-                if (data['usedFund']!=null) {
-                    this.fundList[0].havePaid=usedFund.device
-                    this.fundList[1].havePaid=usedFund.Material
-                    this.fundList[2].havePaid=usedFund.processing
-                    this.fundList[3].havePaid=usedFund.Collaboration
-                    this.fundList[4].havePaid=usedFund.APPRAISAL
-                    this.fundList[5].havePaid=usedFund.entery
-                    this.fundList[6].havePaid=usedFund.activities 
-                    this.fundList[7].havePaid=usedFund.Transaction
-                }
-
-                this.fundList[0].thisApply=applyfund.device
-                this.fundList[1].thisApply=applyfund.Material
-                this.fundList[2].thisApply=applyfund.processing
-                this.fundList[3].thisApply=applyfund.Collaboration
-                this.fundList[4].thisApply=applyfund.APPRAISAL
-                this.fundList[5].thisApply=applyfund.entery
-                this.fundList[6].thisApply=applyfund.activities 
-                this.fundList[7].thisApply=applyfund.Transaction
-
-                if (data['actualuse']!=null) {
-                    this.fundList[0].actualuse=actualuse.device
-                    this.fundList[1].actualuse=actualuse.Material
-                    this.fundList[2].actualuse=actualuse.processing
-                    this.fundList[3].actualuse=actualuse.Collaboration
-                    this.fundList[4].actualuse=actualuse.APPRAISAL
-                    this.fundList[5].actualuse=actualuse.entery
-                    this.fundList[6].actualuse=actualuse.activities
-                    this.fundList[7].actualuse=actualuse.Transaction
-                }
-                
-
-                this.intro=data.intro
-                this.state=data.state
-                this.allFund=data.money
-
-
-            },err=>{
-                console.log(err);
-            })
-        },
-         
-
-        download(){
-            if(!this.projectName) return this.$message.error('请选择项目名称')
-            this.downLoadExcelDig=true
-        },
-        downLoadExcel(){   //生成表单
-            getExcel2(this.fundList,this.intro,this.tit,this.ty)
-            this.downLoadExcelDig=false
-        },
-        submitData(){
-            if(!this.projectName) return this.$message.error('请选择项目名称')
-            let arr=[this.fundList[0].actualuse,this.fundList[1].actualuse,this.fundList[2].actualuse,this.fundList[3].actualuse,this.fundList[4].actualuse,this.fundList[5].actualuse,this.fundList[6].actualuse,this.fundList[7].actualuse]
-            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]
-            
-            // console.log(arr);
-            let fund=arr.reduce((prev,cur,index,arr) => {
-                return prev + cur*1;
-            },0); 
-            let fund2=arr2.reduce((prev,cur,index,arr) => {
-                return prev + cur*1;
-            },0); 
-            console.log(fund,fund2);
-            if (fund+fund2>this.allFund) return this.$message.error('申请金额已大于预算')
-            this.submitDataDig=true
-        },
-        submitAll(){           //提交创客资金申请
-        //    getFundNo("ZJ").then((result)=>{
-
-            // let arr={
-            //     device:(this.fundList[0].actualuse+this.haveFund.device*1),
-            //     Material:this.fundList[1].actualuse+this.haveFund.Material*1,
-            //     processing:this.fundList[2].actualuse+this.haveFund.processing*1,
-            //     Collaboration:this.fundList[3].actualuse+this.haveFund.Collaboration*1,
-            //     APPRAISAL:this.fundList[4].actualuse+this.haveFund.APPRAISAL*1,
-            //     entery:this.fundList[5].actualuse+this.haveFund.entery*1,
-            //     activities:this.fundList[6].actualuse+this.haveFund.activities*1,
-            //     Transaction:this.fundList[7].actualuse+this.haveFund.Transaction*1,
-            // }
-            
-            //  console.log(arr);
-
-
-                let param={
-                    uid:this.$store.state.userInfo.userid,
-                    // fNo:result, //项目编号
-                    fid:this.$route.query['Id'],
-                    intro:this.intro,
-                    f:JSON.stringify({
-                        device:this.fundList[0].actualuse,
-                        Material:this.fundList[1].actualuse,
-                        processing:this.fundList[2].actualuse,
-                        Collaboration:this.fundList[3].actualuse,
-                        APPRAISAL:this.fundList[4].actualuse,
-                        entery:this.fundList[5].actualuse,
-                        activities:this.fundList[6].actualuse,
-                        Transaction:this.fundList[7].actualuse,
-                    }),
-                }
-                // return console.log(param);
-                this.ajax
-                .post(this.$store.state.api+'/updateActivityFundDetail',param)
-                .then(res=>{
-                    console.log(res);
-                    if(res.data==1){
-                        this.$message.success('提交成功')
-                        this.submitDataDig=false
-                        this.$router.push('/makerfund')
-                    }else{
-                        this.$message.error('提交失败')
-                    }
-                },err=>{
-                    console.log(err);
-                })
-            // })
-        },
-    },
-
-    mounted(){
-        this.getData()
-        this.projectName=this.$route.query['tit']
-        // console.log(this.$route.query['aid']);
-        // console.log(this.$route.query['tit']);
-    }
-}
-</script>
-
-<style lang="less" scoped>
-    .Apply1{         //顶部下拉框
-        height: 45px;
-        width: 50%;
-        display: flex;
-        justify-content: flex-start;
-        margin-top: 20px;
-    }
-    .inpInterval{    //label
-        min-width: 80px;
-        display: inline-block;
-        text-align: justify;
-        text-justify:distribute-all-lines;
-        text-align-last: justify;
-        transform: translate(0,22%);
-        padding-right: 15px;
-        font-size: 16px;
-    }
-    .table{ 
-        border: none;
-        border-top: solid 1px black;
-        // border-right:  solid 1px black;
-        width: 80%;
-        margin: auto;
-        margin-top: 30px;
-        .textLeft{
-          :deep(.el-textarea__inner){
-            border: none ;
-            border-radius: 0px;
-            text-align: left !important;
-            font-size: 16px;
-          }
-        }
-        tr td{
-            border: none;
-            border-bottom: solid 1px black;
-            border-right: solid 1px black;
-          height: 50px;
-          text-align: center;
-          line-height: 30px;
-          width: 9%;
-           
-          &:nth-child(1){
-                border-left:  solid 1px black;
-              }
-          p{
-            font-weight: 600;
-          }
-          :deep(.el-select .el-input .el-select__caret){
-            display: none;
-          }
-          :deep(.el-textarea__inner){
-            // padding: 0;
-            border: none ;
-            border-radius: 0px;
-            text-align: center;
-            font-size: 16px;
-          }
-          :deep(.el-input__inner){
-            border: none ;
-            border-radius: 0px;
-            text-align: center;
-            font-size: 16px;
-             //去除input number样式
-            &::-webkit-outer-spin-button,
-            &::-webkit-inner-spin-button {
-                -webkit-appearance: none;
-            }
-            &[type="number"]{
-                -moz-appearance: textfield;
-            }
-          }
-        }
-        
-    }
-    .textLeft{
-          :deep(.el-textarea__inner){
-            border: none ;
-            border-radius: 0px;
-            text-align: left !important;
-            font-size: 16px;
-          }
-        }
-
-</style>

+ 1 - 2
src/views/projectApply/MakerSpaceApply.vue

@@ -6,7 +6,7 @@
       </div>
       <hr>
       <MakerSpaceWord :wordData="wordData"/>
-      <div style="position: fixed;bottom: 5%;margin-left: -1%;">
+      <div style="position: fixed;bottom: 5%;right: 2%;">
             <el-button  @click="test" type="primary">提交项目</el-button>
         </div>
       <el-dialog
@@ -14,7 +14,6 @@
           :visible.sync="submitHint"
           width="600px"
           class="pageSubmitData">
-          
           <div class="deleteContent">确定提交“{{wordData['projectName']}}”项目立项?</div>
           <span slot="footer" class="dialog-footer">
             <el-button type="primary" @click="applyProject" class="AllDialogBtn">确认提交</el-button>

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

@@ -7,7 +7,7 @@
     </div>
     <div id="table">
         <div class="han" id="one">
-          <div class="label">项目名称</div><div class="value">
+          <div class="label"><span style="color:red">*</span>项目名称</div><div class="value">
             <el-input
               type="textarea"
               autosize
@@ -16,7 +16,7 @@
               v-model="wordData['projectName']">
             </el-input>
         </div>
-          <div class="label">所在学院</div><div class="value">
+          <div class="label"><span style="color:red">*</span>所在学院</div><div class="value">
             <el-select v-model="wordData['college']" style="width: 100%;" placeholder="请选择所在学院">
               <el-option
                 v-for="item in DepartmentData"
@@ -28,7 +28,7 @@
         </div>
         </div>
         <div class="status" id="two">
-          <div class="statusLabel">项目状态</div>
+          <div class="statusLabel"><span style="color:red">*</span>项目状态</div>
           <div class="ValueDescribe">
             <div class="statusHan">
               <div class="DescribeLabel">
@@ -43,7 +43,7 @@
           </div>
         </div>
         <div class="han" id="three">
-          <div class="label">项目起始时间</div><div class="value">
+          <div class="label"><span style="color:red">*</span>项目起始时间</div><div class="value">
             <el-date-picker
               v-model="wordData['begin_at']"
               type="date"
@@ -52,7 +52,7 @@
               value-format="yyyy-MM-dd HH:mm:ss">
             </el-date-picker>
           </div>
-          <div class="label">计划完成时间</div><div class="value">
+          <div class="label"><span style="color:red">*</span>计划完成时间</div><div class="value">
             <el-date-picker
               v-model="wordData['plannedEnd_at']"
               type="date"
@@ -63,7 +63,7 @@
           </div>
         </div>
         <div class="han" id="four">
-          <div class="label">项目负责人</div><div class="value">
+          <div class="label"><span style="color:red">*</span>项目负责人</div><div class="value">
             <el-input
               type="textarea"
               autosize
@@ -72,7 +72,7 @@
               v-model="wordData['pro_leader']">
             </el-input>
           </div>
-          <div class="label">学院牵头领导</div><div class="value">
+          <div class="label"><span style="color:red">*</span>学院牵头领导</div><div class="value">
             <el-input
               type="textarea"
               autosize
@@ -97,7 +97,7 @@
           </div>
           <div class="memberTable" :style="wordData['teacher'].length<4?'border-bottom:solid 1px black':''">
             <div class="memberHan">
-              <div class="memberValue">姓名</div>
+              <div class="memberValue"><span style="color:red">*</span>姓名</div>
               <div class="memberValue">专业</div>
               <div class="memberValue">职称</div>
               <div class="memberValue">学历</div>
@@ -377,7 +377,7 @@
 
         <div class="fund">
           <div class="fundTitle" id="fund">
-            预算<br/>经费
+            <span style="color:red">*</span>预算<br/>经费
           </div>
           <div class="fundTable">
             <div class="fundTotal">

+ 13 - 13
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">项目名称</td><td colspan="5" >
+            <td colspan="2" ref="projectName"><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">项目分组</td><td>
+            <td rowspan="2" colspan="2" ref="radio"><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">优先支持项目(可多选)</td> <td colspan="5">
+            <td colspan="2" ref="checkList"><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">美丽校园改造项目(特色项目)</td> <td colspan="5">
+            <td colspan="2" ref="schoolRadio"><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" >项 目 申 请 人</td><td colspan="2">
+            <td colspan="2" ref="applyParsonRadio" ><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">申 请 人 姓 名</td><td colspan="1">
+            <td colspan="2" ref="applyParsonName"><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">参与学院/公司</td>
+            <td ref="college"><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">联系电话</td><td>
+            </td><td ref="tel"><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">项 目 起 始 时 间</td>
+            <td colspan="2" ref="beginTime"><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">计划完成时间</td>
+                <td ref="endTime"><span style="color:red">*</span>计划完成时间</td>
                 <td colspan="2">
                   <el-date-picker
                     v-model="wordData.endTime"
@@ -125,7 +125,7 @@
               </td>
           </tr>
           <tr id="studentS">
-            <td :rowspan="wordData.studentS.length+1" ref="studentS">项目组学生成员(至少2个学院以上学生构成,团队5人以上)</td><td>姓名</td><td colspan="2">所在学院/部门/专业</td><td colspan="3">项目组角色分工</td>
+            <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>
           </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>姓名</td><td colspan="2">所在学院/部门/专业</td><td colspan="3">项目组角色分工</td>
+            <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>
           </tr>
           <tr style="position: relative !important;" v-for="(item,index) in wordData.teacherS" :key="index+'b'">
             <td>
@@ -357,7 +357,7 @@
             </td>
           </tr>
           <tr id="fund">
-            <td rowspan="12" ref="fund">预算经费</td><td>总经费</td><td colspan="5">
+            <td rowspan="12" ref="fund"><span style="color:red">*</span>预算经费</td><td>总经费</td><td colspan="5">
                       {{ reversedMessage==0?'':reversedMessage}}元
             </td>
           </tr>

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

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

+ 2 - 2
src/views/projectManage/ProjectManagement.vue

@@ -390,8 +390,8 @@ import beUpload from '../../components/tool/beUpload'
           })
         },
         ending(){   //完结提交
-          console.log(this.file.length);
-          if(this.file.length<1)return this.$message.error("请上传完结报告");
+          // console.log(this.file.length);
+          // if(this.file.length<1)return this.$message.error("请上传完结报告");
           this.ajax.post(this.$store.state.api+"/UploadProjectManageFile",{
             uid:this.$store.state.userInfo.userid,
             cid:this.iid,

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff