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

src/views/fundManage/makerfund.vue

@@ -415,11 +415,14 @@
       methods:{
         Audit(val,num){          //显示审核对话框
           // console.log(val);
+          if(num==0){
+            if (val.actualuse==0){
+              this.$router.push(`/makerfundDetails?Id=${val.fid}&tit=${val.title}&aid=${val.acId}`)
+              return this.$message.error('请填写实际使用金额')
+            } 
+          }
           // return 
-          if (val.actualuse==0){
-            this.$router.push(`/makerfundDetails?Id=${val.fid}&tit=${val.title}&aid=${val.acId}`)
-            return this.$message.error('请填写实际使用金额')
-          } 
+          
           this.isManager=num
           this.ProjectFundData=val;
           this.dialogVisible=true;

src/views/fundManage/makerfundDetails.vue

@@ -85,8 +85,8 @@
     <div class="baseBtn">
         <div class="blockWidth">
             <el-button type="primary" @click="download">生成表单</el-button>
-            <el-button type="primary" v-if="!state" @click="submitData">提交</el-button>
-            <el-button type="primary" v-if="state>0" class="disa">提交</el-button>
+            <el-button type="primary" v-if="!state&& $store.state.userInfo.type!=0" @click="submitData">提交</el-button>
+            <el-button type="primary" v-if="state>0&& $store.state.userInfo.type!=0" class="disa">提交</el-button>
         </div>
     </div>
 
@@ -299,7 +299,8 @@ export default {
             let fund2=arr2.reduce((prev,cur,index,arr) => {
                 return prev + cur*1;
             },0); 
-            console.log(fund,fund2);
+            // console.log(fund,fund2);
+            if (fund==0) return this.$message.error('请输入实际使用金额')
             if (fund+fund2>this.allFund) return this.$message.error('申请金额已大于预算')
             this.submitDataDig=true
         },