事后汇总

src/components/studentProjectWord.vue

@@ -485,45 +485,22 @@
         </td>
       </tr>
       <tr>
-        <td>所在学院/部门意见</td><td colspan="6" class="textLeft">
-          <el-input
-              type="textarea"
-              :rows="7"
-              resize="none"
-              disabled
-              style="width: 100%;"
-              v-model="input">
-            </el-input>
-            <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 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>
       </tr>
       <tr>
-        <td>财务部门意见</td><td colspan="6" class="textLeft">
-          <el-input
-              type="textarea"
-              :rows="7"
-              resize="none"
-              disabled
-              style="width: 100%;"
-              v-model="input">
-            </el-input>
-            <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 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>
       </tr>
       <tr>
-        <td>创新创业学院审核意见</td><td colspan="6" class="textLeft">
-          <el-input
-              type="textarea"
-              :rows="7"
-              style="background-color: #fff;width: 100%;"
-              resize="none"
-              disabled
-              v-model="input">
-            </el-input>
-            <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 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>
       </tr>
     </table>

src/components/tool/getProjectNo.js

@@ -12,7 +12,8 @@ export default function getProjectNo(str="XM"){
         ajax.get(store.state.api+TYPE_NO[str],{
             uid:store.state.userInfo.userid,
         }).then(res=>{
-            if(res['data'][0].length==0)return resolve(`${str}0000001`)
+            console.log(res['data'])
+            if(res['data'][0].length==0||res['data'][0][0]['No']==null)return resolve(`${str}0000001`)
             let LastNo = res['data'][0][0]['No']
             let number = parseInt(LastNo.slice(-7));
             let newNumber = number+1;

src/views/fundManage/makerfund.vue

@@ -1,9 +1,8 @@
 <template>
   <!-- 创客资金管理 -->
-  <div class="makerfund" v-loading="loading">
+  <div class="makerfund">
     <div class="pAHeader">
       <div class="pAHeader1">创客资金管理</div>
-      <el-button type="primary" style="font-size: 16px;" @click="apply">创客资金申请</el-button>
     </div>
     <hr>
     <!-- 搜索框开始 -->
@@ -86,7 +85,7 @@
         stripe
         class="fontSize"
         :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
-        @selection-change="handleSelectionChange">
+        >
         
         <el-table-column
           prop="title"
@@ -107,13 +106,13 @@
           >
         </el-table-column>
         <el-table-column
-          prop="fund"
+          prop="money"
           align="center"
           label="申请经费(元)"
           >
         </el-table-column>
         <el-table-column
-          prop="usedFund"
+          prop="applyfund"
           align="center"
           label="实际使用(元)"
           >
@@ -167,7 +166,6 @@
                 <el-button type="primary"   v-show="scope.row.state==3" class="disa" size="mini">管理审核</el-button>
 
 
-                <el-button type="primary" class="bt1" size="mini" @click="edit(scope.row)">申请表</el-button>
 
                 <el-button  v-show="scope.row.state==0"  class="disa" type="primary"  size="mini">完结</el-button>
                 <el-button  v-show="scope.row.state==1" class="disa"  type="primary"  size="mini">完结</el-button>
@@ -332,189 +330,23 @@
 <!-- 完结对话框结束-->
 
 
-      <!-- 生成表单对话框开始 -->
-      <el-dialog
-          title="表单"
-          :visible.sync="createFromDialog"
-          width="60%"
-          style="top: -150px;"
-          class="createFromDialogSty"
-          :before-close="init">
-          <div class="addDialogLogo">LOGO</div>
-          <div class="deleteContent">
-            <table class="tableStyle" width="100%" border="1">
-                <caption style="height: 40px;font-size: 22px;">学校创客专项资金使用申请表（单位：元）</caption>
-                <caption style="height: 30px;text-align: left;">
-                    <div style="display: flex;">
-                        <div style="margin-right: 10px;margin-top: -5px;"> 项目类型:</div>
-                        <el-radio-group disabled v-model="selects.projectType">
-                          <el-radio label="创客空间">创客空间</el-radio>
-                          <el-radio label="创客实践室">创客实践室</el-radio>
-                          <el-radio label="个人创客">个人创客</el-radio>
-                          <el-radio label="创客活动">创客活动</el-radio>
-                        </el-radio-group>
-                    </div>
-                    
-                </caption>
-                <caption style="height: 30px;text-align: left;">项目名称:<span style="margin-left:30%;font-weight: bold;font-size: 16px;">{{ residue.PName }}</span></caption>
-                <tr>
-                    <td>序号</td>
-                    <td>经济支出类别(A)</td>
-                    <td>预算</td>
-                    <td>已支付</td>
-                    <td>本次申请</td>
-                    <td>余额</td>
-                    <td style="width: 20%;">事由</td>
-                </tr>
-                <tr>
-                    <td>01</td>
-                    <td style="text-align: left;">一.经费支出</td>
-                    <td>{{ AllFund.budget }}</td>
-                    <td>{{ AllFund.expended }}</td>
-                    <td>{{ AllFund.application }}</td>
-                    <td>{{ AllFund.surplus }}</td>
-                    <td style="width: 20%;"></td>
-                </tr>
-                <tr>
-                    <td>02</td>
-                    <td style="text-align: left;">(一)直接费用</td>
-                    <td>{{ IndirectFunding.budget }}</td>
-                    <td>{{ IndirectFunding.expended }}</td>
-                    <td>{{IndirectFunding.application}}</td>
-                    <td>{{ IndirectFunding.surplus }}</td>
-                    <td style="width: 20%;"></td>
-                </tr>
-                <tr>
-                    <td>03</td>
-                    <td style="text-align: left;">小型仪器设备费</td>
-                    <td>{{ directData.facility==0?'':directData.facility }}</td>
-                    <td>{{ usedDirectData.facility==0?'':usedDirectData.facility }}</td>
-                    <td>{{ applicationDirectData.facility==0?'':applicationDirectData.facility }}</td>
-                    <td>{{ directData.facility-usedDirectData.facility-applicationDirectData.facility }}</td>
-                    <td style="width: 20%;">{{ directDataReason.reason }}</td>
-                </tr>
-                <tr>
-                    <td>04</td>
-                    <td style="text-align: left;">材料费</td>
-                    <td>{{ directData.cl==0?'':directData.cl }}</td>
-                    <td>{{ usedDirectData.cl==0?'':usedDirectData.cl }}</td>
-                    <td>{{ applicationDirectData.cl==0?'':applicationDirectData.cl }}</td>
-                    <td>{{ directData.cl-usedDirectData.cl-applicationDirectData.cl }}</td>
-                    <td style="width: 20%;">{{ directDataReason.reason1 }}</td>
-                </tr>
-                <tr>
-                    <td>05</td>
-                    <td style="text-align: left;">测试化验加工费</td>
-                    <td>{{ directData.jg==0?'':directData.jg }}</td>
-                    <td>{{ usedDirectData.jg==0?'':usedDirectData.jg }}</td>
-                    <td>{{ applicationDirectData.jg==0?'':applicationDirectData.jg }}</td>
-                    <td>{{ directData.jg-usedDirectData.jg-applicationDirectData.jg }}</td>
-                    <td style="width: 20%;">{{ directDataReason.reason2 }}</td>
-                </tr>
-                <tr>
-                    <td>06</td>
-                    <td style="text-align: left;">项目协作费</td>
-                    <td>{{ directData.xz==0?'':directData.xz }}</td>
-                    <td>{{ usedDirectData.xz==0?'':usedDirectData.xz }}</td>
-                    <td>{{ applicationDirectData.xz==0?'':applicationDirectData.xz }}</td>
-                    <td>{{ directData.xz-usedDirectData.xz-applicationDirectData.xz }}</td>
-                    <td style="width: 20%;">{{ directDataReason.reason3 }}</td>
-                </tr>
-                <tr>
-                    <td>07</td>
-                    <td style="text-align: left;">其他支出</td>
-                    <td>{{ directData.qt==0?'':directData.qt }}</td>
-                    <td>{{ usedDirectData.qt==0?'':usedDirectData.qt }}</td>
-                    <td>{{ applicationDirectData.qt==0?'':applicationDirectData.qt }}</td>
-                    <td>{{ directData.qt- usedDirectData.qt-applicationDirectData.qt}}</td>
-                    <td style="width: 20%;">{{ directDataReason.reason4 }}</td>
-                </tr>
-                <tr>
-                    <td>08</td>
-                    <td style="text-align: left;">(二)间接费用</td>
-                    <td>{{ Expenditure['budget'] }}</td>
-                    <td>{{ Expenditure['expended'] }}</td>
-                    <td>{{ Expenditure['application'] }}</td>
-                    <td>{{ Expenditure['surplus'] }}</td>
-                    <td style="width: 20%;"></td>
-                </tr>
-                <tr>
-                    <td>03</td>
-                    <td style="text-align: left;">项目成果鉴定费</td>
-                    <td>{{ indirectData.facility==0?'':indirectData.facility }}</td>
-                    <td>{{ usedInDirectData.facility==0?'':usedInDirectData.facility }}</td>
-                    <td>{{ applicationInDirectData.facility==0?'':applicationInDirectData.facility }}</td>
-                    <td>{{ indirectData.facility-usedInDirectData.facility-applicationInDirectData.facility }}</td>
-                    <td style="width: 20%;">{{ indirectDataReason.reason }}</td>
-                </tr>
-                <tr>
-                    <td>04</td>
-                    <td style="text-align: left;">参展参赛费</td>
-                    <td>{{ indirectData.cl==0?'':indirectData.cl }}</td>
-                    <td>{{ usedInDirectData.cl==0?'':usedInDirectData.cl }}</td>
-                    <td>{{ applicationInDirectData.cl==0?'':applicationInDirectData.cl }}</td>
-                    <td>{{ indirectData.cl-usedInDirectData.cl-applicationInDirectData.cl }}</td>
-                    <td style="width: 20%;">{{ indirectDataReason.reason1 }}</td>
-                </tr>
-                <tr>
-                    <td>05</td>
-                    <td style="text-align: left;">创客交流活动费</td>
-                    <td>{{ indirectData.jg==0?'':indirectData.jg }}</td>
-                    <td>{{ usedInDirectData.jg==0?'':usedInDirectData.jg }}</td>
-                    <td>{{ applicationInDirectData.jg==0?'':applicationInDirectData.jg }}</td>
-                    <td>{{ indirectData.jg-usedInDirectData.jg-applicationInDirectData.jg }}</td>
-                    <td style="width: 20%;">{{ indirectDataReason.reason2 }}</td>
-                </tr>
-                <tr>
-                    <td>06</td>
-                    <td style="text-align: left;">知识产权事务费</td>
-                    <td>{{ indirectData.xz==0?'':indirectData.xz }}</td>
-                    <td>{{ usedInDirectData.xz==0?'':usedInDirectData.xz }}</td>
-                    <td>{{ applicationInDirectData.xz==0?'':applicationInDirectData.xz }}</td>
-                    <td>{{ indirectData.xz-usedInDirectData.xz-applicationInDirectData.xz }}</td>
-                    <td style="width: 20%;">{{ indirectDataReason.reason3 }}</td>
-                </tr>
-                <tr>
-                    <td>07</td>
-                    <td style="text-align: left;">其他支出</td>
-                    <td>{{ indirectData.qt==0?'':indirectData.qt }}</td>
-                    <td>{{ usedInDirectData.qt==0?'':usedInDirectData.qt }}</td>
-                    <td>{{ applicationInDirectData.qt==0?'':applicationInDirectData.qt }}</td>
-                    <td>{{ indirectData.qt-usedInDirectData.qt-applicationInDirectData.qt }}</td>
-                    <td style="width: 20%;">{{ indirectDataReason.reason4 }}</td>
-                </tr>
-                <!-- <tr v-for="(item,index) in items" :key="index">
-                    <td>{{ index+1 }}</td>
-                    <td style="text-align: left;">{{ item.fromSort }}</td>
-                    <td>{{ item.fromBudget }}</td>
-                    <td>{{ item.fromUsed }}</td>
-                    <td>{{ item.fromApp }}</td>
-                    <td>{{ item.fromBalance }}</td>
-                    <td style="width: 20%;">{{ item.fromReason }}</td>
-                </tr> -->
-                <tr>
-                    <td style="height: 80px;">备注</td>
-                    <td colspan="6" style="text-align:left;">{{ residue.reason }}</td>
-                </tr>
-            </table>
-          </div>
-          <span slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="submitCreateFrom"  class="AllDialogBtn">生成表单</el-button>
-            <el-button @click="createFromDialog = false" class="AllDialogBtn" size="small">取消</el-button>
-          </span>
-        </el-dialog>
-      <!-- 生成表单对话框结束 -->
-
   </div>
 </template>
 
 <script>
-import downloadFile from '@/components/tool/downloadFile.js';
-import getExcel from "@/components/tool/getExcel";
+// import downloadFile from '@/components/tool/downloadFile.js';
+// import getExcel from "@/components/tool/getExcel";
 
     export default {
       data() {
         return {
+          selectInp:{    //搜索下拉框的值
+            filter:'',
+            department:'',
+            type:'',
+            leader:'',
+            status:''
+          },
           loading:false,
           ProjectFundData:{},
           projectFundState:'',
@@ -546,217 +378,7 @@ import getExcel from "@/components/tool/getExcel";
                     name:'创客活动'
                 },
             ],      
-            directFundBlock:[   //直接经费
-                {
-                    directFundData:'',
-                    directFundSelects:[
-                        {
-                            value:1,
-                            label:'小型仪器设备费'
-                        },
-                        {
-                            value:2,
-                            label:'材料费'
-                        },
-                        {
-                            value:3,
-                            label:'测试化验加工费'
-                        },
-                        {
-                            value:4,
-                            label:'项目协作费'
-                        },
-                        {
-                            value:5,
-                            label:'其他支出'
-                        },
-                    ],
-                    budget:'',         //预算
-                    usedFund:'',       //已使用
-                    apply:'',          //本次申请
-                    reason:''          //理由
-                }
-            ], 
-            newDirectFundBlock:{     //添加直接经费
-                directFundData:'',
-                directFundSelects:[
-                        {
-                            value:1,
-                            label:'小型仪器设备费'
-                        },
-                        {
-                            value:2,
-                            label:'材料费'
-                        },
-                        {
-                            value:3,
-                            label:'测试化验加工费'
-                        },
-                        {
-                            value:4,
-                            label:'项目协作费'
-                        },
-                        {
-                            value:5,
-                            label:'其他支出'
-                        },
-                ],
-                budget:'',         //预算
-                usedFund:'',       //已使用
-                apply:'',          //本次申请
-                reason:''          //理由
-            },
 
-            indirectFundBlock:[    //间接经费
-                {
-                    indirectFundData:'',
-                    indirectFundSelects:[
-                        {
-                            value:1,
-                            label:'项目成功鉴定费'
-                        },
-                        {
-                            value:2,
-                            label:'参展参赛费'
-                        },
-                        {
-                            value:3,
-                            label:'创客交流活动费'
-                        },
-                        {
-                            value:4,
-                            label:'知识产权事务费'
-                        },
-                        {
-                            value:5,
-                            label:'其他支出'
-                        },
-                    ],
-                    budget:'',         //预算
-                    usedFund:'',       //已使用
-                    apply:'',          //本次申请
-                    reason:''          //理由
-                }
-            ], 
-            newIndirectFundBlock:{    //添加间接经费
-                indirectFundData:'',
-                indirectFundSelects:[
-                        {
-                            value:1,
-                            label:'项目成功鉴定费'
-                        },
-                        {
-                            value:2,
-                            label:'参展参赛费'
-                        },
-                        {
-                            value:3,
-                            label:'创客交流活动费'
-                        },
-                        {
-                            value:4,
-                            label:'知识产权事务费'
-                        },
-                        {
-                            value:5,
-                            label:'其他支出'
-                        },
-                ],
-                budget:'',         //预算
-                usedFund:'',       //已使用
-                apply:'',          //本次申请
-                reason:''          //理由
-            },
-            
-
-            residue:{                 //其他
-                    PName:"",//项目名称
-                    elseReason:'',
-                    budget:'',
-                    usedFund:'',
-                    reason:'',
-                }
-            ,
-            directData:{     //直接经费预算
-                facility:0,
-                cl:0,
-                jg:0,
-                xz:0,
-                qt:0,
-            },
-            directDataReason:{     //直接经费理由
-                reason:'',
-                reason1:'',
-                reason2:'',
-                reason3:'',
-                reason4:''
-            },
-            usedDirectData:{     //直接经费已支出
-                facility:0,
-                cl:0,
-                jg:0,
-                xz:0,
-                qt:0,
-            },
-            applicationDirectData:{    //直接经费本次申请
-                facility:0,
-                cl:0,
-                jg:0,
-                xz:0,
-                qt:0,
-            },
-            indirectData:{     //间接经费预算
-                facility:0,
-                cl:0,
-                jg:0,
-                xz:0,
-                qt:0,
-            },
-            indirectDataReason:{   //间接理由
-                reason:'',
-                reason1:'',
-                reason2:'',
-                reason3:'',
-                reason4:''
-            },
-            usedInDirectData:{     //间接经费已支出
-                facility:0,
-                cl:0,
-                jg:0,
-                xz:0,
-                qt:0,
-            },
-            applicationInDirectData:{   //间接经费本次申请
-                facility:0,
-                cl:0,
-                jg:0,
-                xz:0,
-                qt:0,
-            },
-            DirectFunding:{ //直接经费汇总
-                budget:0,       //预算
-                expended:0,     //已支付
-                application:0,  //本次申请
-                surplus:0,      //余额
-            },
-            IndirectFunding:{//间接经费汇总
-                budget:0,       //预算
-                expended:0,     //已支付
-                application:0,  //本次申请
-                surplus:0,      //余额
-            },
-            Expenditure:{//经费支出汇总
-                budget:0,       //预算
-                expended:0,     //已支付
-                application:0,  //本次申请
-                surplus:0,      //余额
-            },
-            AllFund:{ //经费支出
-                budget:0,       //预算
-                expended:0,     //已支付
-                application:0,  //本次申请
-                surplus:0,      //余额
-            },
           textarea:'',  //立项审核事由
           input:'',
           value:'',
@@ -778,14 +400,6 @@ import getExcel from "@/components/tool/getExcel";
               value:1,
               label:'活动创客'
             },
-            {
-              value:2,
-              label:'创客空间'
-            },
-            {
-              value:3,
-              label:'创客实践室'
-            },
           ],
           leaderSelects:[],
           statusSelects:[
@@ -798,246 +412,12 @@ import getExcel from "@/components/tool/getExcel";
               label:'已审核'
             },
           ],
-          tableData:[         //列表
-          ],
-          selectInp:{    //搜索下拉框的值
-            filter:'',
-            department:'',
-            type:'',
-            leader:'',
-            status:''
-          }
+          tableData:[ ],//列表
+         
+
         }
       },
       methods:{
-        getAllFund(val){
-          let param={
-            uid:this.$store.state.userInfo.userid,
-            fid:val
-          }
-          // console.log(param);
-          this.ajax
-              .get(this.$store.state.api+'/SelectMakerFundSelects',param)
-              .then(res=>{
-                console.log(res.data);
-                  let data=res.data;
-                  this.directFundBlock=JSON.parse(data[0][0].directFund);
-                //   console.log(this.directFundBlock);
-                  this.indirectFundBlock=JSON.parse(data[0][0].indirectFund);
-                  this.residue=JSON.parse(data[0][0].elseFund);
-                  this.file=JSON.parse(data[0][0].fundFile);
-                  this.selects.projectName=data[0][0].courseId;
-                  this.selects.projectType=data[0][0].type;
-                  this.status=data[0][0].state;
-                  this.fid=data[0][0].fid;
-                  this.AllEquipment();
-                  this.createFromDialog=true;
-                //   this.projectFilter=data[1];
-              },err=>{
-                  console.log(err);
-              })
-      },
-        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']:'';
-
-        },
-        edit(val){   // 显示表单对话框
-            this.directData={     //直接经费预算
-                facility:0,
-                cl:0,
-                jg:0,
-                xz:0,
-                qt:0
-            },
-            this.usedDirectData={     //直接经费已支出
-                facility:0,
-                cl:0,
-                jg:0,
-                xz:0,
-                qt:0
-            },
-            this.indirectData={     //间接经费预算
-                facility:0,
-                cl:0,
-                jg:0,
-                xz:0,
-                qt:0
-            },
-            this.usedInDirectData={     //间接经费已支出
-                facility:0,
-                cl:0,
-                jg:0,
-                xz:0,
-                qt:0
-            },
-            this.directDataReason={
-                reason:'',
-                reason1:'',
-                reason2:'',
-                reason3:'',
-                reason4:''
-            },
-            this.IndirectFunding = { //直接经费汇总
-                budget:0,       //预算
-                expended:0,     //已支付
-                application:0,  //本次申请
-                surplus:0,      //余额
-            },
-            this.Expenditure={//经费支出汇总
-                budget:0,       //预算
-                expended:0,     //已支付
-                application:0,  //本次申请
-                surplus:0,      //余额
-            }
-            this.AllFund={ //经费支出
-                budget:0,       //预算
-                expended:0,     //已支付
-                application:0,  //本次申请
-                surplus:0,      //余额
-            }
-            this.applicationInDirectData={   //间接经费本次申请
-                facility:0,
-                cl:0,
-                jg:0,
-                xz:0,
-                qt:0,
-            }
-            this.applicationDirectData={    //直接经费本次申请
-                facility:0,
-                cl:0,
-                jg:0,
-                xz:0,
-                qt:0,
-            }
-            console.log(val.fid);
-            this.getAllFund(val.fid)
-
-           
-        },
-        submitCreateFrom(){   //生成表单
-          // console.log();
-            getExcel({
-                PName:this.residue.PName,   //项目名称
-                remarks:this.residue.reason,//备注
-                type:this.selects.projectType,//项目类型
-                direct:{
-                    budget:this.directData,
-                    expended:this.usedDirectData,
-                    apply:this.applicationDirectData,
-                    reason:this.directDataReason,
-                },
-                indirect:{
-                    budget:this.indirectData,
-                    expended:this.usedInDirectData,
-                    apply:this.applicationInDirectData,
-                    reason:this.indirectDataReason
-                }
-            })
-            
-        },
         Audit(val,num){          //显示审核对话框
           console.log(val);
           this.isManager=num
@@ -1099,7 +479,7 @@ import getExcel from "@/components/tool/getExcel";
           this.getData()
         },
         getData(){
-          this.loading = true;
+          // this.loading = true;
             let param={
               uid:this.$store.state.userInfo.userid,
               filter:this.selectInp.filter,
@@ -1110,34 +490,40 @@ import getExcel from "@/components/tool/getExcel";
               page:this.table.currentPage,
               lim:this.table.packageSize
             }
+            // console.log(param);
             this.ajax
-                .get(this.$store.state.api+'/SelectMakerFund',param)
+                .get(this.$store.state.api+'/selectAllFundApply',param)
                 .then(res=>{
+                  // return console.log(res);
                   let data=res.data;
-                  if (data[0].length==0 && data[4][0]['total'] != 0) {
-                    this.table.currentPage=1
-                    this.getData()
-                  }
-                  // console.log(data);
+                  let  usedFund=0
+
+                  console.log(data);
+                  // if (data[0].length==0 && data[4][0]['total'] != 0) {
+                  //   this.table.currentPage=1
+                  //   this.getData()
+                  // }
+                  data[0].forEach(e => {
+                    e.applyfund=JSON.parse(e.applyfund)
+
+                    for(let i in e.applyfund){
+                      usedFund+=e.applyfund[i]*1
+                    }
+                    // console.log(usedFund);
+                    e.applyfund=usedFund
+                  });
+                  
                   this.tableData=data[0];
                   this.filterSelects=data[1];
                   this.departmentSelect=data[2];
                   this.leaderSelects=data[3];
-                  this.table.total=data[4][0].total
-                  this.loading = false;
+                  // this.table.total=data[4][0].total
+                  // this.loading = false;
                 },err=>{
                   console.log(err);
                 })
         },
