yuanyiming 2 anni fa
parent
commit
3d0bedaee7

+ 5 - 5
src/views/fundManage/makerfundApply.vue

@@ -71,7 +71,6 @@
                 <div class="inpInterval twoStyle">余额</div>
                 <el-input disabled :value="item.budget - item.usedFund -item.apply" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
             </div>
-            <el-button v-show="index!=0" type="primary" style="font-size: 16px;height: 40px;line-height: 0;" @click="delDerData(index)">删除</el-button>
         </div>
         <div class="howMoney" >
             <div class="inpInterval" style="position: relative;top:-20px">事由</div>
@@ -84,6 +83,8 @@
             placeholder="请输入内容"
             v-model="item.reason">
             </el-input>
+            <el-button v-show="index!=0" type="primary" style="font-size: 16px;height: 40px;margin-left: 10px; line-height: 0;" @click="delDerData(index)">删除</el-button>
+
         </div>
     </div>
     <div>
@@ -123,10 +124,9 @@
                     <div class="inpInterval twoStyle">余额</div>
                     <el-input disabled :value="item.budget - item.usedFund -item.apply" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
                 </div>
-                <el-button v-show="i!=0" type="primary" style="font-size: 16px;height: 40px;line-height: 0;" @click="delInDerData(i)">删除</el-button>
             </div>
             <div class="howMoney">
-                <div class="inpInterval" style="position: relative;top:-20px">事由</div>
+                <div class="inpInterval" style="position: relative;top:-20px">事由</div> 
                 <el-input
                 type="textarea"
                 :rows="3"
@@ -136,6 +136,7 @@
                 placeholder="请输入内容"
                 v-model="item.reason">
                 </el-input>
+                <el-button v-show="i!=0" type="primary" style="font-size: 16px;height: 40px;line-height: 0;margin-left: 10px;" @click="delInDerData(i)">删除</el-button>
             </div>
            
         </div>
@@ -925,7 +926,6 @@ export default {
                 return per*1+cur.budget*1
             },0)
             let allSum=dirSum+indirSum+this.residue.budget*1
-            // console.log(allSum);
 
             let usedDirSum = this.directFundBlock.reduce((per,cur)=>{
                 return per*1+cur.usedFund*1
@@ -934,7 +934,6 @@ export default {
                 return per*1+cur.usedFund*1
             },0)
             let usedAllSum=usedDirSum+usedIndirSum+this.residue.usedFund*1
-            // console.log(usedAllSum);
 
 
             let param={
@@ -1315,6 +1314,7 @@ export default {
         display: flex;
         margin-right: 10px;
         margin-bottom: 10px;
+        justify-content: flex-start;
         .howMoneyInp{
             .el-input__inner{
                 width: 170px;

+ 4 - 1
src/views/resultShow/resultsShow.vue

@@ -257,11 +257,14 @@
         margin-top: 5px;
 
         .classBlock2{   //项目名称
-          margin-left: 5px;
+              margin-left: 5px;
               margin-bottom: 4px;
               margin-top: 4px;
               text-align: left;
               font-size: 18px;
+              white-space: nowrap;
+              overflow: hidden;
+              text-overflow: ellipsis;
         }
         .classBlock3{   //名字、学院