#

src/views/activityManage/makerActvityApplyMain.vue

@@ -84,7 +84,7 @@ import makerActvityApply2 from './makerActvityApply2.vue';
                 this.ajax.get(this.$store.state.api+"/GetAllProjectName",{
                     uid:this.$store.state.userInfo.userid,
                 }).then(res=>{
-                    this.makerActvityApplyData.project = res.data[0].filter(item=>item.isupload==2);
+                    this.makerActvityApplyData.project = res.data[0].filter(item=>item.isupload==0||item.isupload==1||item.isupload==2);
                 }).catch(err=>{
                     this.$message.error(err.message)
                 })

src/views/projectManage/ProjectManagement.vue

@@ -244,15 +244,15 @@ import { getNowDate } from '@/components/tool/Date';
                 label:'全部'
               },
               {
-                value:0,
+                value:2,
                 label:'进行中'
               },
               {
-                value:1,
+                value:3,
                 label:'待结题'
               },
               {
-                value:2,
+                value:4,
                 label:"已结题"
               },
             ],
@@ -320,8 +320,7 @@ import { getNowDate } from '@/components/tool/Date';
             uid:this.$store.state.userInfo.userid,
             cid:this.iid,
             file:JSON.stringify(this.file),
-            ep:1,//管理员的待结项
-            isp:3,//教师看到的待结项
+            state:3
           }).then(res=>{
             if(res.data==1){
               this.$message.success("待结项成功");

src/views/projectManage/components/ProjectManagement1.vue

@@ -352,8 +352,8 @@
             
     <div class="baseBtn">
       <div class="blockWidth">
-        <el-button type="primary" v-show="isUpload==0"  @click="audit">立即修改</el-button>
-        <el-button type="primary" v-show="isUpload==1 || isUpload==2" class="disa">立即修改</el-button>
+        <el-button type="primary" v-show="isUpload==2"  @click="audit">立即修改</el-button>
+        <el-button type="primary" v-show="isUpload==3 || isUpload==4" class="disa">立即修改</el-button>
         <!-- <el-button type="primary" v-show="apIsupload==2" class="disa">立即修改</el-button> -->
       </div>
     </div>
@@ -685,7 +685,7 @@
                         this.content.textarea=data.brief
                         this.content.dialogImageUrl=data.image
                         this.pageType=[data.typeid,data.typeName]
-                        this.isUpload=data.endProject
+                        this.isUpload=data.isupload
                         this.loading = false;
                         this.apIsupload=data.apIsupload
                         // console.log(this.content);

src/views/projectManage/components/ProjectManagement1_MakerSpace.vue

@@ -237,9 +237,9 @@
       <div class="blockWidth">
         <!-- <el-button type="primary" class="backBtn" @click="audit">立即修改</el-button> -->
 
-        <el-button v-show="isUpload==0 || isUpload ==1" type="primary" class="backBtn" @click="submitHint=true">立即修改</el-button>
+        <el-button v-show="isUpload==2 || isUpload ==3" type="primary" class="backBtn" @click="submitHint=true">立即修改</el-button>
         <!-- <el-button v-show="isUpload==1" type="primary" class="backBtn" disabled style="background: #ccc !important;border: none;">立即修改</el-button> -->
-        <el-button v-show="isUpload==2" type="primary" class="backBtn" disabled style="background: #ccc !important;border: none;">立即修改</el-button>
+        <el-button v-show="isUpload==4" type="primary" class="backBtn" disabled style="background: #ccc !important;border: none;">立即修改</el-button>
 
       </div>
     </div>
@@ -610,7 +610,7 @@
                     this.dialogImageUrl=data.image;
                     this.select.departmentData = data['classid']
                     this.select.sort = [data['typeid'],data['typeName']]
-                    this.isUpload=data['endProject']
+                    this.isUpload=data['isupload']
                     this.select.lead_leader = data['lead_leader']
                     this.teacherData = JSON.parse(data['course_teacher'])
                     this.studentData = JSON.parse(data['course_student'])

src/views/projectManage/components/ProjectManagement2.vue

@@ -89,8 +89,8 @@
             </div>
       <div class="baseBtn">
         <div class="blockWidth">
-          <el-button type="primary" v-show="isUpload==0"  @click="audit">立即修改</el-button>
-          <el-button type="primary" v-show="isUpload==1 || isUpload ==2" class="disa">立即修改</el-button>
+          <el-button type="primary" v-show="isUpload==2"  @click="audit">立即修改</el-button>
+          <el-button type="primary" v-show="isUpload==3 || isUpload ==4" class="disa">立即修改</el-button>
 
         </div>
       </div>
@@ -187,7 +187,7 @@ import { VueEditor } from "vue2-editor";
                     .get(this.$store.state.api+'/SelectProjectApplyDetailStudent',param)
                     .then(res=>{
                         let data=res.data[0][0]
-                        this.isUpload=data.endProject
+                        this.isUpload=data.isupload
                         // console.log(data.chapters);
                         this.content=JSON.parse(data.chapters)
                         this.apIsupload=data.apIsupload

src/views/projectManage/components/ProjectManagement2_MakerSpace.vue

@@ -43,8 +43,8 @@
   
         <div class="baseBtn">
           <div class="blockWidth">
-            <el-button type="primary" v-show="isUpload==0 || isUpload==1"  @click="submitHint=true">立即修改</el-button>
-            <el-button type="primary" disabled v-show="isUpload ==2" style="background: #ccc !important;border: none;">立即修改</el-button>
+            <el-button type="primary" v-show="isUpload==2 || isUpload==3"  @click="submitHint=true">立即修改</el-button>
+            <el-button type="primary" disabled v-show="isUpload ==4" style="background: #ccc !important;border: none;">立即修改</el-button>
             <!-- <el-button type="primary" disabled style="background: #ccc !important;border: none;" v-show="isUpload==2">立即修改</el-button> -->
   
           </div>
@@ -123,7 +123,7 @@
                 this.ajax
                       .get(this.$store.state.api+'/SelectProjectChapterMakerSpace',param)
                       .then(res=>{
-                        this.isUpload = res.data[0][0]['endProject']
+                        this.isUpload = res.data[0][0]['isupload']
                         this.data = JSON.parse(res.data[0][0]['chapters']);
                         console.log(this.data)
                         this.loading = false;

src/views/projectManage/components/ProjectManagement4.vue

@@ -4,9 +4,9 @@
 
       <div class="pmInp">
           <!-- <el-button type="primary" class="btn"  size="mini">上传文件</el-button> -->
-          <beUpload @getFile="getFile" v-show="state==0 || state==1"  :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload>
+          <beUpload @getFile="getFile" v-show="state==2 || state==3"  :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload>
           <!-- <beUpload @getFile="getFile"  v-show="state==1" :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload> -->
-          <el-button v-show="state==2"  style="background: #ccc !important;cursor: no-drop;color: #fff !important;border: 0;font-size: 16px;height: 40px;">上传文件</el-button>
+          <el-button v-show="state==4"  style="background: #ccc !important;cursor: no-drop;color: #fff !important;border: 0;font-size: 16px;height: 40px;">上传文件</el-button>
         </div>
         <el-progress v-show="progress.show" :percentage="progress.value" :format="ProgressFormat"></el-progress>
 
@@ -228,7 +228,7 @@
                     .get(this.$store.state.api+'/SelectProjectFile',param)
                     .then(res=>{
                       console.log(res.data[0][0]);
-                      this.state=res.data[0][0].endProject;
+                      this.state=res.data[0][0].isupload;
                       let k=[]
                       res.data[0].forEach((e,i) => {
                         let { projectFile: l } = e;

src/views/projectManage/components/ProjectManagement5.vue

@@ -4,8 +4,8 @@
 
       <div class="pmInp">
           <!-- <el-button type="primary" class="btn" @click="addFile" size="mini">上传文件</el-button> -->
-          <beUpload  @getFile="getFile" v-show="state==0|| state==1" :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload>
-          <el-button  v-show="state==2" style="background: #ccc !important;cursor: no-drop;color: #fff !important;border: 0;font-size: 16px;">上传文件</el-button>
+          <beUpload  @getFile="getFile" v-show="state==2|| state==3" :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload>
+          <el-button  v-show="state==4" style="background: #ccc !important;cursor: no-drop;color: #fff !important;border: 0;font-size: 16px;">上传文件</el-button>
           <!-- <el-button v-show="state==1" style="background: #ccc !important;cursor: no-drop;color: #fff !important;border: 0;font-size: 16px;">上传文件</el-button> -->
 
         </div>
@@ -227,7 +227,7 @@
                     .get(this.$store.state.api+'/SelectProjectManageFile',param)
                     .then(res=>{
                       console.log(res.data[0][0]);
-                      this.state=res.data[0][0].endProject;
+                      this.state=res.data[0][0].isupload;
                       console.log(res.data[0][0])
                       let file = JSON.parse(res.data[0][0]['endFile']);
                       this.tableData=file

src/views/projectSettlement/projectSettlement.vue

@@ -214,11 +214,11 @@
                 label:'全部'
               },
               {
-                value:1,
+                value:3,
                 label:'待审核'
               },
               {
-                value:2,
+                value:4,
                 label:'已审核'
               },
             ],