-        // edit(val){
-        //   console.log(val);
-        //   this.createFromDialog=true
-        //   this.getAllFund(val.fid)
-        //   // downloadFile('/file/附件 5 ：学校创客专项资金使用申请表.xlsx',"学校创客专项资金使用申请表.xlsx",(_b)=>this.loading = _b);
-        // },
-        handleSelectionChange(val) {     //批量选择
-          this.multipleSelection = val;
-        },
+       
         apply(){              //创客资金申请跳转界面
           this.$router.push('/newMarkerfundApply')
         },
@@ -1151,12 +537,11 @@ import getExcel from "@/components/tool/getExcel";
       },
       mounted(){
         this.getData();
-        // this.getAllFund()
       }
     }
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 .makerfund{     
 
   .el-dialog{
@@ -1244,85 +629,8 @@ import getExcel from "@/components/tool/getExcel";
       }
     }
   }
-  .createFromDialogSty{        //生成表单
-        .el-dialog__header{
-          display: flex;
-          justify-content: center;
-        }
-        .el-dialog{   
-            border-radius: 5px;
-            overflow: hidden;
 
-            top: 10%;
-        }
-        
-        .deleteContent{
-            width: 100%;
-            text-align: center;
-            font-size: 22px;
-            color: #000;
-        }
-        .addDialogLogo{
-            width: 60px;
-            height: 30px;
-            border-radius: 5px;
-            display: flex;
-            justify-content: center;
-            line-height: 30px;
-            background: #f2f2f2;
-            position: absolute;
-            left: 20px; top: 15px; 
-        }
-        .el-dialog__header{
-            background: #32455b;
-        }
-        .el-dialog__title{
-            color:#fff;
-            display: flex;
-            justify-content: center;
-            font-size: 18px;
-            position: relative;
-            top: -2px;
-        }
-        .addDialogMid{
-            box-sizing: border-box;
-            padding:0 60px 0 10px;
-        .addDialogTit{
-            display: flex;
-            span{
-            width: 80px;
-            line-height: 40px;
-            text-align: left;
-            }
-        }
-        .addDialogTit1{
-            display: flex;
-            justify-content: space-between;
-            margin-bottom: 15px;
-        }
-        .addDialogTit2{
-            margin-top: 10px;
-            font-size: 18px;
-            color: #000;
-            text-indent: 2em;
-        }
-        .addDialogCon{
-            margin-top: 20px;
-        }
-        }
-        .dialog-footer{
-            display: flex;
-            justify-content: center;
-        }
-    }
-    .tableStyle{  //申请表样式
-      border-collapse:collapse;
-      font-size: 16px;
-      td{
-          // align-content: center;
-          height: 35px;
-      }
-    }
+
 }
 
 </style>

