#

src/App.vue

@@ -544,7 +544,9 @@
         // margin-bottom: 60px;
         font-size: 16px !important;
         .operations{   //所有表格按钮栏
-          flex-shrink: 0;
+            display: flex;
+            justify-content: space-around;
+            flex-wrap: nowrap;
           [type='button']{
             width: 80px !important;
             font-size: 14px;
@@ -552,7 +554,7 @@
             box-sizing: border-box;
             border-radius: 5px;
             padding: 8px 0;
-            
+           
           }
         }
       }

src/views/activityManage/makerActvity.vue

@@ -168,9 +168,9 @@
                         <el-button type="primary" disabled v-show="scope.row.state>=1" class="disa" size="mini">审核</el-button>
 
                         <!-- <el-button type="primary"  @click="audi(scope.row,1)" size="mini">管理审核</el-button> -->
-                        <el-button type="primary"  v-show="scope.row.state==1" @click="audi(scope.row,1)" size="mini">管审核</el-button>
-                        <el-button type="primary" disabled v-show="scope.row.state==2" class="disa" size="mini">管审核</el-button>
-                        <el-button type="primary" disabled v-show="scope.row.state!=2 && scope.row.state!=1" class="disa" size="mini">管审核</el-button>
+                        <el-button type="primary"  v-show="scope.row.state==1" @click="audi(scope.row,1)" size="mini">审核1</el-button>
+                        <el-button type="primary" disabled v-show="scope.row.state==2" class="disa" size="mini">审核1</el-button>
+                        <el-button type="primary" disabled v-show="scope.row.state!=2 && scope.row.state!=1" class="disa" size="mini">已审核1</el-button>
 
                         
                         <!-- <el-button type="primary"  size="mini" @click="edit(scope.row.acId)">申请表</el-button> -->

src/views/fundManage/makerfund.vue

@@ -172,7 +172,7 @@
         <el-table-column
           prop="operation"
           align="center"
-          width="460"
+          width="380"
           label="操作"
           >
           <template #default="scope">
@@ -185,10 +185,10 @@
 
                 <!-- <el-button type="primary"  v-show="scope.row.state==2" class="disa" size="mini">已审核</el-button> -->
 
-                <el-button type="primary"   v-show="scope.row.state==0" class="disa" size="mini">管理审核</el-button>
-                <el-button type="primary" @click="Audit(scope.row,1)"  v-show="scope.row.state==1" size="mini">管理审核</el-button>
-                <el-button type="primary"   v-show="scope.row.state==2" class="disa" size="mini">管理审核</el-button>
-                <el-button type="primary"   v-show="scope.row.state==3" class="disa" size="mini">管理审核</el-button>
+                <el-button type="primary"   v-show="scope.row.state==0" class="disa" size="mini">审核1</el-button>
+                <el-button type="primary" @click="Audit(scope.row,1)"  v-show="scope.row.state==1" size="mini">审核1</el-button>
+                <el-button type="primary"   v-show="scope.row.state==2" class="disa" size="mini">审核1</el-button>
+                <el-button type="primary"   v-show="scope.row.state==3" class="disa" size="mini">审核1</el-button>
 
 
 

src/views/fundManage/newMarkerfundApply.vue

@@ -37,14 +37,14 @@
             <td>
                 {{item.havePaid}}
             </td>
-            <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="本次申请"
+                placeholder="请填写金额(元)"
                 v-model="item.thisApply">
                 </el-input>
             </td>
@@ -63,7 +63,7 @@
                 :autosize="{ minRows: 6, maxRows: 20}"
                 style="width: 100%;"
                 resize="none"
-                placeholder=""
+                placeholder="请输入事由"
                 v-model="intro">
                 </el-input>
             </td>
