资金管理ui修改

src/views/fundManage/makerfundApply.vue

@@ -44,32 +44,36 @@
     <hr>
     <div class="moneyBlock" v-for="(item,index) in directFundBlock" :key="index">          <!-- 直接经费 -->
         <div class="howMoneyFlex">
-            <div class="howMoney">
-                <div class="inpInterval">直接经费</div>
-                <el-select v-model="item.directFundData" @change="directFundDataSelectChange()" placeholder="请选择">
-                    <el-option
-                    v-for="item in item.directFundSelects"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                    </el-option>
-                </el-select>
-            </div>
-            <div class="howMoney">
-                <div class="inpInterval twoStyle">预算</div>
-                <el-input v-model="item.budget" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
-            </div>
-            <div class="howMoney">
-                <div class="inpInterval twoStyle">已支付</div>
-                <el-input v-model="item.usedFund" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
-            </div>
-            <div class="howMoney">
-                <div class="inpInterval twoStyle">本次申请</div>
-                <el-input v-model="item.apply" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
+            <div style="width: 100%;display: flex;">
+                <div class="howMoney">
+                    <div class="inpInterval">直接经费</div>
+                    <el-select v-model="item.directFundData" @change="directFundDataSelectChange()" placeholder="请选择">
+                        <el-option
+                        v-for="item in item.directFundSelects"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                    </el-select>
+                </div>
+                <div class="howMoney">
+                    <div class="inpInterval twoStyle">预算</div>
+                    <el-input v-model="item.budget" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
+                </div>
             </div>
-            <div class="howMoney">
-                <div class="inpInterval twoStyle">余额</div>
-                <el-input disabled :value="item.budget - item.usedFund -item.apply" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
+            <div style="width: 100%;display: flex;">
+                <div class="howMoney">
+                    <div class="inpInterval twoStyle">已支付</div>
+                    <el-input v-model="item.usedFund" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
+                </div>
+                <div class="howMoney">
+                    <div class="inpInterval twoStyle">本次申请</div>
+                    <el-input v-model="item.apply" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
+                </div>
+                <div class="howMoney">
+                    <div class="inpInterval twoStyle">余额</div>
+                    <el-input disabled :value="item.budget - item.usedFund -item.apply" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
+                </div>
             </div>
         </div>
         <div class="howMoney" >
@@ -83,7 +87,9 @@
             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>
+            <p><span class="delText" v-show="index!=0"  @click="delDerData(index)">删除</span></p>
+
+            <!-- <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>
@@ -97,32 +103,37 @@
     <div>                                                                                  <!-- 间接经费 -->
         <div class="moneyBlock" v-for="(item,i) in indirectFundBlock" :key="i">       
             <div class="howMoneyFlex">
-                <div class="howMoney">
-                    <div class="inpInterval">间接经费</div>
-                    <el-select v-model="item.indirectFundData" @change="indirectFundSelectChange" placeholder="请选择">
-                        <el-option
-                        v-for="item in item.indirectFundSelects"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                        </el-option>
-                    </el-select>
-                </div>
-                <div class="howMoney">
-                    <div class="inpInterval twoStyle">预算</div>
-                    <el-input v-model="item.budget" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
-                </div>
-                <div class="howMoney">
-                    <div class="inpInterval twoStyle">已支付</div>
-                    <el-input v-model="item.usedFund" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
-                </div>
-                <div class="howMoney">
-                    <div class="inpInterval twoStyle">本次申请</div>
-                    <el-input v-model="item.apply" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
+                <div style="width: 100%;display: flex;">
+                    <div class="howMoney">
+                        <div class="inpInterval">间接经费</div>
+                        <el-select v-model="item.indirectFundData" @change="indirectFundSelectChange" placeholder="请选择">
+                            <el-option
+                            v-for="item in item.indirectFundSelects"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </div>
+                    <div class="howMoney">
+                        <div class="inpInterval twoStyle">预算</div>
+                        <el-input v-model="item.budget" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
+                    </div>
                 </div>
-                <div class="howMoney">
-                    <div class="inpInterval twoStyle">余额</div>
-                    <el-input disabled :value="item.budget - item.usedFund -item.apply" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
+
+                <div style="width: 100%;display: flex;">
+                    <div class="howMoney">
+                        <div class="inpInterval twoStyle">已支付</div>
+                        <el-input v-model="item.usedFund" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
+                    </div>
+                    <div class="howMoney">
+                        <div class="inpInterval twoStyle">本次申请</div>
+                        <el-input v-model="item.apply" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
+                    </div>
+                    <div class="howMoney">
+                        <div class="inpInterval twoStyle">余额</div>
+                        <el-input disabled :value="item.budget - item.usedFund -item.apply" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
+                    </div>
                 </div>
             </div>
             <div class="howMoney">
@@ -136,7 +147,9 @@
                 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>