src/views/fundManage/newMarkerfundApply.vue

@@ -24,7 +24,6 @@
             </div>
     </div>
     <hr>
-
     <table border="1" cellspacing="0" class="table">
        
         <tr>
@@ -74,19 +73,52 @@
         </tr>
         
     </table>
-
-
     <div class="baseBtn">
         <div class="blockWidth">
-            <el-button type="primary" @click="submitCreateFrom">生成表单</el-button>
-            <el-button type="primary" @click="submitAll">提交</el-button>
+            <el-button type="primary" @click="download">生成表单</el-button>
+            <el-button type="primary" @click="submitData">提交</el-button>
         </div>
     </div>
 
+
+    <!-- 下载文档开始 -->
+    <el-dialog
+      title="生成Excel"
+      :visible.sync="downLoadExcelDig"
+      width="600px"
+      class="pageSubmitData"
+    >
+      <div class="addDialogLogo">LOGO</div>
+      <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"
+    >
+      <div class="addDialogLogo">LOGO</div>
+      <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 getExcel from '@/components/tool/downloadExcel'
@@ -98,23 +130,27 @@ export default {
         return {
             projectFilter:[],    //项目名称列表            
             projectName:'',      //所选名称
+            downLoadExcelDig:false,//下载Excel对话框
+            submitDataDig:false,//提交对话框
+            allFund:'',//总经费
             fundList:[
-                {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:'论文版面费、专利及其他知识产权事务等费用。'},
+                {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:'学术会务费、评审费、鉴定费、成果集制作费等费用。'},
+                {fundName:'参展参赛费',budget:'',havePaid:'0',thisApply:'',remark:'参加创客展会、竞赛等所需的报名费、展位费、布展费、宣传推广费及差旅费等费用。'},
+                {fundName:'创客交流活动费',budget:'',havePaid:'0',thisApply:'',remark:'创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。'},
+                {fundName:'知识产权事务费',budget:'',havePaid:'0',thisApply:'',remark:'论文版面费、专利及其他知识产权事务等费用。'},
             ],
-            intro:'诶嘿嘿',   //事由
+            intro:'',   //事由
         }
     },
     methods:{
         getData(){         //获取活动经费的项目名称
             let param={
                 uid:this.$store.state.userInfo.userid,
+                type:0
             }
             this.ajax
                 .get(this.$store.state.api+'/SelectMakerFundSelects',param)
@@ -127,37 +163,95 @@ export default {
                     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);
+            //total：总经费     
+            //小型仪器设备费：device        deviceRemarks
+            //材料费：Material             MaterialRemarks
+            //测试化验加工费：processing    processingRemarks
+            //项目协作费：Collaboration     CollaborationRemarks
+            //项目成果鉴定费：APPRAISAL     APPRAISALRemarks
+            //参展参赛费：entery            enteryRemarks
+            //创客交流活动费：activities    activitiesRemarks
+            //知识产权事务费：Transaction   TransactionRemarks
             let param={
                 uid:this.$store.state.userInfo.userid,
-                fid:this.projectName
+                fid:this.projectName,
             }
             this.ajax
             .get(this.$store.state.api+'/selectMarkerFundData',param)
             .then(res=>{
-                // console.log(res.data[0][0]);
+                console.log(res.data);
                 let data=JSON.parse(res.data[0][0]['fund']);
-                console.log(data);
+                // 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[4].budget=data.APPRAISAL
+                this.fundList[5].budget=data.entery 
+                this.fundList[6].budget=data.activities 
+                this.fundList[7].budget=data.Transaction
+                this.allFund=res.data[0][0]['money']
             },err=>{
                 console.log(err);
             })
         },
-        submitCreateFrom(){   //生成表单
+        download(){
+            if(!this.projectName) return this.$message.error('请选择项目名称')
+            this.downLoadExcelDig=true
+        },
+        downLoadExcel(){   //生成表单
             getExcel(this.fundList,this.intro)
+            this.downLoadExcelDig=false
+        },
+        submitData(){
+            if(!this.projectName) 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); 
+            let fund2=arr2.reduce((prev,cur,index,arr) => {
+                return prev + cur*1;
+            },0); 
+            if (fund+fund2>this.allFund) return this.$message.error('申请金额已大于预算')
+            this.submitDataDig=true
         },
-
         submitAll(){           //提交创客资金申请
-           
+           getFundNo("ZJ").then((result)=>{
+                let param={
+                    uid:this.$store.state.userInfo.userid,
+                    aid:this.projectName,
+                    fNo:result, //项目编号
+                    intro:this.intro,
+                    f:JSON.stringify({
+                        device:this.fundList[0].thisApply,
+                        Material:this.fundList[1].thisApply,
+                        processing:this.fundList[2].thisApply,
+                        Collaboration:this.fundList[3].thisApply,
+                        APPRAISAL:this.fundList[4].thisApply,
+                        entery:this.fundList[5].thisApply,
+                        activities:this.fundList[6].thisApply,
+                        Transaction:this.fundList[7].thisApply,
+                    })
+                }
+                this.ajax
+                .post(this.$store.state.api+'/insertFundApply',param)
+                .then(res=>{
+                    console.log(res);
+                    if(res.data==1){
+                        this.$message.success('提交成功')
+                        this.submitDataDig=false
+                    }else{
+                        this.$message.error('提交失败')
+                    }
+                },err=>{
+                    console.log(err);
+                })
+            })
         },
     },
     watch:{

src/views/fundManage/newNomMarkerFundApply.vue

@@ -2,14 +2,13 @@
     <!-- 创客资金申请表单 -->
   <div>
     <div class="vfpHeader">
-        <div class="titleOne">个人创客资金申请</div>
-        <!-- <el-button type="primary" @click="$router.back()">返回</el-button> -->
+        <div class="titleOne">创客活动资金申请</div>
     </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>
@@ -36,7 +24,6 @@
             </div>
     </div>
     <hr>
-
     <table border="1" cellspacing="0" class="table">
        
         <tr>
@@ -86,330 +73,197 @@
         </tr>
         
     </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 class="baseBtn">
+        <div class="blockWidth">
+            <el-button type="primary" @click="download">生成表单</el-button>
+            <el-button type="primary" @click="submitData">提交</el-button>
         </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>
+    </div>
 
-                <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> -->
-    <!-- 附件上传结束 -->
 
+    <!-- 下载文档开始 -->
+    <el-dialog
+      title="生成Excel"
+      :visible.sync="downLoadExcelDig"
+      width="600px"
+      class="pageSubmitData"
+    >
+      <div class="addDialogLogo">LOGO</div>
+      <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"
+    >
+      <div class="addDialogLogo">LOGO</div>
+      <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 class="baseBtn">
-        <div class="blockWidth">
-            <el-button type="primary" @click="submitCreateFrom">生成表单</el-button>
-            <el-button type="primary" @click="submitAll">提交</el-button>
-        </div>
-    </div>
 
   </div>
 </template>
 
 <script>
+    import getFundNo from '@/components/tool/getProjectNo';
     import BeUpload from "../../components/tool/beUpload.vue";
     // import getExcel from "@/components/tool/getExcel";
-    import downloadExcel from '@/components/tool/downloadExcel'
+    import getExcel from '@/components/tool/downloadExcel'
 export default {
     components: {
         BeUpload,
       },
     data() {
         return {
+            projectFilter:[],    //项目名称列表            
+            projectName:'',      //所选名称
+            downLoadExcelDig:false,//下载Excel对话框
+            submitDataDig:false,//提交对话框
+            allFund:'',
             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:'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:'学术会务费、评审费、鉴定费、成果集制作费等费用。'},
+                {fundName:'参展参赛费',budget:'',havePaid:'0',thisApply:'',remark:'参加创客展会、竞赛等所需的报名费、展位费、布展费、宣传推广费及差旅费等费用。'},
+                {fundName:'创客交流活动费',budget:'',havePaid:'0',thisApply:'',remark:'创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。'},
+                {fundName:'知识产权事务费',budget:'',havePaid:'0',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'),
+            intro:'',   //事由
         }
     },
     methods:{
         getData(){         //获取活动经费的项目名称
             let param={
                 uid:this.$store.state.userInfo.userid,
-                fid:''
+                type:1
             }
             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);
                 })
         },
-        submitCreateFrom(){   //生成表单
-            downloadExcel(this.fundList,this.intro)
+         
+        getFundData(){
+            // console.log(this.projectName);
+            //total：总经费     
+            //小型仪器设备费：device        deviceRemarks
+            //材料费：Material             MaterialRemarks
+            //测试化验加工费：processing    processingRemarks
+            //项目协作费：Collaboration     CollaborationRemarks
+            //项目成果鉴定费：APPRAISAL     APPRAISALRemarks
+            //参展参赛费：entery            enteryRemarks
+            //创客交流活动费：activities    activitiesRemarks
+            //知识产权事务费：Transaction   TransactionRemarks
+            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);
+                let data=JSON.parse(res.data[0][0]['fund']);
+                // 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[4].budget=data.APPRAISAL
+                this.fundList[5].budget=data.entery 
+                this.fundList[6].budget=data.activities 
+                this.fundList[7].budget=data.Transaction
+                this.allFund=res.data[0][0]['money']
+
+            },err=>{
+                console.log(err);
+            })
         },
