zengyicheng 1 ano atrás
pai
commit
7543f6f1a4

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/css/128.5e3479ae.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/css/19.1d76bf47.css


+ 1 - 0
dist/css/420.cdfe3169.css

@@ -0,0 +1 @@
+.makerfund .dialog-footer[data-v-f5bf6c6c]{width:100%;display:flex;justify-content:center}.makerfund .dialog .el-dialog__header[data-v-f5bf6c6c]{background:#32455b}.makerfund .dialog .addDialogLogo[data-v-f5bf6c6c]{width:60px;height:30px;border-radius:5px;display:flex;justify-content:center;line-height:30px;background:#f2f2f2;position:absolute;left:20px;top:15px}.makerfund .dialog .el-dialog__title[data-v-f5bf6c6c]{color:#fff;display:flex;justify-content:center;font-size:18px;position:relative;top:-2px}.makerfund .dialog .diaBtn[data-v-f5bf6c6c]{font-size:16px}.makerfund .dialog .el-dialog__body[data-v-f5bf6c6c]{padding:30px 0 30px 50px}.makerfund .dialog .diaTit[data-v-f5bf6c6c]{width:100%;display:flex;font-size:16px;justify-content:flex-start}.makerfund .dialog .diaTit1[data-v-f5bf6c6c]{display:flex;margin-top:20px;font-size:16px;width:91%}.makerfund .dialog .diaTit1 .spans[data-v-f5bf6c6c]{font-size:16px;color:#000;box-sizing:border-box;padding-right:10px}.makerfund .dialog .spans1[data-v-f5bf6c6c]{color:#000;min-width:70px;margin-right:5px;display:inline-block;text-align:justify;text-justify:distribute-all-lines;-moz-text-align-last:justify;text-align-last:justify;transform:translateY(22%);padding-right:15px}.makerfund .dialog .diaTit5[data-v-f5bf6c6c]{display:flex;margin-right:15px}.makerfund .dialog .diaTit5 .el-input__inner[data-v-f5bf6c6c]{width:100px}

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/css/488.ba08e7a4.css


+ 0 - 1
dist/css/791.42a0e45c.css

@@ -1 +0,0 @@
-.makerfund .dialog-footer[data-v-42e8030c]{width:100%;display:flex;justify-content:center}.makerfund .dialog .el-dialog__header[data-v-42e8030c]{background:#32455b}.makerfund .dialog .addDialogLogo[data-v-42e8030c]{width:60px;height:30px;border-radius:5px;display:flex;justify-content:center;line-height:30px;background:#f2f2f2;position:absolute;left:20px;top:15px}.makerfund .dialog .el-dialog__title[data-v-42e8030c]{color:#fff;display:flex;justify-content:center;font-size:18px;position:relative;top:-2px}.makerfund .dialog .diaBtn[data-v-42e8030c]{font-size:16px}.makerfund .dialog .el-dialog__body[data-v-42e8030c]{padding:30px 0 30px 50px}.makerfund .dialog .diaTit[data-v-42e8030c]{width:100%;display:flex;font-size:16px;justify-content:flex-start}.makerfund .dialog .diaTit1[data-v-42e8030c]{display:flex;margin-top:20px;font-size:16px;width:91%}.makerfund .dialog .diaTit1 .spans[data-v-42e8030c]{font-size:16px;color:#000;box-sizing:border-box;padding-right:10px}.makerfund .dialog .spans1[data-v-42e8030c]{color:#000;min-width:70px;margin-right:5px;display:inline-block;text-align:justify;text-justify:distribute-all-lines;-moz-text-align-last:justify;text-align-last:justify;transform:translateY(22%);padding-right:15px}.makerfund .dialog .diaTit5[data-v-42e8030c]{display:flex;margin-right:15px}.makerfund .dialog .diaTit5 .el-input__inner[data-v-42e8030c]{width:100px}

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/css/957.bd63e2bd.css


+ 1 - 1
dist/index.html

@@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>双创学院管理系统</title><script defer="defer" src="/js/chunk-vendors.6fb7b4fe.js"></script><script defer="defer" src="/js/app.7bd846cd.js"></script><link href="/css/chunk-vendors.ab49d789.css" rel="stylesheet"><link href="/css/app.878f2d55.css" rel="stylesheet"></head><body><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>双创学院管理系统</title><script defer="defer" src="/js/chunk-vendors.6fb7b4fe.js"></script><script defer="defer" src="/js/app.52730004.js"></script><link href="/css/chunk-vendors.ab49d789.css" rel="stylesheet"><link href="/css/app.878f2d55.css" rel="stylesheet"></head><body><div id="app"></div></body></html>

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/10.87491c01.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/10.87491c01.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/128.007b4906.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/128.007b4906.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/19.97964037.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/19.97964037.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/210.fe76d0ca.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/210.fe76d0ca.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/420.449f4c13.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/420.449f4c13.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/488.b10d9545.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/488.b10d9545.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/769.24ea82ab.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/769.24ea82ab.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/791.7e231570.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/8.797ec056.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/8.797ec056.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/921.56426edc.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/921.56426edc.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/957.70069245.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/957.70069245.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/app.52730004.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/app.52730004.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/app.7bd846cd.js


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

@@ -567,7 +567,7 @@
                   this.filterSelects=data[1];
                   this.departmentSelect=data[2];
                   this.leaderSelects=data[3];
-                  this.table.total=data[4][0].total
+                  this.table.total=data[0][0].num
                   this.loading = false;
                 },err=>{
                   console.log(err);

+ 569 - 435
src/views/fundManage/makerfundDetails.vue

@@ -1,102 +1,142 @@
 <template>
-    <!-- 创客资金申请表单 -->
+  <!-- 创客资金申请表单 -->
   <div>
     <div class="vfpHeader">
-        <div class="titleOne">活动资金详细</div>
-        <el-button @click="$router.push('/makerfund')" type="primary" size="mini">返回</el-button>
+      <div class="titleOne">活动资金详细</div>
+      <el-button @click="$router.push('/makerfund')" type="primary" size="mini"
+        >返回</el-button
+      >
     </div>
-    <hr>
+    <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 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>
+        <p>经费支出类别(单位:元)</p>
+      </div>
     </div>
-    <hr>
+    <hr />
     <table border="1" cellspacing="0" class="table">
-       
-        <tr>
-            <th colspan="2">经济支出类别</th>
-            <th>预算</th>
-            <th>已支付</th>
-            <th style="position: relative;">本次申请<br><div style="width: 100px;position: absolute;left: 50%;transform: translate(-50%);bottom: 1px;">{{ create_at }}</div></th>
-            <th style="position: relative;">实际使用<br><div style="width: 100px;position: absolute;left: 50%;transform: translate(-50%);bottom: 1px;">{{ endTime }}</div></th>
-            <th>余额</th>
-            <th colspan="3">备注</th>
-        </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" style="background-color: rgb(234, 252, 186);">
-                <el-input
-                type="number"
-                autosize
-                style="width: 100%;"
-                resize="none"
-                onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"
-                placeholder="请输入金额"
-                v-model="item.actualuse">
-                </el-input>
-            </td>
-            <td v-if="state>0">
-                {{ item.actualuse }}
-            </td>
-            <td>   
-                <!-- 预算 -->
-                {{ state>0?item.budget-item.havePaid:item.budget-item.havePaid-item.actualuse }}
-                <!-- {{ 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>
-        
+      <tr>
+        <th colspan="2">经济支出类别</th>
+        <th>预算</th>
+        <th>已支付</th>
+        <th style="position: relative">
+          本次申请<br />
+          <div
+            style="
+              width: 100px;
+              position: absolute;
+              left: 50%;
+              transform: translate(-50%);
+              bottom: 1px;
+            "
+          >
+            {{ create_at }}
+          </div>
+        </th>
+        <th style="position: relative">
+          实际使用<br />
+          <div
+            style="
+              width: 100px;
+              position: absolute;
+              left: 50%;
+              transform: translate(-50%);
+              bottom: 1px;
+            "
+          >
+            {{ endTime }}
+          </div>
+        </th>
+        <th>余额</th>
+        <th colspan="3">备注</th>
+      </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" style="background-color: rgb(234, 252, 186)">
+          <el-input
+            type="number"
+            autosize
+            style="width: 100%"
+            resize="none"
+            onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"
+            placeholder="请输入金额"
+            @change="isMoreApply(index)"
+            v-model="item.actualuse"
+          >
+          </el-input>
+        </td>
+        <td v-if="state > 0">
+          {{ item.actualuse }}
+        </td>
+        <td>
+          <!-- 预算 -->
+          {{
+            state > 0
+              ? item.budget - item.havePaid
+              : item.budget - item.havePaid - item.actualuse
+          }}
+          <!-- {{ 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 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"
@@ -104,11 +144,14 @@
       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>
+        <el-button type="primary" @click="downLoadExcel" class="AllDialogBtn"
+          >确认</el-button
+        >
+        <el-button @click="downLoadExcelDig = false" class="AllDialogBtn"
+          >取消</el-button
+        >
       </span>
     </el-dialog>
     <!-- 下载文档结束-->
@@ -120,382 +163,473 @@
       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>
+        <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'
+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:0,//总经费
-            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,
-            endTime:'',
-            create_at:''
-        }
-    },
-    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['paid'],
+  components: {
+    BeUpload,
+  },
+  data() {
+    return {
+      projectFilter: [], //项目名称列表
+      projectName: "", //所选名称
+      downLoadExcelDig: false, //下载Excel对话框
+      submitDataDig: false, //提交对话框
+      allFund: 0, //总经费
+      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,
+      endTime: "",
+      create_at: "",
+    };
+  },
+  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["paid"],
+      };
+      // console.log(param);
+      this.ajax
+        .get(this.$store.state.api + "/selectActivityFundDetail", param)
+        .then(
+          (res) => {
+            //  console.log(res.data);
+            let data = res.data;
+            console.log(data);
+            let applyfund = JSON.parse(data[0][0]["applyfund"]);
+            let fund = "";
+            // console.log(data[0][0]['applyfund']);
+            if (data[0][0]["af"] != null) {
+              fund = JSON.parse(data[0][0]["af"]);
+            } else {
+              fund = JSON.parse(data[0][0]["pf"]);
             }
-            // console.log(param);
-            this.ajax
-            .get(this.$store.state.api+'/selectActivityFundDetail',param)
-            .then(res=>{
-                //  console.log(res.data);
-                let data=res.data
-                console.log(data);
-                let applyfund=JSON.parse(data[0][0]['applyfund'])
-                let fund=''
-                // console.log(data[0][0]['applyfund']);
-                if (data[0][0]['af']!=null) {
-                    fund=JSON.parse(data[0][0]['af'])
-                }else{
-                    fund=JSON.parse(data[0][0]['pf'])
-                }
             //    return  console.log(111);
 
-                // let usedFund=JSON.parse(data['usedFund'])
-                let actualuse=JSON.parse(data[0][0]['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);
-                    arr.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']);
-                    })
-                }
-                
-
-
-                // 本次申请
-                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
-                
-                // console.log(applyfund);
+            // let usedFund=JSON.parse(data['usedFund'])
+            let actualuse = JSON.parse(data[0][0]["actualuse"]);
+            // this.tit=data.title;
+            // this.ty=data.type;
 
-                // 预算
-                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
-                // }
-
-
-
-                // 实际使用
-                if (data[1][0]['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
-                }
-                // console.log(data.state);
-                // if (data.state>0) {
-                //     this.fundList.forEach(e=>{
-                //         e.remark=e.budget*1-e.havePaid*1
-                //     })
-                // }
-
-                // return
-
-
-                this.intro=data[0][0].intro
-                this.state=data[0][0].state
-                this.create_at=data[0][0].createTime
-                console.log(this.create_at);
-                this.endTime=data[0][0].endTime
-
-
-                
-
-
-            },err=>{
-                console.log(err);
-            })
-        },
-         
+            let arr = res["data"][1].filter((e) => {
+              return e.actualuse != null;
+            });
+            // console.log(arr);
 
-        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('请选择项目名称')
-            this.allFund=0
-            this.fundList.forEach(e=>{
-                this.allFund+=e.budget*1
-            })
-            console.log(this.allFund);
+            // let isUse = arr;
+            if (arr) {
+              // console.log(111);
+              arr.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"]);
+              });
+            }
 
-            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==0) return this.$message.error('请输入实际使用金额')
-            if (fund+fund2>this.allFund) return this.$message.error('申请金额已大于预算')
-            this.submitDataDig=true
-        },
-        submitAll(){           //提交创客资金申请
-        //    getFundNo("ZJ").then((result)=>{
+            // 本次申请
+            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;
+
+            // 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
+            // }
 
-            // 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,
+            // 实际使用
+            if (data[1][0]["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;
+            }
+            // console.log(data.state);
+            // if (data.state>0) {
+            //     this.fundList.forEach(e=>{
+            //         e.remark=e.budget*1-e.havePaid*1
+            //     })
             // }
-            
-            //  console.log(arr);
 
+            // return
 
-                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);
-                })
-            // })
-        },
+            this.intro = data[0][0].intro;
+            this.state = data[0][0].state;
+            this.create_at = data[0][0].createTime;
+            console.log(this.create_at);
+            this.endTime = data[0][0].endTime;
+          },
+          (err) => {
+            console.log(err);
+          }
+        );
     },
 
