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

src/views/projectManage/ProjectManagement.vue

@@ -392,24 +392,21 @@ import { getNowDate } from '@/components/tool/Date';
             did:this.selectInp.department,  //部门
             tid:this.selectInp.sort,    //分类
             leader:this.selectInp.leader,  //负责人
-            st:2,  //审核状态
             endState:this.selectInp.state,
             year:this.selectInp.year, //年份
-            // year:'',
             textInp:this.selectText,
             page:this.table.currentPage,  //当前页
             lim:this.table.packageSize,  //限制获取几条数据
           }
           // console.log(param);
           this.ajax    
-            .get(this.$store.state.api+'/SelectAllProject',param)
+            .get(this.$store.state.api+'/SelectAllProjectManagement',param)
               .then(res=>{
                 let data=res.data;
                 if (data[0].length==0 && data[5][0]['total'] != 0&&this.table.currentPage!=1) {
                   this.table.currentPage=1
                   return this.getData()
                 }
-                console.log(data);
                 let a=this.options;
                 this.items=data[0];
                 a.projectFilter=data[1];

src/views/projectManage/ProjectManagementMain.vue

@@ -71,7 +71,6 @@
             },
         },
         mounted(){
-            this.$route.query['Id']
         }
     }
 </script>

src/views/projectManage/components/ProjectManagement1.vue

@@ -352,9 +352,9 @@
             
     <div class="baseBtn">
       <div class="blockWidth">
-        <el-button type="primary" v-show="apIsupload==0"  @click="audit">立即修改</el-button>
-        <el-button type="primary" v-show="apIsupload==1" class="disa">立即修改</el-button>
-        <el-button type="primary" v-show="apIsupload==2" class="disa">立即修改</el-button>
+        <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="apIsupload==2" class="disa">立即修改</el-button> -->
       </div>
     </div>
 
