第七周星期4样式修改

src/views/fundManage/makerfundApply.vue

@@ -69,7 +69,7 @@
             </div>
             <el-button v-show="index!=0" type="primary" style="font-size: 16px;" @click="delDerData(index)">删除</el-button>
         </div>
-        <div class="howMoney" style="margin-top:20px">
+        <div class="howMoney" >
             <div class="inpInterval" style="position: relative;top:-20px">事由</div>
             <el-input
             type="textarea"
@@ -118,7 +118,7 @@
                 </div>
                 <el-button v-show="i!=0" type="primary" style="font-size: 16px;" @click="delInDerData(i)">删除</el-button>
             </div>
-            <div class="howMoney" style="margin-top:20px">
+            <div class="howMoney">
                 <div class="inpInterval" style="position: relative;top:-20px">事由</div>
                 <el-input
                 type="textarea"
@@ -160,7 +160,7 @@
                 <el-input disabled :value="residue.budget - residue.usedFund" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
             </div>
         </div>
-        <div class="howMoney" style="margin-top:20px">
+        <div class="howMoney">
             <div class="inpInterval" style="position: relative;top:-20px">备注</div>
             <el-input
             type="textarea"
@@ -181,15 +181,16 @@
             <div><p>附件上传</p></div>
         </div>
         <hr>
-        <div style="display: flex;flex-wrap: wrap;width: 100%;margin-bottom: 45px;">
+        <el-progress v-show="progress.show" :percentage="progress.value" :format="ProgressFormat"></el-progress>
 
+        <div style="display: flex;flex-wrap: wrap;width: 100%;margin-bottom: 45px;">
                 <el-upload
                 action="https://jsonplaceholder.typicode.com/posts/"
                 list-type="picture-card"
                 style="position: relative;margin-left: 10px;"
                 disabled
                 :on-remove="handleRemove">
-                <BeUpload @getFile="getFile" style="position: absolute;left: 0;width: 147px;height: 100%;opacity: 0;" class="uploadPic" :navName="'上传封面'" :accept="accept"></BeUpload>
+                <BeUpload @getFile="getFile" :progress="progress" style="position: absolute;left: 0;width: 147px;height: 100%;opacity: 0;" class="uploadPic" :navName="'上传封面'" :accept="accept"></BeUpload>
                 <i class="el-icon-plus"></i>
                 </el-upload>
 
@@ -257,6 +258,10 @@ export default {
                 projectName:'',
                 projectType:''
             },