-        handleChange(value) {
-            console.log(value);
+        download(){
+            if(!this.projectName) return this.$message.error('请选择项目名称')
+            this.downLoadExcelDig=true
         },
-        submitAll(){           //提交创客资金申请
-           
+        downLoadExcel(){   //生成表单
+            getExcel(this.fundList,this.intro)
+            this.downLoadExcelDig=false
         },
-        // 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;
+        submitData(){
+            if(!this.projectName) 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); 
+            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 param={
+                    uid:this.$store.state.userInfo.userid,
+                    aid:this.projectName,
+                    fNo:result, //项目编号
+                    intro:this.intro,
+                    f:JSON.stringify({
+                        device:this.fundList[0].thisApply,
+                        Material:this.fundList[1].thisApply,
+                        processing:this.fundList[2].thisApply,
+                        Collaboration:this.fundList[3].thisApply,
+                        APPRAISAL:this.fundList[4].thisApply,
+                        entery:this.fundList[5].thisApply,
+                        activities:this.fundList[6].thisApply,
+                        Transaction:this.fundList[7].thisApply,
+                    })
+                }
+                this.ajax
+                .post(this.$store.state.api+'/insertFundApply',param)
+                .then(res=>{
+                    console.log(res);
+                    if(res.data==1){
+                        this.$message.success('提交成功')
+                        this.submitDataDig=false
+                    }else{
+                        this.$message.error('提交失败')
+                    }
+                },err=>{
+                    console.log(err);
+                })
+            })
+        },
+    },
+    watch:{
+        projectName:{
+            handler(){
+                immediate:true
+                this.getFundData()
+            }
+        }
     },
     mounted(){
         this.getData()

src/views/home.vue

@@ -99,7 +99,7 @@
         goto(url){
           // console.log(this.$route.path);
           this.$router.push(url)
-          console.log('1111')
+          // console.log('1111')
         },
         homeExit(){
         // console.log(this.$route.path)

src/views/projectApply/newStudentProjectApply.vue

@@ -47,14 +47,14 @@
         submitHint:false,
         wordData:{
           applicationDate:getNowDate(1),//申请日期
-          projectName:'元宇宙',
-          radio: '1',
-          checkList:['1','2'],
-          schoolRadio:'1',
-          applyParsonRadio:'1',
-          applyParsonName:'袁一鸣',
+          projectName:'',
+          radio: '',
+          checkList:[],
+          schoolRadio:'',
+          applyParsonRadio:'',
+          applyParsonName:'',
           college:'',
-          tel:'16625153232',
+          tel:'',
           beginTime:'',
           endTime:'',
           studentS:[