-    mounted(){
-        this.getData()
-        this.projectName=this.$route.query['tit']
-        console.log(this.$route.query['Id']);
-        console.log(this.$route.query['tit']);
-        console.log(this.$route.query['paid']);
-
-    }
-}
+    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("请选择项目名称");
+      this.allFund = 0;
+      this.fundList.forEach((e) => {
+        this.allFund += e.budget * 1;
+      });
+      console.log(this.allFund);
+
+      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 == 0) return this.$message.error("请输入实际使用金额");
+      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);
+          }
+        );
+      // })
+    },
+    isMoreApply(i) {
+      if (
+        this.fundList[i].budget - this.fundList[i].actualuse <
+        0
+      ) {
+        this.$message({
+          message: "实际使用不能超过余额!",
+          type: "warning",
+        });
+        this.fundList[i].actualuse = 0;
+        return;
+      }
+    },
+  },
+
+  mounted() {
+    this.getData();
+    this.projectName = this.$route.query["tit"];
+    console.log(this.$route.query["Id"]);
+    console.log(this.$route.query["tit"]);
+    console.log(this.$route.query["paid"]);
+  },
+};
 </script>
 
 <style lang="less" scoped>
-    .Apply1{         //顶部下拉框
-        height: 45px;
-        width: 50%;
-        display: flex;
-        justify-content: flex-start;
-        margin-top: 20px;
+.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: 90%;
+  margin: auto;
+  margin-top: 30px;
+  .textLeft {
+    :deep(.el-textarea__inner) {
+      border: none;
+      border-radius: 0px;
+      text-align: left !important;
+      font-size: 16px;
     }
-    .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;
+  }
+  tr th {
+    height: 70px;
+    border: none;
+    border-bottom: solid 1px black;
+    border-right: solid 1px black;
+    &:nth-child(1) {
+      border-left: solid 1px black;
     }
-    .table{ 
-        border: none;
-        border-top: solid 1px black;
-        // border-right:  solid 1px black;
-        width: 90%;
-        margin: auto;
-        margin-top: 30px;
-        .textLeft{
-          :deep(.el-textarea__inner){
-            border: none ;
-            border-radius: 0px;
-            text-align: left !important;
-            font-size: 16px;
-          }
-        }
-        tr th{
-            height: 70px;
-            border: none;
-            border-bottom: solid 1px black;
-            border-right: solid 1px black;
-            &:nth-child(1){
-                border-left:  solid 1px black;
-              }
-        }
-        tr td{
-            border: none;
-            border-bottom: solid 1px black;
-            border-right: solid 1px black;
-          height: 50px;
-          text-align: center;
-          line-height: 30px;
-          width: 80px;
-           
-          &: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 ;
-            background: rgb(234, 252, 186);
-            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;
-            }
-          }
-        }
-        
+  }
+  tr td {
+    border: none;
+    border-bottom: solid 1px black;
+    border-right: solid 1px black;
+    height: 50px;
+    text-align: center;
+    line-height: 30px;
+    width: 80px;
+
+    &:nth-child(1) {
+      border-left: solid 1px black;
     }
-    .textLeft{
-          :deep(.el-textarea__inner){
-            border: none ;
-            border-radius: 0px;
-            text-align: left !important;
-            font-size: 16px;
-          }
-        }
-    :depp(.el-input.is-disabled){
-        color: black !important;
-
+    p {
+      font-weight: 600;
     }
-
-    :deep(.el-select .el-input.is-disabled .el-input__inner){    //项目名称字体颜色
-        color: #000;
+    :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;
+      background: rgb(234, 252, 186);
+      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;
+  }
+}
+:depp(.el-input.is-disabled) {
+  color: black !important;
+}
+
+:deep(.el-select .el-input.is-disabled .el-input__inner) {
+  //项目名称字体颜色
+  color: #000;
+}
 </style>

+ 553 - 441
src/views/fundManage/newMarkerfundApply.vue

@@ -1,18 +1,18 @@
 <template>
-    <!-- 创客资金申请表单 -->
+  <!-- 创客资金申请表单 -->
   <div>
     <!-- <div class="vfpHeader">
         <div class="titleOne">创客活动资金申请</div>
     </div> -->
     <div class="pAHeader">
-        <div class="pAHeader1">创客活动资金申请</div>
-      </div>
-    <hr>
+      <div class="pAHeader1">创客活动资金申请</div>
+    </div>
+    <hr />
     <!-- 项目名称、类型开始 -->
     <div class="Apply1">
-        <!-- <div class="inpInterval">活动名称</div> -->
-        <div class="inpInterval">创客项目</div>
-        <!-- <el-select v-model="projectName"  style="width: 30%;" placeholder="请选择">
+      <!-- <div class="inpInterval">活动名称</div> -->
+      <div class="inpInterval">创客项目</div>
+      <!-- <el-select v-model="projectName"  style="width: 30%;" placeholder="请选择">
             <el-option
             v-for="item in projectFilter"
             :key="item.id"
@@ -20,76 +20,82 @@
             :value="item.id">
             </el-option>
         </el-select> -->
-        <el-cascader
+      <el-cascader
         v-model="value"
         :options="options"
         :props="{ expandTrigger: 'hover' }"
-        @change="handleChange"></el-cascader>
+        @change="handleChange"
+      ></el-cascader>
     </div>
 
     <div class="tabTit">
-            <div>
-                <p>经费支出类别(单位:元)</p>
-            </div>
+      <div>
+        <p>经费支出类别(单位:元)</p>
+      </div>
     </div>
-    <hr>
+    <hr />
     <table border="1" cellspacing="0" class="table">
-       
-        <tr>
-            <td colspan="2">经济支出类别</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 style="background-color: rgb(234, 252, 186);">
-                <el-input
-                type="number"
-                autosize
-                style="width: 100%;"
-                resize="none"
-                onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"
-                placeholder="请填写金额(元)"
-                v-model="item.thisApply">
-                </el-input>
-            </td>
-            <td>
-                {{ item.budget-item.havePaid-item.thisApply }}
-            </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>
-        
+      <tr>
+        <td colspan="2">经济支出类别</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 style="background-color: rgb(234, 252, 186)">
+          <el-input
+            type="number"
+            autosize
+            style="width: 100%"
+            resize="none"
+            onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"
+            placeholder="请填写金额(元)"
+            @change="isMoreApply(index)"
+            v-model="item.thisApply"
+          >
+          </el-input>
+        </td>
+        <td>
+          {{ item.budget - item.havePaid - item.thisApply }}
+        </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" @click="submitData">提交</el-button>
-        </div>
+      <div class="blockWidth">
+        <el-button type="primary" @click="download">生成表单</el-button>
+        <el-button type="primary" @click="submitData">提交</el-button>
+      </div>
     </div>
 
-
     <!-- 下载文档开始 -->
     <el-dialog
       title="生成Excel"
@@ -97,11 +103,14 @@
       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>
+        <el-button type="primary" @click="downLoadExcel" class="AllDialogBtn"
+          >确认</el-button
+        >
+        <el-button @click="downLoadExcelDig = false" class="AllDialogBtn"
+          >取消</el-button
+        >
       </span>
     </el-dialog>
     <!-- 下载文档结束-->
@@ -113,408 +122,511 @@
       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>
+        <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'
+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";
 export default {
-    components: {
-        BeUpload,
-      },
-    data() {
-        return {
-            projectFilter:[],    //项目名称列表            
-            projectName:'',      //所选名称
-            downLoadExcelDig:false,//下载Excel对话框
-            submitDataDig:false,//提交对话框
-            allFund:0,//总经费
-            fundList:[
-                {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:'',   //事由
-            tit:'',
-            ty:'',
-            value: [],
-            options: [{
-                value: '5f7a66d5-c206-11ed-a4cd-509a4c5b67cf',
-                label: '创客空间',
-                    children: []
-                }, {
-                value: '5e21b204-c206-11ed-a4cd-509a4c5b67cf',
-                label: '学生创客',
-                    children: []
-                }, {
-                value: '2',
-                label: '活动创客',
-                    children: []
-                }
-            ]
-      
-        }
-    },
-    methods:{
-        handleChange(value) {
-            // console.log(value);
+  components: {
+    BeUpload,
+  },
+  data() {
+    return {
+      projectFilter: [], //项目名称列表
+      projectName: "", //所选名称
+      downLoadExcelDig: false, //下载Excel对话框
+      submitDataDig: false, //提交对话框
+      allFund: 0, //总经费
+      fundList: [
+        {
+          fundName: "小型仪器设备费",
+          budget: "",
+          havePaid: 0,
+          thisApply: "",
+          remark: "项目开展所需的小型专用仪器设备、工具、配件购置或租赁费用。",
         },
-        getData(){         //获取活动经费的项目名称
-            let param={
-                uid:this.$store.state.userInfo.userid,
-                // type:0
-            }
-            this.ajax
-                .get(this.$store.state.api+'/SelectMakerFundSelects',param)
-                .then(res=>{
-                    // return console.log(res);
-                    let data=res.data
-                    // console.log(data);
-                    this.options[0].children=data[0]
-                    this.options[1].children=data[1]
-                    this.options[2].children=data[2]
-
-                    // console.log(data);
-                    this.projectFilter=data
-                   
-                },err=>{
-                    console.log(err);
-                })
+        {
+          fundName: "材料费",
+          budget: "",
+          havePaid: 0,
+          thisApply: "",
+          remark:
+            "项目开展需消耗的各种原材料、辅助材料等低值易耗品的采购费用。",
         },
-         
-        getFundData(){
-            // return console.log(this.value);
-            // 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,
-                // aid:this.projectName,
-                tid:this.value[0],   //分类id   
-                paid:this.value[1]    //项目和活动id
-            }
-            this.ajax
-            .get(this.$store.state.api+'/selectMarkerFundData',param)
-            .then(res=>{
-                console.log(res.data)
-                this.allFund=0
-                let data=JSON.parse(res.data[0][0]['money']);
-                // console.log(data);
-  
-                this.fundList[0].budget=data.device*1
-                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
-                // console.log(this.fundList);
-                // return
-                this.fundList.forEach(e=>{
-                    e.havePaid=0
-                })
-                // console.log(res.data[1][0]);
-                console.log(res.data[1])
-
-                if (res.data[1].length>0){
-                    // console.log(111);
-                    this.tit=res.data[1][0].intro
-                    res['data'][1].filter(e=>{
-                        if (e.actualuse==null) {
-                                e.actualuse=e.applyfund
-                        }
-                    })
-                    let arr= res['data'][1].filter(e=>{
-                        return e.actualuse!=null
-                    })
-                    if (arr) {
-                        arr.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']);
-                        })
-                    }
-                }
-                // this.ty=res.data[0][0].type
-
-                if (data.total!='') {   //因为创客空间有金额总和total学生和活动的没有所以要做到统一,把空间的total去掉
-                    data.total=0
-                }
-
-                for(let k in data){
-                    this.allFund+=data[k]*1
-                }
-                // console.log(this.allFund);
-            },err=>{
-                console.log(err);
-            })
+        {
+          fundName: "测试化验加工费",
+          budget: "",
+          havePaid: 0,
+          thisApply: "",
+          remark:
+            "项目开展过程中支付给外单位的检验、测试、化验、计算、分析及加工费等费用。",
         },
-        download(){
-            if(!this.projectName) return this.$message.error('请选择活动名称')
-            let data= this.fundList.filter(e=>{
-                return e.thisApply==''
-            })
-            if (data.length==8) return this.$message.error('请填写本次申请金额')
-            this.downLoadExcelDig=true
+        {
+          fundName: "项目协作费",
+          budget: "",
+          havePaid: 0,
+          thisApply: "",
+          remark: "按合同规定支付给协作单位的费用",
         },
-        downLoadExcel(){   //生成表单
-            getExcel(this.fundList,this.intro,this.tit,this.ty)
-            this.downLoadExcelDig=false
+        {
+          fundName: "项目成功鉴定费",
+          budget: "",
+          havePaid: 0,
+          thisApply: "",
+          remark: "学术会务费、评审费、鉴定费、成果集制作费等费用。",
         },
-        submitData(){
-            if(!this.value) return this.$message.error('请选择活动名称')
-            let data= this.fundList.filter(e=>{
-                return e.thisApply==''
-            })
-            if (data.length==8) 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); 
-            // return console.log(fund,fund2);
-            if (fund+fund2>this.allFund) return this.$message.error('申请金额已大于预算')
-            this.submitDataDig=true
+        {
+          fundName: "参展参赛费",
+          budget: "",
+          havePaid: 0,
+          thisApply: "",
+          remark:
+            "参加创客展会、竞赛等所需的报名费、展位费、布展费、宣传推广费及差旅费等费用。",
         },
-        submitAll(){           //提交创客资金申请
-             let type=0
-        //   return  console.log(this.value[1]);
-            if (this.value[0]=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf') {
-                type=0
-            }else if(this.value[0]=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'){
-                type=1
-            }else{
-                type=2
-            }
-           getFundNo("ZJ").then((result)=>{
-                let param={
-                    uid:this.$store.state.userInfo.userid,
-                    aid:this.value[1],
-                    fNo:result, //项目编号
-                    intro:this.intro,
-                    ty:type,
-                    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
-                        this.$router.push('/makerfund')
-                    }else{
-                        this.$message.error('提交失败')
-                    }
-                },err=>{
-                    console.log(err);
-                })
-            })
+        {
+          fundName: "创客交流活动费",
+          budget: "",
+          havePaid: 0,
+          thisApply: "",
+          remark:
+            "创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。",
+        },
+        {
+          fundName: "知识产权事务费",
+          budget: "",
+          havePaid: 0,
+          thisApply: "",
+          remark: "论文版面费、专利及其他知识产权事务等费用。",
+        },
+      ],
+      intro: "", //事由
+      tit: "",
+      ty: "",
+      value: [],
+      options: [
+        {
+          value: "5f7a66d5-c206-11ed-a4cd-509a4c5b67cf",
+          label: "创客空间",
+          children: [],
         },
+        {
+          value: "5e21b204-c206-11ed-a4cd-509a4c5b67cf",
+          label: "学生创客",
+          children: [],
+        },
+        {
+          value: "2",
+          label: "活动创客",
+          children: [],
+        },
+      ],
+    };
+  },
+  methods: {
+    handleChange(value) {
+      // console.log(value);
     },
-    watch:{
-        value:{
-            handler(){
-                immediate:true
-                this.getFundData()
-            }
-        }
+    getData() {
+      //获取活动经费的项目名称
+      let param = {
+        uid: this.$store.state.userInfo.userid,
+        // type:0
+      };
+      this.ajax
+        .get(this.$store.state.api + "/SelectMakerFundSelects", param)
+        .then(
+          (res) => {
+            // return console.log(res);
+            let data = res.data;
+            // console.log(data);
+            this.options[0].children = data[0];
+            this.options[1].children = data[1];
+            this.options[2].children = data[2];
+
+            // console.log(data);
+            this.projectFilter = data;
+          },
+          (err) => {
+            console.log(err);
+          }
+        );
     },
-    mounted(){
-        this.getData()
-    }
-}
-</script>
 
-<style lang="less" scoped>
-    .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;
-    }
-    .Apply1{         //顶部两个下拉框
-        height: 45px;
-        width: 50%;
-        display: flex;
-        justify-content: flex-start;
-        margin-top: 20px;
-    }
+    getFundData() {
+      // return console.log(this.value);
+      // 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,
+        // aid:this.projectName,
+        tid: this.value[0], //分类id
+        paid: this.value[1], //项目和活动id
+      };
+      this.ajax
+        .get(this.$store.state.api + "/selectMarkerFundData", param)
+        .then(
+          (res) => {
+            console.log(res.data);
+            this.allFund = 0;
+            let data = JSON.parse(res.data[0][0]["money"]);
+            // console.log(data);
 
-    // .fundType{
-    //     width: 80%;
-    //     margin-top: 30px;
-    //     :deep(.el-input__inner){
-    //         width: 200px;
-    //         &::-webkit-outer-spin-button,
-    //         &::-webkit-inner-spin-button {
-    //             -webkit-appearance: none;
-    //         }
-    //         &[type="number"]{
-    //             -moz-appearance: textfield;
-    //         }
-    //     }
-    //     :deep(.el-textarea__inner){
-    //         width: 80%;
-    //     }
-    //     .fundInp{
-    //         display: flex;
-    //         margin-bottom: 10px;
-    //     }
-        
-    // }
+            this.fundList[0].budget = data.device * 1;
+            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;
+            // console.log(this.fundList);
+            // return
+            this.fundList.forEach((e) => {
+              e.havePaid = 0;
+            });
+            // console.log(res.data[1][0]);
+            console.log(res.data[1]);
 
-    .table{ 
-        border: none;
-        border-top: solid 1px black;
-        // border-right:  solid 1px black;
-        width: 85%;
-        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: 100px;
-           
-          &:nth-child(1){
-                border-left:  solid 1px black;
+            if (res.data[1].length > 0) {
+              // console.log(111);
+              this.tit = res.data[1][0].intro;
+              res["data"][1].filter((e) => {
+                if (e.actualuse == null) {
+                  e.actualuse = e.applyfund;
+                }
+              });
+              let arr = res["data"][1].filter((e) => {
+                return e.actualuse != null;
+              });
+              if (arr) {
+                arr.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"]);
+                });
               }
-          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 ;
-            background: rgb(234, 252, 186);
-            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;
+            // this.ty=res.data[0][0].type
+
+            if (data.total != "") {
+              //因为创客空间有金额总和total学生和活动的没有所以要做到统一,把空间的total去掉
+              data.total = 0;
             }
+
+            for (let k in data) {
+              this.allFund += data[k] * 1;
+            }
+            // console.log(this.allFund);
+          },
+          (err) => {
+            console.log(err);
           }
-        }
-        
-    }
-    .textLeft{
-          :deep(.el-textarea__inner){
-            border: none ;
-            border-radius: 0px;
-            text-align: left !important;
-            font-size: 16px;
+        );
+    },
+    download() {
+      if (!this.projectName) return this.$message.error("请选择活动名称");
+      let data = this.fundList.filter((e) => {
+        return e.thisApply == "";
+      });
+      if (data.length == 8) return this.$message.error("请填写本次申请金额");
+      this.downLoadExcelDig = true;
+    },
+    downLoadExcel() {
+      //生成表单
+      getExcel(this.fundList, this.intro, this.tit, this.ty);
+      this.downLoadExcelDig = false;
+    },
+    submitData() {
+      if (!this.value) return this.$message.error("请选择活动名称");
+      let data = this.fundList.filter((e) => {
+        return e.thisApply == "";
+      });
+      if (data.length == 8) 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);
+      // return console.log(fund,fund2);
+      if (fund + fund2 > this.allFund)
+        return this.$message.error("申请金额已大于预算");
+      this.submitDataDig = true;
+    },
+    submitAll() {
+      //提交创客资金申请
+      let type = 0;
+      //   return  console.log(this.value[1]);
+      if (this.value[0] == "5f7a66d5-c206-11ed-a4cd-509a4c5b67cf") {
+        type = 0;
+      } else if (this.value[0] == "5e21b204-c206-11ed-a4cd-509a4c5b67cf") {
+        type = 1;
+      } else {
+        type = 2;
+      }
+      getFundNo("ZJ").then((result) => {
+        let param = {
+          uid: this.$store.state.userInfo.userid,
+          aid: this.value[1],
+          fNo: result, //项目编号
+          intro: this.intro,
+          ty: type,
+          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;
+              this.$router.push("/makerfund");
+            } else {
+              this.$message.error("提交失败");
+            }
+          },
+          (err) => {
+            console.log(err);
           }
-        }
+        );
+      });
+    },
+    isMoreApply(i) {
+      if (this.fundList[i].budget - this.fundList[i].havePaid < this.fundList[i].thisApply) {
+        this.$message({
+          message: "本次申请不能超过余额!",
+          type: "warning",
+        });
+        this.fundList[i].thisApply = 0
+        return
+      }
+    },
+  },
+  watch: {
+    value: {
+      handler() {
+        immediate: true;
+        this.getFundData();
+      },
+    },
+  },
+  mounted() {
+    this.getData();
+  },
+};
+</script>
 