+            progress:{   //进度条
+                value:0,
+                show:false
+            },  
             projectFilter:[],    //项目名称
             projectType:[     //项目类型
                 {
@@ -399,6 +404,9 @@ export default {
         }
     },
     methods:{
+        ProgressFormat(value){        //进度条
+          return value ==100?'100%':`${value}%`
+        },
         delInDerData(index){                       //删除间接经费
             this.indirectFundBlock.splice(index,1)
         },
@@ -466,8 +474,8 @@ export default {
                 })
         },
         getFile(val) {       //上传封面
-            console.log(val);
             this.file.push(val)
+            this.progress.show = false;
             // this.imageUrl=require("../../assets/img/jj.jpg")
         },
         getData(){
@@ -659,6 +667,7 @@ export default {
     .howMoney{
         display: flex;
         margin-right: 10px;
+        margin-bottom: 10px;
         .howMoneyInp{
             .el-input__inner{
                 width: 170px;

src/views/fundManage/makerfundDetails.vue

@@ -69,7 +69,7 @@
           </div>
           <el-button v-show="index!=0" type="primary" style="font-size: 16px;" @click="delDerData(index)">删除</el-button>
       </div>
-      <div class="howMoney" style="margin-top:20px">
+      <div class="howMoney">
           <div class="inpInterval" style="position: relative;top:-20px">事由</div>
           <el-input
           type="textarea"
@@ -118,7 +118,7 @@
               </div>
               <el-button v-show="i!=0" type="primary" style="font-size: 16px;" @click="delInDerData(i)">删除</el-button>
           </div>
-          <div class="howMoney" style="margin-top:20px">
+          <div class="howMoney">
               <div class="inpInterval" style="position: relative;top:-20px">事由</div>
               <el-input
               type="textarea"
@@ -160,7 +160,7 @@
               <el-input disabled :value="residue.budget - residue.usedFund" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
           </div>
       </div>
-      <div class="howMoney" style="margin-top:20px">
+      <div class="howMoney">
           <div class="inpInterval" style="position: relative;top:-20px">备注</div>
           <el-input
           type="textarea"
@@ -181,6 +181,8 @@
           <div><p>附件上传</p></div>
       </div>
       <hr>
+      <el-progress v-show="progress.show" :percentage="progress.value" :format="ProgressFormat"></el-progress>
+
       <div style="display: flex;flex-wrap: wrap;width: 100%;margin-bottom: 45px;">
 
               <el-upload
@@ -189,7 +191,7 @@
               style="position: relative;margin-left: 10px;"
               disabled
               :on-remove="handleRemove">
-              <BeUpload @getFile="getFile" style="position: absolute;left: 0;width: 147px;height: 100%;opacity: 0;" class="uploadPic" :navName="'上传封面'" :accept="accept"></BeUpload>
+              <BeUpload @getFile="getFile" :progress="progress" style="position: absolute;left: 0;width: 147px;height: 100%;opacity: 0;" class="uploadPic" :navName="'上传封面'" :accept="accept"></BeUpload>
               <i class="el-icon-plus"></i>
               </el-upload>
 
@@ -280,6 +282,10 @@ export default {
               projectName:'',
               projectType:''
           },
+          progress:{     //进度条
+            value:0,
+            show:false
+          },
           projectFilter:[],    //项目名称
           projectType:[     //项目类型
               {
@@ -423,6 +429,9 @@ export default {
   },
 
   methods:{
+    ProgressFormat(value){        //进度条
+          return value ==100?'100%':`${value}%`
+        },
     endDialogShow(){    //审核对话框显示
         this.auditDialog=true
     },
@@ -512,8 +521,9 @@ export default {
               })
       },
       getFile(val) {       //上传封面
-          console.log(val);
           this.file.push(val)
+          this.$message.success('更改成功')
+          this.progress.show = false;
       },
       getData(){
           let param={
@@ -716,6 +726,7 @@ export default {
   .howMoney{
       display: flex;
       margin-right: 10px;
+      margin-bottom: 10px;
       .howMoneyInp{
           .el-input__inner{
               width: 170px;

src/views/projectApply/projectApplication.vue

@@ -120,7 +120,7 @@
           prop="time"
           align="center"
           label="开始时间"
-          min-width="10%">
+          min-width="11%">
         </el-table-column>
         <el-table-column
           prop="phone"

src/views/projectApply/projectApplicationApply.vue

@@ -277,6 +277,7 @@
         getFile(val) {       //上传封面
             console.log(val);
             this.data.dialogImageUrl=val.url
+            this.$message.success('封面上传成功')
         },
         // submitUpload() {
         //   this.$refs.upload.submit();

src/views/projectApply/projectApplicationApplyMain.vue

@@ -247,10 +247,12 @@
                 this.ajax
                       .post(this.$store.state.api+'/CreateProject',param)
                       .then(res=>{
-                        // console.log(res)
+                        console.log(res)
                         if(res.data==1){
                           this.$message.success("创建成功")
                           this.$router.push('projectApplication')
+                        }else{
+                          this.$message.error("创建失败")
                         }
                       },err=>{
                         console.log(err);

src/views/projectManage/ProjectManagement.vue

@@ -115,8 +115,8 @@
               
               <!-- <el-button type="primary" v-show="item.isupload==1" class="bt1" size="mini"  @click="finish(item.courseId,item.title)">结项</el-button> -->
 
-              <el-button type="primary" v-show="item.isupload==1 && item.endFile==null" class="bt1" size="mini"  @click="finish(item.courseId,item.title)">结项</el-button>
-              <el-button type="primary" v-show="item.isupload==1 && item.endFile!=null" class="bt1" size="mini"  @click="finish(item.courseId,item.title)">修改结项</el-button>
+              <el-button type="primary" v-show="item.isupload==1 && (item.endFile==null)" class="bt1" size="mini"  @click="finish(item.courseId,item.title)">结项</el-button>
+              <el-button type="primary" v-show="item.isupload==1 && (item.endFile!=null)" class="bt1" size="mini"  @click="finish(item.courseId,item.title)">修改结项</el-button>
               <el-button type="primary" v-show="item.isupload==2" class="bt1" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;"   size="mini">已结项</el-button>
                           
             </div>
@@ -142,11 +142,11 @@
               <el-button type="primary" @click="checkDelFile(item.url)" size="mini">删除文件</el-button>
             </div>
         </div>
-
+        <el-progress v-show="progress.show" :percentage="progress.value" :format="ProgressFormat"></el-progress>
       <div class="addMoneyBtn" style="margin-left: 0;">
           <div class="jia">+</div>添加
           <div id="upFile">
-            <beUpload @getFile="getFile" :navName="'上传文件'" :accept="accept"> </beUpload>
+            <beUpload @getFile="getFile" :navName="'上传文件'" :accept="accept" :progress="progress"> </beUpload>
           </div>
       </div>
       <div slot="footer" class="dialog-footer">
@@ -209,7 +209,11 @@ import beUpload from '../../components/tool/beUpload'
             total:0,
             packageSize:8,
             currentPage:1
-          },   
+          }, 
+          progress:{     //进度条
+            value:0,
+            show:false
+          },  
           DelFileData:{
             fid:"",
             fileName:"",
@@ -251,13 +255,17 @@ import beUpload from '../../components/tool/beUpload'
         }
       },
       methods:{
-
+        ProgressFormat(value){        //进度条
+          return value ==100?'100%':`${value}%`
+        },
         checkDelFile(url){   //删除文件
           this.file = this.file.filter(item=>item.url!=url);
         },
         getFile(val) {//上传文件
           // console.log(val);
           this.file.push(val);
+          this.progress.show = false;
+
           // console.log(this.file);
         },
         ending(){   //完结提交
@@ -272,6 +280,7 @@ import beUpload from '../../components/tool/beUpload'
             if(res.data==1){
               this.$message.success("结项成功");
               this.endDialog = false;
+              this.progress.show = false;
 
             }else{
               this.$message.error("结项失败")

src/views/projectManage/ProjectManagement4.vue

@@ -19,9 +19,11 @@
       <!-- 跳转导航结束 -->
       <div class="pmInp">
           <!-- <el-button type="primary" class="btn"  size="mini">上传文件</el-button> -->
-          <beUpload @getFile="getFile"  :navName="'上传文件'" :accept="accept"></beUpload>
+          <beUpload @getFile="getFile"  :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload>
 
         </div>
+        <el-progress v-show="progress.show" :percentage="progress.value" :format="ProgressFormat"></el-progress>
+
         <!-- 表格开始 -->
         <el-table
         :data="tableData"
@@ -120,9 +122,16 @@
             showFileType: 0,
             showFileUrl: "",
             tableData:[],
+            progress:{
+              value:0,
+              show:false
+            },  
           }
         },
         methods:{
+          ProgressFormat(value){        //进度条
+            return value ==100?'100%':`${value}%`
+          },
           //展示文件
           checkFile(url) {
             console.log(url);
@@ -160,6 +169,7 @@
                     if (res.data==1) {
                       this.$message.success('上传成功')
                       this.getData()
+                      this.progress.show = false;
                     }else{
                       this.$message.error('上传失败')
                     }

src/views/projectManage/ProjectManagement5.vue

@@ -19,9 +19,10 @@
       <!-- 跳转导航结束 -->
       <div class="pmInp">
           <!-- <el-button type="primary" class="btn" @click="addFile" size="mini">上传文件</el-button> -->
-          <beUpload @getFile="getFile"  :navName="'上传文件'" :accept="accept"></beUpload>
+          <beUpload @getFile="getFile"  :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload>
 
         </div>
+        <el-progress v-show="progress.show" :percentage="progress.value" :format="ProgressFormat"></el-progress>
 
         <!-- 表格部分开始 -->
         <el-table
@@ -123,10 +124,17 @@
             showFileUrl: "",
             title:"",
             tableData:[],  //附件列表
-            file:''
+            file:'',
+            progress:{
+              value:0,
+              show:false
+            },
           }
         },
         methods:{
+          ProgressFormat(value){        //进度条
+            return value ==100?'100%':`${value}%`
+          },
           //展示文件
           checkFile(url) {
               console.log(url);
@@ -163,6 +171,8 @@
                     if (res.data==1) {
                       this.getData()
                       this.$message.success('上传成功')
+                      this.progress.show = false;
+
                     }else{
                       this.$message.error('上传失败')
                     }

src/views/projectSettlement/projectSettlement5.vue

@@ -17,9 +17,11 @@
 
       <!-- 上传文件以及表格开始 -->
       <div class="pmInp">
-          <beUpload @getFile="getFile"  :navName="'上传文件'" :accept="accept"></beUpload>
+          <beUpload @getFile="getFile" :progress="progress" :navName="'上传文件'" :accept="accept"></beUpload>
         </div>
       <!-- 表格部分开始 -->
+      <el-progress v-show="progress.show" :percentage="progress.value" :format="ProgressFormat"></el-progress>
+
         <el-table
         :data="file"
         tooltip-effect="dark"
@@ -161,6 +163,10 @@
             showFileUrl: "",
             // tableData:[],
             file:[],
+            progress:{     //进度条
+              value:0,
+              show:false
+            },
             AllRemark:{
               kRem:'',
               xRem:'',
@@ -169,6 +175,9 @@
           }
         },
         methods:{
+          ProgressFormat(value){        //进度条
+            return value ==100?'100%':`${value}%`
+          },
           //展示文件
           checkFile(url) {
               // console.log(url);
@@ -207,6 +216,7 @@
             getFile(val) {    //上传文件
               this.file.push(val);
               this.$message.success('上传成功')
+              this.progress.show = false;
             },
 
             getData(){       //获取基础信息