活动管理上传完结报告完成

src/App.vue

@@ -308,18 +308,28 @@
       justify-content: center;
       line-height: 40px;
       font-size: 16px;
+      position: relative;
         .jia{
             border-radius: 50%;
             border: 1.5px #ccc solid;
             font-size: 25px;
             line-height: 26px;
             font-weight: 10;
+            display: flex;
+            justify-content: center;
             margin-top: 6px;
             margin-right: 5px;
             height: 27px;
             width: 27px;
             color: #ccc;
         }
+        #upFile{
+          position: absolute;
+          width: 100%;
+          height: 100%;
+          transform: scale(1.1,1.1);
+          opacity: 0;
+        }
       }
   .baseBtn{     //所有页面底部按钮框
     width:100%;

src/views/activityManage/makerActvity.vue

@@ -136,7 +136,8 @@
               <div class="operations">
                   <!-- <el-button type="primary" > -->
                         <el-button type="primary"  @click="MADetails(scope.row.acId)" size="mini">查看详情</el-button>
-                        <el-button type="primary"  @click="audi" size="mini">审核</el-button>
+                        <el-button type="primary" v-if="scope.row.state==0"  @click="audi(scope.row)" size="mini">审核</el-button>
+                        <el-button type="info" disabled v-if="scope.row.state==1"  @click="audi(scope.row)" size="mini">审核</el-button>
                         <el-button type="primary"  size="mini" @click="edit(scope)">申请表</el-button>
                         <el-button type="primary"  size="mini" @click="end" >完结</el-button>
                   <!-- </el-button> -->
@@ -167,21 +168,21 @@
             <div class="diaTit1">
               <div class="spans1">所在部门</div>
               <div>
-                <el-input v-model="processTable.classId"></el-input>
+                <el-input disabled v-model="processTable.className"></el-input>
               </div>
             </div>
 
             <div class="diaTit1">
               <div class="spans1">预算总经费</div>
               <div>
-                <el-input v-model="processTable.money"></el-input>
+                <el-input disabled v-model="processTable.money"></el-input>
               </div>
             </div>
 
             <div class="diaTit1">
               <div class="spans1">联系电话</div>
               <div>
-                <el-input v-model="processTable.phone"></el-input>
+                <el-input disabled v-model="processTable.phone"></el-input>
               </div>
             </div>
             <div slot="footer" class="dialog-footer">
@@ -209,21 +210,21 @@
             <div class="diaTit1">
               <div class="spans1">所在部门</div>
               <div>
-                <el-input v-model="processTable.classId"></el-input>
+                <el-input disabled v-model="processTable.className"></el-input>
               </div>
             </div>
 
             <div class="diaTit1">
               <div class="spans1">预算总经费</div>
               <div>
-                <el-input v-model="processTable.money"></el-input>
+                <el-input disabled v-model="processTable.money"></el-input>
               </div>
             </div>
 
             <div class="diaTit1">
               <div class="spans1">联系电话</div>
               <div>
-                <el-input v-model="processTable.phone"></el-input>
+                <el-input disabled v-model="processTable.phone"></el-input>
               </div>
             </div>
 
@@ -312,12 +313,12 @@
             lim:10
           },
           processTable:{
-            Id:"awdaw",
-            name:"项目名称",
-            leader:"项目负责人",
-            classId:"所在部门",
-            money:"预算经费",
-            phone:"联系电话"
+            Id:"",
+            name:"",
+            leader:"",
+            className:"",
+            money:"",
+            phone:""
           },
         }
       },
@@ -331,9 +332,24 @@
         },
         
         commit(){  // 活动审核对话框确定
-          this.auditDialog=false;
-          this.status--
-          console.log(this.status);
+          this.ajax.post(this.$store.state.api+"/UpdateActivityState",{
+            uid:this.$store.state.userInfo.userid,
+            aid:this.processTable.Id,
+            st:1,
+          }).then(res=>{
+            if(res.data==1){
+              this.$message.success("修改成功");
+              this.auditDialog = false;
+              for(let i in this.processTable)this.processTable[i] = '';
+            }else{
+              this.$message.error("修改失败")
+            }
+          }).catch(err=>{
+            this.$message.error(err.message)
+          })
+          // this.auditDialog=false;
+          // this.status--
+          // console.log(this.status);
         },
 
         // 驳回对话框确定
@@ -354,13 +370,14 @@
 
         },
              