+                <p><span class="delText" v-show="i!=0"  @click="delInDerData(i)">删除</span></p>
+
+                <!-- <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>
@@ -1318,7 +1331,7 @@ export default {
     }
     .howMoney{
         display: flex;
-        margin-right: 10px;
+        margin-right: 40px;
         margin-bottom: 10px;
         justify-content: flex-start;
         .howMoneyInp{
@@ -1353,4 +1366,10 @@ export default {
         height: 35px;
      }
 }
+.delText{
+    margin-left: 20px;cursor: pointer;
+}
+.delText:hover{
+    color: blue;
+}
 </style>

src/views/fundManage/makerfundDetails.vue

@@ -45,32 +45,37 @@
     <hr>
     <div class="moneyBlock" v-for="(item,index) in directFundBlock" :key="index">          <!-- 直接经费 -->
         <div class="howMoneyFlex">
-            <div class="howMoney">
-                <div class="inpInterval">直接经费</div>
-                <el-select v-model="item.directFundData" @change="directFundDataSelectChange()" placeholder="请选择">
-                    <el-option
-                    v-for="item in item.directFundSelects"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                    </el-option>
-                </el-select>
-            </div>
-            <div class="howMoney">
-                <div class="inpInterval twoStyle">预算</div>
-                <el-input v-model="item.budget" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
-            </div>
-            <div class="howMoney">
-                <div class="inpInterval twoStyle">已支付</div>
-                <el-input v-model="item.usedFund" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
-            </div>
-            <div class="howMoney">
-                <div class="inpInterval twoStyle">本次申请</div>
-                <el-input v-model="item.apply" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
+            <div style="width: 100%;display: flex;">
+                <div class="howMoney">
+                    <div class="inpInterval">直接经费</div>
+                    <el-select v-model="item.directFundData" @change="directFundDataSelectChange()" placeholder="请选择">
+                        <el-option
+                        v-for="item in item.directFundSelects"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                    </el-select>
+                </div>
+                <div class="howMoney">
+                    <div class="inpInterval">预算</div>
+                    <el-input v-model="item.budget" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
+                </div>
             </div>
-            <div class="howMoney">
-                <div class="inpInterval twoStyle">余额</div>
-                <el-input disabled :value="item.budget - item.usedFund -item.apply" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
+
+            <div style="width: 100%;display: flex;">
+                <div class="howMoney">
+                    <div class="inpInterval ">已支付</div>
+                    <el-input v-model="item.usedFund" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
+                </div>
+                <div class="howMoney">
+                    <div class="inpInterval ">本次申请</div>
+                    <el-input v-model="item.apply" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
+                </div>
+                <div class="howMoney">
+                    <div class="inpInterval ">余额</div>
+                    <el-input disabled :value="item.budget - item.usedFund -item.apply" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
+                </div>
             </div>
         </div>
         <div class="howMoney" >
@@ -84,7 +89,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>
+            <p><span class="delText" v-show="index!=0"  @click="delDerData(index)">删除</span></p>
+            <!-- <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>
@@ -98,32 +104,37 @@
     <div>                                                                                  <!-- 间接经费 -->
         <div class="moneyBlock" v-for="(item,i) in indirectFundBlock" :key="i">       
             <div class="howMoneyFlex">
-                <div class="howMoney">
-                    <div class="inpInterval">间接经费</div>
-                    <el-select v-model="item.indirectFundData" @change="indirectFundSelectChange" placeholder="请选择">
-                        <el-option
-                        v-for="item in item.indirectFundSelects"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                        </el-option>
-                    </el-select>
-                </div>
-                <div class="howMoney">
-                    <div class="inpInterval twoStyle">预算</div>
-                    <el-input v-model="item.budget" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
-                </div>
-                <div class="howMoney">
-                    <div class="inpInterval twoStyle">已支付</div>
-                    <el-input v-model="item.usedFund" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
-                </div>
-                <div class="howMoney">
-                    <div class="inpInterval twoStyle">本次申请</div>
-                    <el-input v-model="item.apply" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
+                <div style="width: 100%;display: flex;">
+                    <div class="howMoney">
+                        <div class="inpInterval">间接经费</div>
+                        <el-select v-model="item.indirectFundData" @change="indirectFundSelectChange" placeholder="请选择">
+                            <el-option
+                            v-for="item in item.indirectFundSelects"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </div>
+                    <div class="howMoney">
+                        <div class="inpInterval ">预算</div>
+                        <el-input v-model="item.budget" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
+                    </div>
                 </div>
-                <div class="howMoney">
-                    <div class="inpInterval twoStyle">余额</div>
-                    <el-input disabled :value="item.budget - item.usedFund -item.apply" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
+
+                <div style="width: 100%;display: flex;">
+                    <div class="howMoney">
+                        <div class="inpInterval ">已支付</div>
+                        <el-input v-model="item.usedFund" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
+                    </div>
+                    <div class="howMoney">
+                        <div class="inpInterval ">本次申请</div>
+                        <el-input v-model="item.apply" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
+                    </div>
+                    <div class="howMoney">
+                        <div class="inpInterval ">余额</div>
+                        <el-input disabled :value="item.budget - item.usedFund -item.apply" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
+                    </div>
                 </div>
             </div>
             <div class="howMoney">
@@ -137,7 +148,9 @@
                 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>
+                <p><span  class="delText" v-show="i!=0"  @click="delInDerData(i)">删除</span></p>
+
+                <!-- <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>
     </div>
@@ -156,15 +169,15 @@
                 <el-input v-model="residue.elseReason" placeholder="请输入内容"></el-input>
             </div>
             <div class="howMoney">
-                <div class="inpInterval twoStyle">预算</div>
+                <div class="inpInterval ">预算</div>
                 <el-input v-model="residue.budget" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
             </div>
             <div class="howMoney">
-                <div class="inpInterval twoStyle">已支付</div>
+                <div class="inpInterval ">已支付</div>
                 <el-input v-model="residue.usedFund" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
             </div>
             <div class="howMoney">
-                <div class="inpInterval twoStyle">余额</div>
+                <div class="inpInterval ">余额</div>
                 <el-input disabled :value="residue.budget - residue.usedFund" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
             </div>
         </div> -->
@@ -755,7 +768,7 @@ export default {
           this.ajax
               .get(this.$store.state.api+'/SelectMakerFundSelects',param)
               .then(res=>{
-                //   return console.log(res.data);
+                // console.log(res.data);
                   let data=res.data;
                   this.directFundBlock=JSON.parse(data[0][0].directFund);
                 //   console.log(this.directFundBlock);
@@ -766,7 +779,7 @@ export default {
                   this.selects.projectType=data[0][0].type;
                   this.status=data[0][0].state;
                   this.fid=data[0][0].fid;
-                  this.projectFilter=data[1];
+                //   this.projectFilter=data[1];
               },err=>{
                   console.log(err);
               })
@@ -1059,13 +1072,13 @@ export default {
         getData(){     
             let param={
                 uid:this.$store.state.userInfo.userid,
-                fid:''
             }
             this.ajax
-                .get(this.$store.state.api+'/SelectMakerFundSelects',param)
+                // .get(this.$store.state.api+'/SelectMakerFundSelects',param)
+                .get(this.$store.state.api+'/SelectMakerFundDetailSelects',param)
                 .then(res=>{
-                    // console.log(res.data);
-                    this.projectFilter=res.data[1]
+                    // console.log(res.data[0]);
+                    this.projectFilter=res.data[0]
                 },err=>{
                     console.log(err);
                 })
@@ -1403,7 +1416,7 @@ export default {
     }
     .howMoney{
         display: flex;
-        margin-right: 10px;
+        margin-right: 40px;
         margin-bottom: 10px;
         justify-content: flex-start;
         .howMoneyInp{
@@ -1438,4 +1451,10 @@ export default {
         height: 35px;
      }
 }
+.delText{
+    margin-left: 20px;cursor: pointer;
+}
+.delText:hover{
+    color: blue;
+}
 </style>

src/views/projectApply/projectApplicationApply3.vue

@@ -50,6 +50,7 @@
                 :prop="item.prop"
                 :label="item.label"
                 align="center"
+                min-width="8%"
                 >
               </el-table-column>
             </el-table>
@@ -308,7 +309,7 @@
 
               </div>
             </div>
-            <div class="littleBlock">
+            <div class="littleBlock" style="width: 80%;">
               <div class="dialogLabel" style="position: relative;top: -20px;">备注</div>
               <div style="width: 86%;">
                 <!-- <el-input type="textarea" :row="6" resize="none" v-model="data.items.remark" style="width: 100%;"></el-input> -->
@@ -358,7 +359,7 @@ import { VueEditor } from "vue2-editor";
           iid:'',
           delFundDetail:false,   //删除经费明细对话框
           addFundDialog:false,       //经费明细对话框
-          setFund:true,         //设置月支出计划
+          setFund:false,         //设置月支出计划
           recompose:0,             //判断是否是修改  0 修改  1 添加
           projectFundDetailInput:{
                 fund:'',
@@ -625,8 +626,8 @@ import { VueEditor } from "vue2-editor";
           align-items: center;
           margin-top: 30px;
           box-sizing: border-box;
-          padding-right: 20px;
-          // margin-left: 40px;
+          padding-right: 10%;
+          padding-left: 10%;
         }
         
         .el-dialog__header{
@@ -642,22 +643,25 @@ import { VueEditor } from "vue2-editor";
         .littleBlock{   //添加对话框 label和input框
             display: flex;
             margin-top: 20px;
-            
+            box-sizing: border-box;
+            padding: 0 5%;
             flex-shrink: 0;
-            width: 35%;
+            width: 40%;
             display: flex;
             justify-content: flex-end;
             .littleBlockInp{
               position: relative;
+              box-sizing: border-box;
+              padding-right: 30px;
               .yuan{
                 position: absolute;
                 top: 7px;
-                right: -30px;
+                right: 0px;
                 font-size: 16px;
               }
             }
             .dialogLabel{     //label
-              min-width: 50px;
+              min-width: 55px;
               font-size: 16px;
               margin-right: 10px;
               display: inline-block;