yuanyiming 2 years ago
parent
commit
a0a53c69a5

+ 17 - 1
src/App.vue

@@ -200,7 +200,23 @@
   .core_dialogue::-webkit-scrollbar-corner {
     background-color: rgba(255, 255, 255, 0);
   }
-
+//   .core_dialogue::-webkit-scrollbar {
+//  /*滚动条整体样式*/
+//  width: 6px;
+// /*高宽分别对应横竖滚动条的尺寸*/
+// height: 6px;
+// }
+// /*定义滚动条轨道 内阴影+圆角*/
+// .core_dialogue::-webkit-scrollbar {
+//  border-radius: 10px;
+//  background-color: #b8bdc9;
+// }
+// /*定义滑块 内阴影+圆角*/
+// .core_dialogue::-webkit-scrollbar-thumb {
+//   border-radius: 10px;
+//   -webkit-box-shadow: inset 0 0 6px rgb(96, 125, 184);
+//   background-color: #2c5ab3;
+//   }
 
   .select{ //活动申请填写信息区域
           width: 100%;

+ 3 - 1
src/views/fundManage/makerfundApply.vue

@@ -181,7 +181,7 @@
             <div><p>附件上传</p></div>
         </div>
         <hr>
-        <div style="display: flex;width: 100%;margin-bottom: 45px;">
+        <div style="display: flex;flex-wrap: wrap;width: 100%;margin-bottom: 45px;">
 
                 <el-upload
                 action="https://jsonplaceholder.typicode.com/posts/"
@@ -515,6 +515,7 @@ export default {
     .delUpload{
         width: 147px;
         margin-left: 60px;
+        margin-bottom: 62px;
     }
     .delUploadBtnSty{
         position: absolute;
@@ -656,6 +657,7 @@ export default {
     margin-bottom: 20px;
     .howMoneyFlex{
         display: flex;
+        flex-wrap: wrap;
     }
     .howMoney{
         display: flex;

+ 3 - 1
src/views/fundManage/makerfundDetails.vue

@@ -181,7 +181,7 @@
           <div><p>附件上传</p></div>
       </div>
       <hr>
-      <div style="display: flex;width: 100%;margin-bottom: 45px;">
+      <div style="display: flex;flex-wrap: wrap;width: 100%;margin-bottom: 45px;">
 
               <el-upload
               action="https://jsonplaceholder.typicode.com/posts/"
@@ -571,6 +571,7 @@ export default {
   .delUpload{
       width: 147px;
       margin-left: 60px;
+      margin-bottom: 60px;
   }
   .delUploadBtnSty{
       position: absolute;
@@ -712,6 +713,7 @@ export default {
   margin-bottom: 20px;
   .howMoneyFlex{
       display: flex;
+      flex-wrap: wrap;
   }
   .howMoney{
       display: flex;

+ 9 - 4
src/views/projectManage/ProjectManagementFund1.vue

@@ -39,7 +39,7 @@
               :data="tableData"
               tooltip-effect="dark"
               stripe
-              class="fontSize"
+              class="fontSize core_dialogue"
               :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
               >
               <el-table-column
@@ -119,6 +119,7 @@
                 label="备注"
                 align="center"
                 width="100">
+
               </el-table-column>
             </el-table>
           <!-- 经费月支出计划结束-->
@@ -218,13 +219,13 @@
               this.ajax
                     .get(this.$store.state.api+'/GetProjectDetailMessage',param)
                     .then(res=>{
-                      console.log(res);
+                      console.log(res.data);
                       let GetData=JSON.parse(res.data[0][0].chapters)
                       // console.log(GetData);
                       // this.data=GetData
                       this.tableData=[GetData[1][0]]
                       this.tableData2=GetData[1][1]
-                      console.log(this.tableData2);
+                      // console.log(this.tableData2);
                       this.tableData2.forEach((e)=>{
                         this.useFund=this.useFund+e.fund
                       })
@@ -293,7 +294,11 @@
     }
   
   }
-
+.el-table .cell{
+        // 不换行
+        white-space:nowrap !important;
+    }
+  
 
   .newWidth{
     width: 150px;

+ 14 - 14
src/views/projectSettlement/projectSettlement.vue

@@ -10,7 +10,7 @@
       <div class="selectsBlock">
         <span class="selectLabel">项目筛选</span>
         <el-select v-model="selectInp.filter" @change="getData" placeholder="我的项目">
-          <el-option label="所有项目" :value="0"></el-option>
+          <el-option label="所有项目" value=''></el-option>
           <el-option
             v-for="item in options.projectFilter"
             :key="item.courseId"
@@ -23,13 +23,13 @@
       <div class="selectsBlock">
         <span class="selectLabel">部门</span>
         <el-select v-model="selectInp.department" @change="getData" placeholder="请选择">
-          <el-option label="所有部门" :value="0"></el-option>
+          <el-option label="所有部门" value=""></el-option>
 
           <el-option
             v-for="item in options.department"
-            :key="item.id"
+            :key="item.classid"
             :label="item.name"
-            :value="item.id">
+            :value="item.classid">
           </el-option>
         </el-select>
       </div>
@@ -37,13 +37,13 @@
       <div class="selectsBlock">
         <span class="selectLabel">分类</span>
         <el-select v-model="selectInp.sort" @change="getData" placeholder="请选择">
-          <el-option label="所有分类" :value="0"></el-option>
+          <el-option label="所有分类" value=""></el-option>
 
           <el-option
             v-for="item in options.sort"
-            :key="item.id"
+            :key="item.typeid"
             :label="item.name"
-            :value="item.id">
+            :value="item.typeid">
           </el-option>
         </el-select>
       </div>
@@ -51,7 +51,7 @@
       <div class="selectsBlock">
         <span class="selectLabel">负责人</span>
         <el-select v-model="selectInp.person" @change="getData" placeholder="请选择">
-          <el-option label="所有负责人" :value="''"></el-option>
+          <el-option label="所有负责人" value=""></el-option>
           <el-option
             v-for="(item,index) in options.person"
             :key="index"
@@ -206,7 +206,7 @@
             person:[],//负责人
             state:[//状态
               {
-                value:99,
+                value:'',
                 label:'全部'
               },
               {
@@ -231,11 +231,11 @@
           },   
           tableData:[],   //结项数据表
           selectInp:{
-            filter:0,
-            department:0,
-            sort:0,
+            filter:'',
+            department:'',
+            sort:'',
             person:'',
-            state:99,
+            state:'',
           }
         }
       },
@@ -281,7 +281,7 @@
             lim:this.table.packageSize  //限制获取几条数据
           }
           // return console.log(param);
-          // console.log(param)
+          console.log(param)
           this.ajax    
             .get(this.$store.state.api+'/SelectSettlement',param)
               .then(res=>{