3

src/views/fundManage/newNomMarkerFundApply.vue

@@ -1,12 +1,12 @@
 <template>
     <!-- 创客资金申请表单 -->
   <div>
-    <div class="pAHeader">
-        <div class="pAHeader1">个人创客资金申请</div>
-      </div>
     <!-- <div class="vfpHeader">
-        <div class="titleOne">个人创客资金申请</div>
+        <div class="titleOne">创客活动资金申请</div>
     </div> -->
+    <div class="pAHeader">
+        <div class="pAHeader1">创客活动资金申请</div>
+      </div>
     <hr>
     <!-- 项目名称、类型开始 -->
     <div class="Apply1">
@@ -40,14 +40,14 @@
             <td>
                 {{item.havePaid}}
             </td>
-            <td style=" background: rgb(234, 252, 186);">
+            <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="请输入金额(元)"
+                placeholder="请填写金额(元)"
                 v-model="item.thisApply">
                 </el-input>
             </td>
@@ -66,7 +66,7 @@
                 :autosize="{ minRows: 6, maxRows: 20}"
                 style="width: 100%;"
                 resize="none"
-                placeholder=""
+                placeholder="请输入事由"
                 v-model="intro">
                 </el-input>
             </td>
@@ -152,7 +152,7 @@ export default {
         }
     },
     methods:{
-        getData(){         //获取活动经费的项目名称 
+        getData(){         //获取活动经费的项目名称
             let param={
                 uid:this.$store.state.userInfo.userid,
                 type:1
@@ -203,6 +203,9 @@ export default {
                 this.ty=res.data[0][0].type
 
 
+                this.fundList.forEach(e=>{
+                    e.havePaid=0
+                })
 
 
                 res['data'][1].filter(e=>{
@@ -210,13 +213,12 @@ export default {
                         e.actualuse=e.applyfund
                    }
                 })
-                let arr= res['data'][0].filter(e=>{
+                // console.log(arr);
+
+                let arr= res['data'][1].filter(e=>{
                     return e.actualuse!=null
                 })
-
-                // let isUse = arr;
                 if (arr) {
-                    // console.log(111);
                     arr.forEach(item=>{
                     let JP = JSON.parse(item['actualuse']);
                         this.fundList[0]['havePaid']+=Number(JP['device']);
@@ -236,12 +238,11 @@ export default {
             })
         },
         download(){
-            if(!this.projectName) return this.$message.error('请选择项目名称')
+            if(!this.projectName) return this.$message.error('请选择活动名称')
             let data= this.fundList.filter(e=>{
                 return e.thisApply==''
             })
             if (data.length==8) return this.$message.error('请填写本次申请金额')
-            // return console.log(data);
             this.downLoadExcelDig=true
         },
         downLoadExcel(){   //生成表单
@@ -249,7 +250,7 @@ export default {
             this.downLoadExcelDig=false
         },
         submitData(){
-            if(!this.projectName) return this.$message.error('请选择项目名称')
+            if(!this.projectName) return this.$message.error('请选择活动名称')
             let data= this.fundList.filter(e=>{
                 return e.thisApply==''
             })
@@ -335,28 +336,28 @@ export default {
         margin-top: 20px;
     }
 
-    .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;
-        }
+    // .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;
@@ -377,10 +378,10 @@ export default {
             border: none;
             border-bottom: solid 1px black;
             border-right: solid 1px black;
-          height: 50px;
-          text-align: center;
-          line-height: 30px;
-          width: 100px;
+            height: 50px;
+            text-align: center;
+            line-height: 30px;
+            width: 100px;
            
           &:nth-child(1){
                 border-left:  solid 1px black;