Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/ssti-CollegeManage

src/views/fundManage/makerfund.vue

@@ -483,11 +483,11 @@
               page:this.table.currentPage,
               lim:this.table.packageSize
             }
-            console.log(param);
+            // console.log(param);
             this.ajax
                 .get(this.$store.state.api+'/SelectMakerFund',param)
                 .then(res=>{
-                  console.log(res.data[0]);
+                  // console.log(res.data[0]);
                   let data=res.data;
                   this.tableData=data[0];
                   this.filterSelects=data[1];

src/views/fundManage/makerfundApply.vue

@@ -57,15 +57,15 @@
             </div>
             <div class="howMoney">
                 <div class="inpInterval twoStyle">预算</div>
-                <el-input v-model="item.budget" class="howMoneyInp" placeholder="金额"></el-input>
+                <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" class="howMoneyInp" placeholder="金额"></el-input>
+                <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.remainFund" class="howMoneyInp" placeholder="金额"></el-input>
+                <el-input v-model="item.remainFund" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
             </div>
         </div>
         <div class="howMoney" style="margin-top:20px">
@@ -88,8 +88,6 @@
     </div>
 
 
-
-
     <div>                                                                                  <!-- 间接经费 -->
         <div class="moneyBlock" v-for="(item,i) in indirectFundBlock" :key="i">       
             <div class="howMoneyFlex">
@@ -106,16 +104,16 @@
                 </div>
                 <div class="howMoney">
                     <div class="inpInterval twoStyle">预算</div>
-                    <el-input v-model="item.budget" class="howMoneyInp" placeholder="金额"></el-input>
+                    <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" class="howMoneyInp" placeholder="金额"></el-input>
+                    <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.remainFund" class="howMoneyInp" placeholder="金额"></el-input>
+                    <el-input v-model="item.remainFund" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
 
                 </div>
             </div>
@@ -150,15 +148,15 @@
             </div>
             <div class="howMoney">
                 <div class="inpInterval twoStyle">预算</div>
-                <el-input v-model="residue.budget" class="howMoneyInp" placeholder="金额"></el-input>
+                <el-input v-model="residue.budget" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
             </div>
             <div class="howMoney">
                 <div class="inpInterval twoStyle">已支付</div>
-                <el-input v-model="residue.usedFund" class="howMoneyInp" placeholder="金额"></el-input>
+                <el-input v-model="residue.usedFund" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
             </div>
             <div class="howMoney">
                 <div class="inpInterval twoStyle">余额</div>
-                <el-input v-model="residue.remainFund" class="howMoneyInp" placeholder="金额"></el-input>
+                <el-input v-model="residue.remainFund" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
             </div>
         </div>
         <div class="howMoney" style="margin-top:20px">
@@ -417,13 +415,22 @@ export default {
             let dirSum = this.directFundBlock.reduce((per,cur)=>{
                 return per*1+cur.budget*1
             },0)
-            console.log(dirSum);
             let indirSum =this.indirectFundBlock.reduce((per,cur)=>{
                 return per*1+cur.budget*1
-            })
-            console.log(indirSum);
-            return
-            // return
+            },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
+            },0)
+            let usedIndirSum =this.indirectFundBlock.reduce((per,cur)=>{
+                return per*1+cur.usedFund*1
+            },0)
+            let usedAllSum=usedDirSum+usedIndirSum+this.residue.usedFund*1
+            // console.log(usedAllSum);
+
+
             let param={
                 uid:this.$store.state.userInfo.userid,
                 cid:this.selects.projectName,
@@ -431,7 +438,9 @@ export default {
                 dir:JSON.stringify(this.directFundBlock),
                 indir:JSON.stringify(this.indirectFundBlock),
                 elseFund:JSON.stringify(this.residue),
-                file:JSON.stringify(this.file)
+                file:JSON.stringify(this.file),
+                AllSum:allSum,
+                usedSum:usedAllSum
             }
             this.ajax
                 .post(this.$store.state.api+'/insertMakerFund',param)
@@ -462,18 +471,21 @@ export default {
                     console.log(err);
                 })
         },
-        addDirectFund(){
+        addDirectFund(){           //添加直接经费
             let oldArr={};
             Object.assign(oldArr,this.newDirectFundBlock)
             this.directFundBlock.push(oldArr)
             for(let k in this.newDirectFundBlock) return this.newDirectFundBlock[k]=''
         },
-        addIndirectFund(){
-            this.indirectFundBlock.push(this.newIndirectFundBlock)
+        addIndirectFund(){         //添加间接经费
+            // this.indirectFundBlock.push(this.newIndirectFundBlock)
+            let oldArr={};
+            Object.assign(oldArr,this.newIndirectFundBlock)
+            this.indirectFundBlock.push(oldArr)
+            for(let k in this.newIndirectFundBlock) return this.newIndirectFundBlock[k]=''
         },
         init(){
                 //重置
-                // this.projectApplicationApply1.addMemberDialog=false
                 this.submitHint=false;
                 
         },

src/views/projectApply/projectApplication.vue

@@ -437,11 +437,11 @@
             lim:this.table.packageSize  //限制获取几条数据
           }
           // return console.log(param);
-          console.log(param)
+          // console.log(param)
           this.ajax    
             .get(this.$store.state.api+'/SelectAllProject',param)
               .then(res=>{
-                console.log(res.data);
+                // console.log(res.data);
                 let data=res.data;
                 let a=this.options;
                 this.tableData=data[0];

src/views/projectManage/ProjectManagement.vue

@@ -233,9 +233,9 @@ import beUpload from '../../components/tool/beUpload'
           this.file = this.file.filter(item=>item.url!=url);
         },
         getFile(val) {//上传文件
-          console.log(val);
+          // console.log(val);
           this.file.push(val);
-          console.log(this.file);
+          // console.log(this.file);
         },
         ending(){   //完结提交
           if(this.file=="")return this.$message.error("请上传完结报告");
@@ -245,7 +245,7 @@ import beUpload from '../../components/tool/beUpload'
             file:JSON.stringify(this.file),
             num:1
           }).then(res=>{
-            console.log(res);
+            // console.log(res);
             if(res.data==1){
               this.$message.success("结项成功");
               this.endDialog = false;
@@ -298,7 +298,7 @@ import beUpload from '../../components/tool/beUpload'
               .then(res=>{
                 // console.log(res);
                 let data=res.data;
-                console.log(data);
+                // console.log(data);
                 let a=this.options;
                 this.items=data[0];
                 // console.log(this.items);

src/views/projectManage/ProjectManagement1.vue

@@ -182,7 +182,7 @@
             this.ajax
                   .get(this.$store.state.api+'/GetProjectBase',param)
                   .then(res=>{
-                    console.log(res);
+                    // console.log(res);
                     let data=res.data[0][0]
                     this.select.project=data.title;
                     this.select.Fund=data.money;