yuanyiming 1 рік тому
батько
коміт
c9c11603de

+ 4 - 4
src/components/tool/downloadExcel.js

@@ -5,7 +5,7 @@ import FileSaver, { saveAs } from 'file-saver';
 import JSZipUtils from 'jszip-utils'
 import Pizzip from 'pizzip';
 
-function getExcel(val,intro){
+export default function getExcel(val,intro){
 console.log(val,intro);
     // 下载Excel文件
     JSZipUtils.getBinaryContent('file/学校创客专项资金使用申请表 (1).xlsx', (err, data) => {
@@ -146,6 +146,6 @@ console.log(val,intro);
     });
 } 
 
-export default{
-    getExcel
-}
+// export{
+//     getExcel
+// }

+ 2 - 1
src/components/tool/getProjectNo.js

@@ -3,7 +3,8 @@ import store from '@/config/config' //vuex
 
 const TYPE_NO = {
     "XM":"/getProjectNo",
-    "HD":"/getActivity"
+    "HD":"/getActivityNo",
+    'ZJ':"/getFundNo",
 }
 
 export default function getProjectNo(str="XM"){

+ 48 - 291
src/views/fundManage/newMarkerfundApply.vue

@@ -3,13 +3,12 @@
   <div>
     <div class="vfpHeader">
         <div class="titleOne">创客活动资金申请</div>
-        <!-- <el-button type="primary" @click="$router.back()">返回</el-button> -->
     </div>
     <hr>
     <!-- 项目名称、类型开始 -->
     <div class="Apply1">
         <div class="inpInterval">项目名称</div>
-        <el-select v-model="selects.projectName"  style="width: 30%;" placeholder="请选择">
+        <el-select v-model="projectName"  style="width: 30%;" placeholder="请选择">
             <el-option
             v-for="item in projectFilter"
             :key="item.id"
@@ -18,17 +17,6 @@
             </el-option>
         </el-select>
     </div>
-    <!-- <div class="Apply1">
-        <div class="inpInterval">项目类型</div>
-        <el-select v-model="selects.projectType" placeholder="请选择">
-            <el-option
-            v-for="item in projectType"
-            :key="item.id"
-            :label="item.name"
-            :value="item.name">
-            </el-option>
-        </el-select>
-    </div> -->
 
     <div class="tabTit">
             <div>
@@ -88,81 +76,6 @@
     </table>
 
 
-
-    <!-- 经费支出类别开始 -->
-    <!-- <div v-for="(item,index) in fundList" :key="index" class="fundType">
-        <div style="font-size: 18px;font-weight: bold;margin-bottom: 10px;">{{ item.fundName }}:</div>
-        <div style="width: 100%; display: flex;flex-wrap: wrap;justify-content: space-between;">
-            <div class="fundInp">
-                <div class="inpInterval">预算</div> <el-input type="number" disabled v-model="item.budget" placeholder="金额"></el-input>
-            </div>
-            <div class="fundInp">
-                <div class="inpInterval">已支付</div> <el-input type="number" disabled v-model="item.havePaid" placeholder="金额"></el-input>
-            </div>
-            <div class="fundInp">
-                <div class="inpInterval">本次申请</div> <el-input type="number" v-model="item.thisApply" placeholder="金额"></el-input>
-            </div>
-            <div class="fundInp">
-                <div class="inpInterval">余额</div> <el-input type="number" disabled v-model="textarea" placeholder="金额"></el-input>
-            </div>
-        </div>
-        <div class="fundInp">
-            <div class="inpInterval" style="position: relative;top: -10px;">备注</div>
-            <el-input
-                type="textarea"
-                :rows="3"
-                resize="none"
-                placeholder="请输入内容"
-                v-model="item.remark">
-            </el-input>
-        </div>
-    </div> -->
-    <!-- 经费支出类别结束-->
-
-
-
-
-    <!-- 附件上传开始 -->
-    <!-- <div>                           
-        <div class="tabTit">
-            <div><p>附件上传</p></div>
-        </div>
-        <hr>
-        <el-progress v-show="progress.show" :percentage="progress.value" :format="ProgressFormat"></el-progress>
-
-        <div style="display: flex;flex-wrap: wrap;width: 100%;margin-bottom: 45px;">
-                <el-upload
-                action="#"
-                list-type="picture-card"
-                style="position: relative;margin-left: 10px;"
-                disabled
-                :on-remove="handleRemove">
-                <BeUpload @getFile="getFile" :progress="progress" style="position: absolute;left: 0;width: 147px;height: 100%;opacity: 0;" class="uploadPic" :navName="'上传封面'" :accept="accept"></BeUpload>
-                <i class="el-icon-plus"></i>
-                </el-upload>
-
-                <el-upload
-                action="#"
-                list-type="picture-card"
-                class="delUpload"
-                style="position: relative;"
-                v-show="file[0]"
-                disabled
-                v-for="(item,index) in this.file" :key="index"
-                >   
-                    <img style="position: absolute;left: -1px;top:-1px;width: 149px;height: 101%;border-radius: 5px;" :src="dialogImageUrl" alt="">
-                    <div class="maskLayer">
-                        <i @click="delUploadBtn(index)" class="maskLayerI el-icon-close"></i>
-                    </div>             
-                    <div style="position: absolute;left: -20%;bottom: -30px;width: 200px;height: 30px;color: #000;line-height: 30px;display: flex;justify-content: center;">{{ item.fileName }}</div>
-                </el-upload>
-               
-        </div>
-    </div> -->
-    <!-- 附件上传结束 -->
-
-
-
     <div class="baseBtn">
         <div class="blockWidth">
             <el-button type="primary" @click="submitCreateFrom">生成表单</el-button>
@@ -183,233 +96,77 @@ export default {
       },
     data() {
         return {
+            projectFilter:[],    //项目名称列表            
+            projectName:'',      //所选名称
             fundList:[
-                {fundName:'小型仪器设备费',budget:30,havePaid:10,thisApply:10,remark:'项目开展所需的小型专用仪器设备、工具、配件购置或租赁费用。'},
-                {fundName:'材料费',budget:100,havePaid:10,thisApply:'',remark:'项目开展需消耗的各种原材料、辅助材料等低值易耗品的采购费用。'},
-                {fundName:'测试化验加工费',budget:100,havePaid:10,thisApply:'',remark:'项目开展过程中支付给外单位的检验、测试、化验、计算、分析及加工费等费用。'},
-                {fundName:'项目协作费',budget:100,havePaid:10,thisApply:'',remark:'按合同规定支付给协作单位的费用'},
-                {fundName:'项目成功鉴定费',budget:100,havePaid:10,thisApply:'',remark:'学术会务费、评审费、鉴定费、成果集制作费等费用。'},
-                {fundName:'参展参赛费',budget:100,havePaid:10,thisApply:'',remark:'参加创客展会、竞赛等所需的报名费、展位费、布展费、宣传推广费及差旅费等费用。'},
-                {fundName:'创客交流活动费',budget:100,havePaid:10,thisApply:'',remark:'创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。'},
-                {fundName:'知识产权事务费',budget:100,havePaid:10,thisApply:'',remark:'论文版面费、专利及其他知识产权事务等费用。'},
+                {fundName:'小型仪器设备费',budget:'',havePaid:'',thisApply:'',remark:'项目开展所需的小型专用仪器设备、工具、配件购置或租赁费用。'},
+                {fundName:'材料费',budget:'',havePaid:'',thisApply:'',remark:'项目开展需消耗的各种原材料、辅助材料等低值易耗品的采购费用。'},
+                {fundName:'测试化验加工费',budget:'',havePaid:'',thisApply:'',remark:'项目开展过程中支付给外单位的检验、测试、化验、计算、分析及加工费等费用。'},
+                {fundName:'项目协作费',budget:'',havePaid:'',thisApply:'',remark:'按合同规定支付给协作单位的费用'},
+                {fundName:'项目成功鉴定费',budget:'',havePaid:'',thisApply:'',remark:'学术会务费、评审费、鉴定费、成果集制作费等费用。'},
+                {fundName:'参展参赛费',budget:'',havePaid:'',thisApply:'',remark:'参加创客展会、竞赛等所需的报名费、展位费、布展费、宣传推广费及差旅费等费用。'},
+                {fundName:'创客交流活动费',budget:'',havePaid:'',thisApply:'',remark:'创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。'},
+                {fundName:'知识产权事务费',budget:'',havePaid:'',thisApply:'',remark:'论文版面费、专利及其他知识产权事务等费用。'},
             ],
             intro:'诶嘿嘿',   //事由
-            submitHint:false,   //提交按钮
-
-            textarea:'',
-            selects:{             //所选名称,类型id
-                projectName:'',
-                projectType:''
-            },
-            // progress:{   //进度条
-            //     value:0,
-            //     show:false
-            // },  
-            projectFilter:[],    //项目名称
-            // projectType:[     //项目类型
-            //     {
-            //         id:1,
-            //         name:'创客活动'
-            //     },
-            //     {
-            //         id:2,
-            //         name:'个人创客'
-            //     },
-            // ],  
-            // file:[],
-            // accept:"*",
-            // disabled: false,
-            // createFromDialog:false,  //生成表单
-            // dialogImageUrl:require('../../assets/img/zzpic426.jpg'),
         }
     },
     methods:{
         getData(){         //获取活动经费的项目名称
             let param={
                 uid:this.$store.state.userInfo.userid,
-                fid:''
             }
             this.ajax
                 .get(this.$store.state.api+'/SelectMakerFundSelects',param)
                 .then(res=>{
-                    let data=res.data[1]
-                    console.log(data);
+                    let data=res.data[0]
+                    // console.log(data);
                     this.projectFilter=data
-                    // let arr=[];
-                    // let newOption={
-                    //     value:'',
-                    //     label:'',
-                    //     children: [{
-                    //         value: '1',
-                    //         label: '个人创客',
-                    //     }, {
-                    //         value: '2',
-                    //         label: '活动创客',
-                    //     }]
-                    // }
-       
-                    // data.forEach(i => {
-                    //     newOption.value=i.id;
-                    //     newOption.label=i.title;
-                    //     this.options.push(newOption)
-                    // });
-                    // console.log(arr);
-             
+                   
                 },err=>{
                     console.log(err);
                 })
+        },
+         //total:总经费     
+          //小型仪器设备费:device        deviceRemarks
+          //材料费:Material             MaterialRemarks
+          //测试化验加工费:processing    processingRemarks
+          //项目协作费:Collaboration     CollaborationRemarks
+          //项目成果鉴定费:APPRAISAL     APPRAISALRemarks
+          //参展参赛费:entery            enteryRemarks
+          //创客交流活动费:activities    activitiesRemarks
+          //知识产权事务费:Transaction   TransactionRemarks
+        getFundData(){
+            // console.log(this.projectName);
+            let param={
+                uid:this.$store.state.userInfo.userid,
+                fid:this.projectName
+            }
+            this.ajax
+            .get(this.$store.state.api+'/selectMarkerFundData',param)
+            .then(res=>{
+                // console.log(res.data[0][0]);
+                let data=JSON.parse(res.data[0][0]['fund']);
+                console.log(data);
+            },err=>{
+                console.log(err);
+            })
         },
         submitCreateFrom(){   //生成表单
             getExcel(this.fundList,this.intro)
         },
-        handleChange(value) {
-            console.log(value);
-        },
+
         submitAll(){           //提交创客资金申请
            
         },
-        // delABC(event){
-        //     return (/[\d]/.test(String.fromCharCode(event.keyCode)))
-        // },
-        // AllEquipment(){                             //填写表单数据
-        //    this.directFundBlock.forEach((e,i)=>{
-        //         switch(e.directFundData)
-        //         {
-        //             case 1:
-        //                 this.directData.facility+=e.budget*1;
-        //                 this.usedDirectData.facility+=e.usedFund*1;
-        //                 this.directDataReason.reason=e.reason;
-        //                 this.applicationDirectData.facility = e.apply*1
-        //                 break;
-        //             case 2:
-        //                 this.directData.cl+=e.budget*1;
-        //                 this.usedDirectData.cl+=e.usedFund*1;
-        //                 this.directDataReason.reason1=e.reason;
-        //                 this.applicationDirectData.cl = e.apply*1
-        //                 break;
-        //             case 3:
-        //                 this.directData.jg=e.budget*1;
-        //                 this.usedDirectData.jg+=e.usedFund*1;
-        //                 this.directDataReason.reason2=e.reason;
-        //                 this.applicationDirectData.jg = e.apply*1
-        //                 break;
-        //             case 4:
-        //                 this.directData.xz=e.budget*1;
-        //                 this.usedDirectData.xz+=e.usedFund*1;
-        //                 this.directDataReason.reason3=e.reason;
-        //                 this.applicationDirectData.xz = e.apply*1
-        //                 break;
-        //             case 5:
-        //                 this.directData.qt=e.budget*1;
-        //                 this.usedDirectData.qt+=e.usedFund*1;
-        //                 this.directDataReason.reason4=e.reason;
-        //                 this.applicationDirectData.qt = e.apply*1
-        //                 break;
-        //         }
-        //    })
-        //    this.indirectFundBlock.forEach((e,i)=>{
-        //         switch(e.indirectFundData)
-        //         {
-        //             case 1:
-        //                 this.indirectData.facility+=e.budget*1;
-        //                 this.usedInDirectData.facility+=e.usedFund*1;
-        //                 this.indirectDataReason.reason=e.reason;
-        //                 this.applicationInDirectData.facility = e.apply*1;
-        //                 // console.log(this.directData.facility);
-        //                 break;
-        //             case 2:
-        //                 this.indirectData.cl+=e.budget*1;
-        //                 this.usedInDirectData.cl+=e.usedFund*1;
-        //                 this.indirectDataReason.reason1=e.reason;
-        //                 this.applicationInDirectData.cl = e.apply*1;
-        //                 // console.log(this.directData.cl);
-        //                 break;
-        //             case 3:
-        //                 this.indirectData.jg=e.budget*1;
-        //                 this.usedInDirectData.jg+=e.usedFund*1;
-        //                 this.indirectDataReason.reason2=e.reason;
-        //                 this.applicationInDirectData.jg = e.apply*1;
-        //                 break;
-        //             case 4:
-        //                 this.indirectData.xz=e.budget*1;
-        //                 this.usedInDirectData.xz+=e.usedFund*1;
-        //                 this.indirectDataReason.reason3=e.reason;
-        //                 this.applicationInDirectData.xz = e.apply*1;
-        //                 break;
-        //             case 5:
-        //                 this.indirectData.qt=e.budget*1;
-        //                 this.usedInDirectData.qt+=e.usedFund*1;
-        //                 this.indirectDataReason.reason4=e.reason;
-        //                 this.applicationInDirectData.qt = e.apply*1;
-        //                 break;
-        //         }
-        //    })
-        // //    this.DirectFunding.budget = this.
-        //     //直接费用全部预算
-        //     for(let i in this.directData)this.IndirectFunding['budget']+=this.directData[i];
-        //     //直接费用全部已支出
-        //     for(let a in this.usedDirectData)this.IndirectFunding['expended']+=this.usedDirectData[a];
-        //     //直接费用本次申请
-        //     for(let b in this.applicationDirectData)this.IndirectFunding['application']+=this.applicationDirectData[b]
-        //     //直接费用余额
-        //     this.IndirectFunding['surplus'] = this.IndirectFunding['budget']-this.IndirectFunding['expended']-this.IndirectFunding['application']
-
-        //     //间接费用
-        //     //间接费用全部预算
-        //     for(let c in this.indirectData)this.Expenditure['budget']+=this.indirectData[c];
-        //     //间接费用全部已支出
-        //     for(let d in this.usedInDirectData)this.Expenditure['expended']+=this.usedInDirectData[d];
-        //     //间接费用本次申请
-        //     for(let e in this.applicationInDirectData)this.Expenditure['application']+=this.applicationInDirectData[e];
-        //     //间接费用余额
-        //     this.Expenditure['surplus'] = this.Expenditure['budget']-this.Expenditure['expended']-this.Expenditure['application']
-
-        //     //经费支出
-        //     //预算
-        //     this.AllFund.budget =this.Expenditure['budget']+this.IndirectFunding['budget'];
-        //     //已支出
-        //     this.AllFund.expended = this.Expenditure['expended']+this.IndirectFunding['expended'];
-        //     //本次申请
-        //     this.AllFund.application = this.Expenditure['application']+this.IndirectFunding['application']
-        //     //余额
-        //     this.AllFund.surplus = this.AllFund['budget']-this.AllFund['expended']-this.AllFund['application'];
-
-        //     //项目名称
-        //     this.residue.PName = this.projectFilter.filter(item=>item.id==this.selects.projectName).length!=0?this.projectFilter.filter(item=>item.id==this.selects.projectName)[0]['title']:'';
-
-        // },
-
-
-        // ProgressFormat(value){        //进度条
-        //   return value ==100?'100%':`${value}%`
-        // },
-       
-        // delUploadBtn(index){           //删除上传文件
-        //     console.log(index);
-        //     this.file.splice(index,1)
-        //     this.$message.success('删除成功')
-        // },
-        // handleRemove(index) {
-        //     console.log(index);
-        // },
-        // uploadData(){
-        //     this.submitHint=true;
-        // },
-
-        // getFile(val) {       //上传文件
-        //     this.file.push(val)
-        //     this.progress.show = false;
-        //     // this.imageUrl=require("../../assets/img/jj.jpg")
-        // },
-        
-
-        init(){
-            //重置
-            this.submitHint=false;
-            this.createFromDialog=false;
-        },
-        
-      
+    },
+    watch:{
+        projectName:{
+            handler(){
+                immediate:true
+                this.getFundData()
+            }
+        }
     },
     mounted(){
         this.getData()