@@ -666,8 +666,9 @@
                     .get(this.$store.state.api+'/SelectProjectApplyDetailStudent',param)
                     .then(res=>{
                       // console.log(data.);
+                        console.log(res.data);
                         let data=res.data[0][0]
-                        console.log(data);
+    
                         // console.log(data.multiSelectProject);
                         this.content.select.projectName=data.title
                         this.content.select.leader=data.leader
@@ -685,7 +686,6 @@
                         this.content.dialogImageUrl=data.image
                         this.pageType=[data.typeid,data.typeName]
                         this.isUpload=data.endProject
-                        this.endProject=data.endProject
                         this.loading = false;
                         this.apIsupload=data.apIsupload
                         // console.log(this.content);
@@ -735,7 +735,7 @@
         submitAll(){   //提交修改数据
           let param={
             uid:this.$store.state.userInfo.userid,
-            pid:JSON.parse(localStorage.getItem('pid')),
+            pid:this.$route.query['pid'],
             tit:this.content.select.projectName,
             lea:this.content.select.leader,
             cla:this.content.select.department,

src/views/projectManage/components/ProjectManagement1_MakerSpace.vue

@@ -583,6 +583,7 @@
           this.ajax.post(this.$store.state.api+'/UpdateProjectMakerSpaceBase',param).then(res=>{
             if(res.data==1){
               this.$message.success("修改项目信息成功")
+              this.submitHint = false;
             }else{
               this.$message.error('修改项目信息失败')
             }

src/views/projectManage/components/ProjectManagement2.vue

@@ -89,8 +89,8 @@
             </div>
       <div class="baseBtn">
         <div class="blockWidth">
-          <el-button type="primary" v-show="apIsupload==0"  @click="audit">立即修改</el-button>
-          <el-button type="primary" v-show="apIsupload==1" class="disa">立即修改</el-button>
+          <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>
 
         </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.isupload
+                        this.isUpload=data.endProject
                         // console.log(data.chapters);
                         this.content=JSON.parse(data.chapters)
                         this.apIsupload=data.apIsupload

src/views/projectManage/components/ProjectManagement2_MakerSpace.vue

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

src/views/projectManage/components/ProjectManagement3.vue

@@ -125,7 +125,6 @@
             downloadFile("/file/附件 2：创客专项资金项目申请表（创客活动）.doc","创客专项资金项目申请表（创客活动）.doc",(_b)=>this.loading = _b)
           },
           getData(){
-            // console.log(localStorage.getItem('pid'))
             this.loading = true;
             let param={
               uid:this.$store.state.userInfo.userid,

src/views/projectManage/components/ProjectManagement4.vue

@@ -4,8 +4,8 @@
 
       <div class="pmInp">
           <!-- <el-button type="primary" class="btn"  size="mini">上传文件</el-button> -->
-          <beUpload @getFile="getFile" v-show="state==0"  :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload>
-          <beUpload @getFile="getFile"  v-show="state==1" :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload>
+          <beUpload @getFile="getFile" v-show="state==0 || state==1"  :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>
         </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].isupload;
+                      this.state=res.data[0][0].endProject;
                       let k=[]
                       res.data[0].forEach((e,i) => {
                         let { projectFile: l } = e;

src/views/projectManage/components/ProjectManagement5.vue

@@ -4,9 +4,9 @@
 
       <div class="pmInp">
           <!-- <el-button type="primary" class="btn" @click="addFile" size="mini">上传文件</el-button> -->
-          <beUpload  @getFile="getFile" v-show="state==0" :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload>
+          <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>
-          <el-button v-show="state==1" 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>
         <el-progress v-show="progress.show" :percentage="progress.value" :format="ProgressFormat"></el-progress>
@@ -227,7 +227,8 @@
                     .get(this.$store.state.api+'/SelectProjectManageFile',param)
                     .then(res=>{
                       console.log(res.data[0][0]);
-                      this.state=res.data[0][0].isupload;
+                      this.state=res.data[0][0].endProject;
+                      console.log(res.data[0][0])
                       let file = JSON.parse(res.data[0][0]['endFile']);
                       this.tableData=file
                       this.loading = false;

src/views/projectSettlement/projectSettlement.vue

@@ -130,14 +130,14 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="state"
+          prop="endProject"
           label="状态"
           align="center"
           min-width="8%">
           <template #default="scope">
             <div>
-              <span v-if="scope.row.isupload == 1">进行中</span>
-              <span v-if="scope.row.isupload == 2">已结题</span>
+              <span v-if="scope.row.endProject == 1">待审核</span>
+              <span v-if="scope.row.endProject == 2">已审核</span>
            </div>
           </template>
         </el-table-column>
@@ -151,12 +151,12 @@
               <div class="operations">
                         <el-button type="primary" size="mini" @click="details(scope.row)">查看详情</el-button>
                         
-                        <el-button type="primary"  v-if="scope.row.isupload==1" style="width: 73.3px;" @click="audit(scope.row.courseId,scope.row.title)" size="mini">审核</el-button>
-                        <el-button type="info"  disabled v-if="scope.row.isupload==2" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;"  size="mini">已审核</el-button>
+                        <el-button type="primary"  v-if="scope.row.endProject==1" style="width: 73.3px;" @click="audit(scope.row.courseId,scope.row.title)" size="mini">审核</el-button>
+                        <el-button type="info"  disabled v-if="scope.row.endProject==2" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;"  size="mini">已审核</el-button>
                         <!-- <el-button type="primary" disabled v-if="scope.row.isupload==0" style="width: 73.3px;background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;"  @click="audit(scope.row.courseId,scope.row.title)" size="mini">审核</el-button> -->
 
-                        <el-button v-show="scope.row.isupload==2" type="primary" size="mini" @click="edit(scope.row.courseId,scope.row.typeid)">成果查看</el-button>
-                        <el-button v-show="scope.row.isupload!=2" type="info" disabled="" size="mini">成果查看</el-button>
+                        <el-button  type="primary" size="mini" @click="edit(scope.row.courseId,scope.row.typeid)">成果查看</el-button>
+                        <!-- <el-button v-show="scope.row.isupload!=2" type="info" disabled="" size="mini">成果查看</el-button> -->
               </div>
           </template>
         </el-table-column>
@@ -213,17 +213,13 @@
                 value:'',
                 label:'全部'
               },
-              {
-                value:0,
-                label:'未审核'
-              },
               {
                 value:1,
-                label:'进行中'
+                label:'待审核'
               },
               {
                 value:2,
-                label:"已审核"
+                label:'已审核'
               },
             ],
           },
@@ -255,12 +251,13 @@
         submitAll(){  //提交结项审核
           let param={
             uid:this.$store.state.userInfo.userid,
-            cid:this.iid
+            pid:this.iid
           }
           this.ajax
-                .post(this.$store.state.api+'/UpdateSettlementIsUpload',param)
+                .post(this.$store.state.api+'/UpdateSettlementEndProject',param)
                 .then(res=>{
-                  console.log(res);
+                  console.log(res['data'])
+                  this.$message.success("结项成功")
                   this.submitHint=false;
                   this.getData();
                 },err=>{
@@ -287,9 +284,8 @@
           // return console.log(param);
           // console.log(param)
           this.ajax    
-            .get(this.$store.state.api+'/SelectSettlement',param)
+            .get(this.$store.state.api+'/SelectAllProjectSettlement',param)
               .then(res=>{
-                console.log(res.data);
                 let data=res.data;
                 let a=this.options;
                 this.tableData=data[0];

src/views/resultShow/resultsShow.vue

@@ -12,7 +12,7 @@
       <div class="selectsBlock">
         <span class="selectLabel">项目筛选</span>
         <el-select v-model="pavalues.value" @change="getData" placeholder="我的项目">
-          <el-option label="所有项目" :value="0"/>
+          <el-option label="所有项目" value=""/>
           <el-option
             v-for="item in options"
             :key="item.courseId"
@@ -25,7 +25,7 @@
       <div class="selectsBlock">
         <span class="selectLabel">部门</span>
         <el-select v-model="pavalues.value1" @change="getData" placeholder="请选择">
-          <el-option label="所有部门" :value="0"/>
+          <el-option label="所有部门" value=""/>
           <el-option
             v-for="item in options1"
             :key="item.classid"
@@ -38,7 +38,7 @@
       <div class="selectsBlock">
         <span class="selectLabel">分类</span>
         <el-select v-model="pavalues.value2" @change="getData" placeholder="请选择">
-          <el-option label="所有分类" :value="0"/>
+          <el-option label="所有分类" value=""/>
           <el-option
             v-for="item in options2"
             :key="item.typeid"
@@ -140,9 +140,9 @@
           options4:[],
           loading:false,
           pavalues:{
-            value:0,
-            value1:0,
-            value2:0,
+            value:'',
+            value1:'',
+            value2:'',
             value3:'',
             value4:new Date().getFullYear().toString(),
           },
@@ -167,11 +167,10 @@
           this.loading = true;
           let param={
             uid:this.$store.state.userInfo.userid,  //当前账号id
-            pid:this.pavalues.value,  //筛选
+            pid:this.pavalues.value,  //项目筛选
             did:this.pavalues.value1,  //部门
             tid:this.pavalues.value2,    //分类
             leader:this.pavalues.value3,  //负责人
-            st:2,  //审核状态
             year:this.pavalues.value4,
             textInp:this.input,
             page:this.Page.currentPage,  //当前页