-    .delUpload{    //文件上传
-        width: 147px;
-        margin-left: 60px;
-        margin-bottom: 62px;
-        &:hover .maskLayer{
-            display: block;
-        }
-        .maskLayer{
-            background: #000;position: absolute;left: 0;top: 0;opacity: .4; width: 100%;height: 100%;border-radius: 5px;
-            display: none;
-        }
-        .maskLayerI:hover{
-            color: #fff;
-        }
-        :deep(.avatar-uploader .el-upload) {         //文件上传
-            border: 1px dashed #d9d9d9;
-            border-radius: 6px;
-            cursor: pointer;
-            position: relative;
-            overflow: hidden;
-        }
+<style lang="less" scoped>
+.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;
+}
+.Apply1 {
+  //顶部两个下拉框
+  height: 45px;
+  width: 50%;
+  display: flex;
+  justify-content: flex-start;
+  margin-top: 20px;
+}
 
-        :deep(.avatar-uploader-icon) {
-            font-size: 28px;
-            color: #8c939d;
-            width: 178px;
-            height: 178px;
-            line-height: 178px;
-            text-align: center;
-        }
-        :deep(.avatar) {
-            width: 178px;
-            height: 178px;
-            display: block;
-        }
+// .fundType{
+//     width: 80%;
+//     margin-top: 30px;
+//     :deep(.el-input__inner){
+//         width: 200px;
+//         &::-webkit-outer-spin-button,
+//         &::-webkit-inner-spin-button {
+//             -webkit-appearance: none;
+//         }
+//         &[type="number"]{
+//             -moz-appearance: textfield;
+//         }
+//     }
+//     :deep(.el-textarea__inner){
+//         width: 80%;
+//     }
+//     .fundInp{
+//         display: flex;
+//         margin-bottom: 10px;
+//     }
+
+// }
+
+.table {
+  border: none;
+  border-top: solid 1px black;
+  // border-right:  solid 1px black;
+  width: 85%;
+  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: 100px;
 
+    &: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;
+      background: rgb(234, 252, 186);
+      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;
+  }
+}
+
+.delUpload {
+  //文件上传
+  width: 147px;
+  margin-left: 60px;
+  margin-bottom: 62px;
+  &:hover .maskLayer {
+    display: block;
+  }
+  .maskLayer {
+    background: #000;
+    position: absolute;
+    left: 0;
+    top: 0;
+    opacity: 0.4;
+    width: 100%;
+    height: 100%;
+    border-radius: 5px;
+    display: none;
+  }
+  .maskLayerI:hover {
+    color: #fff;
+  }
+  :deep(.avatar-uploader .el-upload) {
+    //文件上传
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+
+  :deep(.avatar-uploader-icon) {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+  :deep(.avatar) {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
+}
 </style>

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff