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

src/views/projectApply/projectApplicationApply.vue

@@ -98,6 +98,8 @@
               </div>
               <hr>
               <div style="margin-bottom: 10px;">项目封面</div>
+              <el-progress v-show="progress.show" :percentage="progress.value" :format="ProgressFormat"></el-progress>
+
               <el-upload
                 class="avatar-uploader"
                 action="#"
@@ -107,7 +109,7 @@
                 >
                 <img v-if="data.dialogImageUrl" :src="data.dialogImageUrl" class="avatar">
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                <BeUpload style="position: absolute;width: 301px;height: 180px; opacity: 0;z-index: 333;left: 0;top: 0;" @getFile="getFile" class="uploadPic" :navName="'上传封面'" :accept="accept"></BeUpload>
+                <BeUpload :progress="progress" style="position: absolute;width: 301px;height: 180px; opacity: 0;z-index: 333;left: 0;top: 0;" @getFile="getFile" class="uploadPic" :navName="'上传封面'" :accept="accept"></BeUpload>
               </el-upload>
             </div>
 
@@ -264,6 +266,10 @@
           // dialogImageUrl: '',
           accept:"image/*",
           isAddMember:1,
+          progress:{   //进度条
+                value:0,
+                show:false
+            },  
           // fileList: [],
           dialogVisible: false,
           addMemberDialog:false,
@@ -275,10 +281,14 @@
       
       methods:{
         getFile(val) {       //上传封面
-            console.log(val);
+            // console.log(val);
+            this.progress.show = false;
             this.data.dialogImageUrl=val.url
             this.$message.success('封面上传成功')
         },
+        ProgressFormat(value){        //进度条
+          return value ==100?'100%':`${value}%`
+        },
         // submitUpload() {
         //   this.$refs.upload.submit();
         // },

src/views/projectApply/projectApplicationDetails.vue

@@ -87,6 +87,7 @@
               </div>
               <hr>
               <div style="margin-bottom: 10px;">修改项目封面</div>
+              <el-progress v-show="progress.show" :percentage="progress.value" :format="ProgressFormat"></el-progress>
 
               <el-upload
                 class="avatar-uploader"
@@ -97,7 +98,7 @@
                 >
                 <img v-if="dialogImageUrl" :src="dialogImageUrl" class="avatar">
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                <BeUpload style="position:absolute; width: 301px;height: 180px; opacity: 0;z-index:333;left: 0px;top: 0;" @getFile="getFile" class="uploadPic" :navName="'上传封面'" :accept="accept"></BeUpload>
+                <BeUpload :progress="progress" style="position:absolute; width: 301px;height: 180px; opacity: 0;z-index:333;left: 0px;top: 0;" @getFile="getFile" class="uploadPic" :navName="'上传封面'" :accept="accept"></BeUpload>
               </el-upload>
             </div>
 
@@ -276,6 +277,10 @@
           isUpload:'',
           accept:"image/*",
           isAddMember:1,
+          progress:{   //进度条
+                value:0,
+                show:false
+            },  
           dialogImageUrl:'',  //图片地址
           delMember:false,
           amendMemberDialog:false,
@@ -325,9 +330,14 @@
           //   return true;
           // }
         },
+        ProgressFormat(value){        //进度条
+          return value ==100?'100%':`${value}%`
+        },
         getFile(val) {       //上传封面
-            console.log(val);
+            // console.log(val);
+            this.progress.show = false;
             this.dialogImageUrl=val.url
+
         },
         addMember(){       //添加成员按钮，显示对话框
             for(let key in this.addTabMember){

src/views/projectManage/ProjectManagement.vue

@@ -157,10 +157,13 @@
       class="endDialog"
       :before-close="init">
       <div class="addDialogLogo">LOGO</div>
-      <div class="deleteContent">"{{ tit }}"项目,有以下活动未完结！</div>
+      <div class="deleteContent">"{{ tit }}"项目</div>
       <div class="download checkActivity">
-            <span v-for="(item,index) in checkActivityFinishData" :key="index">{{ item.title }}</span>
-        </div>
+            <span style="color: black;">未完结活动:</span><span v-for="(item,index) in checkActivityFinishData" :key="index">{{ item.title }}</span>
+      </div>
+      <div class="download checkActivity">
+            <span style="color: black;">还有未报销资金-剩余:</span><span>{{ checkFundFinishData.fund - checkFundFinishData.usedFund }}</span>
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="init" class="AllDialogBtn">确认</el-button>
         <el-button @click="init" class="AllDialogBtn">取消</el-button>
@@ -245,7 +248,7 @@ import beUpload from '../../components/tool/beUpload'
           },
           file:[],
           checkActivityFinishData:[],
-          
+          checkFundFinishData:{}
         }
       },
       methods:{
@@ -314,12 +317,16 @@ import beUpload from '../../components/tool/beUpload'
         },
         finish(val,tit){     //结项对话框显示
           this.checkActivityFinishData = [];
+          this.checkFundFinishData={};
           this.ajax.get(this.$store.state.api+"/GetActivityNoReportByPId",{
             uid:this.$store.state.userInfo.userid,
             pid:val
           }).then(res=>{
-            if(res.data[0].length>0){
+            console.log(res.data);
+            if(res.data[0].length>0 || res.data[1].length>0){
               this.checkActivityFinishData = res.data[0];
+              this.checkFundFinishData = res.data[1][0];
+
               this.tit = tit;
               this.NoReportActivity = true;
             }else{

src/views/projectSettlement/projectSettlement.vue

@@ -280,7 +280,7 @@
             lim:this.table.packageSize  //限制获取几条数据
           }
           // return console.log(param);
-          console.log(param)
+          // console.log(param)
           this.ajax    
             .get(this.$store.state.api+'/SelectSettlement',param)
               .then(res=>{