-        audi(){  // 审核按钮
-          if(this.status){
-            this.auditDialog=true;
-            return
-          }else{
-            this.rejectDialog=true;
-          }
+        audi(row){  // 审核按钮
+          this.processTable.Id = row.acId;
+          this.processTable.name = row.title;
+          this.processTable.leader = row.pro_leader;
+          this.processTable.money = row.money,
+          this.processTable.phone = row.phone,
+          this.processTable.className = row.name;
+          this.auditDialog = true;
         },
         
         makerActvityApply(){  // 创客活动申请按钮
@@ -556,4 +573,7 @@
     float: right;
     margin: 20px 35px 10px;
   }
+  .downloadList{
+        width: 80%;
+      }
 </style>

src/views/activityManage/makerActvityDetails.vue

@@ -81,17 +81,23 @@
           </div>
              
             <!-- 活动完结报告开始 -->
-            <!-- <div class="tabTit">
+            <div class="tabTit">
                 <div><p>活动完结报告</p></div>
             </div>
-            <div style="width: 85%;float: left;">
-              <div style="display: flex;">
-                  <div class="download">智能分链机器公开赛.pdf 点击下载</div>
-                  <div class="addMoneyBtn">
+            <div style="width: 85%" v-loading="loading" element-loading-text="文件正在上传中">
+              <div style="display: flex;width: 100%;align-items: center;">
+                  <div  class="download" v-if="tableData.reportFile!=''&&tableData.reportFile!=null">{{ tableData.reportFile!=''&&tableData.reportFile!=null?JSON.parse(tableData.reportFile).fileName:'' }}</div>
+                  <div class="addMoneyBtn" v-if="tableData.reportFile==''||tableData.reportFile==null">
                       <div class="jia">+</div>添加
+                      <div id="upFile">
+                        <beUpload @getFile="getFile" :navName="'上传文件'" :accept="accept"> </beUpload>
+                      </div>
+                  </div>
+                  <div class="DelFile" v-if="tableData.reportFile!=''&&tableData.reportFile!=null">
+                    <el-button type="danger" @click="DelFileDialog = true">删除文件</el-button>
                   </div>
               </div>
-            </div> -->
+            </div>
             <!-- 活动完结报告结束 -->
 
             <!-- 活动指导老师开始 -->
@@ -252,25 +258,43 @@
                     width="600px"
                     class="MAputIn AddMember">
                     <div class="addDialogLogo">LOGO</div>
-                    <div class="deleteContent">是否修改“{{tableData.title}}”项目活动？</div>
+                    <div class="deleteContent">是否修改“{{ tableData.reportFile!=''&&tableData.reportFile!=null?tableData.title:''}}”项目活动？</div>
                     <span slot="footer" class="dialog-footer">
                         <el-button type="primary" @click="save" class="btn5" size="small">确认提交</el-button>
                         <el-button @click="dialogVisible1=false;" class="btn5" style="background:#cccccc" size="small">取消</el-button>
                     </span>
                   </el-dialog>
-                  <!-- 提交对话框结束 -->
+                  <!-- 删除文件对话框结束 -->
+                  <el-dialog
+                    title="提示"
+                    :visible.sync="DelFileDialog"
+                    width="600px"
+                    class="MAputIn AddMember">
+                    <div class="addDialogLogo">LOGO</div>
+                    <!-- <div class="deleteContent" v-if="tableData.reportFile==''&&tableData.reportFile!=null">是否删除“{{JSON.parse(tableData.reportFile).fileName}}”文件？</div> -->
+                    <span slot="footer" class="dialog-footer">
+                        <el-button type="danger" @click="DelFileYes" class="btn5" size="small">确认删除</el-button>
+                        <el-button @click="DelFileDialog=false;" class="btn5" style="background:#cccccc" size="small">取消</el-button>
+                    </span>
+                  </el-dialog>
+                  <!-- 删除文件对话框结束 -->
       </div>
 </template>
 
 <script>
 import { VueEditor } from "vue2-editor";
 import { uuid } from 'vue-uuid';
+import BeUpload from '../../components/tool/beUpload.vue'
 export default {
   components:{
-    VueEditor
+    VueEditor,
+    BeUpload
   },
   data() {
     return {
+      accept:"*",
+      loading:false,
+      DelFileDialog:false,
       dialogVisible1:false,
       addMemberDialog:false,
       customToolbar: [
@@ -293,6 +317,7 @@ export default {
         course_teacher:[],
         brief:"",
         chapters:["","","",""],
+        reportFile:"",
       },
       selectInput:{
         project:[],
@@ -307,6 +332,40 @@ export default {
       }
   },
   methods:{
+    DelFileYes(){
+      this.ajax.post(this.$store.state.api+"/UploadActivityFile",{
+        uid:this.$store.state.userInfo.userid,
+        aid:this.$route.query['Id'],
+        file:""
+      }).then(res=>{
+        if(res.data==1){
+          this.$message.success("删除成功");
+        }else{
+          this.$message.error("删除失败")
+        }
+        this.getData();
+        this.DelFileDialog = false;
+      }).catch(err=>{
+        this.$message.error(err.message)
+      })
+    },
+    getFile(val) {//上传文件
+      this.ajax.post(this.$store.state.api+"/UploadActivityFile",{
+        uid:this.$store.state.userInfo.userid,
+        aid:this.$route.query['Id'],
+        file:JSON.stringify(val)
+      }).then(res=>{
+        if(res.data==1){
+          this.$message.success("添加成功");
+          this.getData();
+        }else{
+          this.$message.error("添加失败")
+        }
+      }).catch(err=>{
+        this.$message.error(err.message);
+      })
+        // console.log(val);
+    },
     submit(){
       if(this.check()!=1)return;
       this.dialogVisible1 = true;
@@ -474,11 +533,12 @@ export default {
         data.course_teacher = JSON.parse(data.course_teacher);
         data.chapters = JSON.parse(data.chapters)
         this.tableData = data;
+        console.log(this.tableData)
         this.$message.success("获取数据成功")
       }).catch(err=>{
         this.$message.error(err.message)
       })
-    }
+    },
   },
   mounted(){
     this.getAllClass();

src/views/projectApply/projectApplicationApplyMain.vue

@@ -170,7 +170,6 @@
             amend(val){      //立项基础信息页面修改人员信息
               let a=this.projectApplicationApply1
               if (!a.telVerify2) return this.$message.error('请输入正确联系号码格式')
-              //  console.log(a.Member2);
                a.tableData.forEach((e,i)=>{
                     if(e.id==a.Member2.id) {
                       Object.assign(e,a.Member2)