@@ -200,9 +200,6 @@ export default {
                 this.ty=res.data[0][0].type
 
 
-
-
-
                 res['data'][1].filter(e=>{
                    if (e.actualuse==null) {
                         e.actualuse=e.applyfund
@@ -213,9 +210,7 @@ export default {
                 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']);
@@ -235,7 +230,7 @@ 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==''
             })
@@ -247,7 +242,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==''
             })
@@ -333,34 +328,34 @@ 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;
         border-top: solid 1px black;
         // border-right:  solid 1px black;
-        width: 80%;
+        width: 85%;
         margin: auto;
         margin-top: 30px;
         .textLeft{
@@ -375,10 +370,10 @@ export default {
             border: none;
             border-bottom: solid 1px black;
             border-right: solid 1px black;
-          height: 50px;
-          text-align: center;
-          line-height: 30px;
-          width: 9%;
+            height: 50px;
+            text-align: center;
+            line-height: 30px;
+            width: 100px;
            
           &:nth-child(1){
                 border-left:  solid 1px black;
@@ -398,6 +393,7 @@ export default {
           }
           :deep(.el-input__inner){
             border: none ;
+            background: rgb(234, 252, 186);
             border-radius: 0px;
             text-align: center;
             font-size: 16px;

src/views/fundManage/newNomMarkerFundApply.vue

@@ -37,14 +37,14 @@
             <td>
                 {{item.havePaid}}
             </td>
-            <td>
+            <td style=" background: 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>
@@ -359,7 +359,7 @@ export default {
         border: none;
         border-top: solid 1px black;
         // border-right:  solid 1px black;
-        width: 80%;
+        width: 85%;
         margin: auto;
         margin-top: 30px;
         .textLeft{
@@ -377,7 +377,7 @@ export default {
           height: 50px;
           text-align: center;
           line-height: 30px;
-          width: 9%;
+          width: 100px;
            
           &:nth-child(1){
                 border-left:  solid 1px black;
@@ -397,6 +397,7 @@ export default {
           }
           :deep(.el-input__inner){
             border: none ;
+            background: rgb(234, 252, 186);
             border-radius: 0px;
             text-align: center;
             font-size: 16px;

src/views/projectApply/projectApplication.vue

@@ -185,7 +185,7 @@
         </el-table-column>
         <el-table-column
           prop="operation"
-          width="500"
+          width="360"
           align="center"
           label="操作"
           >
@@ -194,20 +194,18 @@
                 <!-- {{ scope.row.isupload }} -->
                         <el-button type="primary"  size="mini" @click="lookDetail(scope.row.courseId,scope.row.typeid)">查看详情</el-button>
 
-                        <el-button type="primary" v-show="scope.row.isupload==0" @click="audit(scope.row,0)"  size="mini" >审核</el-button> <!--0申请人审核 -->
-                        <el-button type="primary" v-show="scope.row.isupload==1 " class="disa" size="mini" >审核中</el-button>
+                        <el-button type="primary" v-show="scope.row.isupload==0" @click="audit(scope.row,0)">审核</el-button> <!--0申请人审核 -->
+                        <el-button type="primary" v-show="scope.row.isupload==1 " class="disa">审核中</el-button>
                         <el-button type="primary" v-show="scope.row.isupload==2"  class="disa"  size="mini">已审核</el-button>
                         <el-button type="primary" v-show="scope.row.isupload==3" class="disa" size="mini">待结项</el-button>
                         <el-button type="primary" v-show="scope.row.isupload==4" class="disa" size="mini">已结项</el-button>
 
                         
-                        <el-button  v-show="scope.row.isupload==0" type="primary" class="disa" size="mini">审核</el-button>   <!--1管理员审核 -->
+                        <el-button  v-show="scope.row.isupload==0" type="primary" class="disa" size="mini">审核1</el-button>   <!--1管理员审核 -->
                         <el-button  v-show="scope.row.isupload==1" type="primary" size="mini" @click="audit(scope.row,1)">审核1</el-button>
-                        <el-button  v-show="scope.row.isupload==2" type="primary" class="disa" size="mini">已审核</el-button>
-                        <el-button  v-show="scope.row.isupload==3" type="primary" class="disa" size="mini">待结项</el-button>
-                        <el-button  v-show="scope.row.isupload==4" type="primary" class="disa" size="mini">已结项</el-button>
-
-
+                        <el-button  v-show="scope.row.isupload==2" type="primary" class="disa" size="mini">已审核1</el-button>
+                        <el-button  v-show="scope.row.isupload==3" type="primary" class="disa" size="mini">待结项1</el-button>
+                        <el-button  v-show="scope.row.isupload==4" type="primary" class="disa" size="mini">已结项1</el-button>
 
                         <!-- <el-button type="primary"  size="mini" @click="appTable(scope.row.typeid,scope.row.courseId)" >申请表</el-button> -->
 
@@ -615,13 +613,13 @@ import studentMakerProjectPreview from '@/components/studentMakerProjectPreview.
     }
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 .projectApplication{
 
 
-  .el-table::before{
-    height: 0;
-  }
+  // .el-table::before{
+  //   height: 0;
+  // }
 
  
 }

src/views/projectManage/ProjectManagement.vue

@@ -190,7 +190,7 @@
         </el-table-column>
         <el-table-column
           prop="operation"
-          width="350"
+          width="300"
           align="center"
           label="操作"
           >

src/views/projectManage/components/ProjectManagementEndProjectFile.vue

@@ -3,10 +3,8 @@
     <div class="ProjectManagement5" v-loading="loading">
 
       <div class="pmInp">
-          <!-- <el-button type="primary" class="btn" @click="addFile" size="mini">上传文件</el-button> -->
-          <beUpload  @getFile="getFile" v-show="state==3" :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload>
-          <el-button  v-show="state==4 || state==2" style="background: #ccc !important;cursor: no-drop;color: #fff !important;border: 0;font-size: 16px;">上传文件</el-button>
-          <!-- <el-button v-show="state==1" style="background: #ccc !important;cursor: no-drop;color: #fff !important;border: 0;font-size: 16px;">上传文件</el-button> -->
+          <beUpload  @getFile="getFile" v-show="state!==4" :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload>
+          <el-button  v-show="state==4" style="background: #ccc !important;cursor: no-drop;color: #fff !important;border: 0;font-size: 16px;">上传文件</el-button>
 
         </div>
         <el-progress v-show="progress.show" :percentage="progress.value" :format="ProgressFormat"></el-progress>