#

src/views/activityManage/makerActivityWordDetail.vue

@@ -12,7 +12,7 @@
         <markeractivityWordShow v-if="wordData['state']!=0" :wordData="wordData" :total="total"/>
         <div>
             <el-button type="primary" @click="getActivityWord">下载表单</el-button>
-            <el-button type="primary" v-if="wordData['state']==0" @click="test">立即修改</el-button>
+            <el-button type="primary" v-if="wordData['state']==0&& $store.state.userInfo.type!=0" @click="test">立即修改</el-button>
         </div>
         <el-dialog
           title="提示"

src/views/activityManage/makerActvity.vue

@@ -167,20 +167,20 @@
               <div class="operations">
                         <el-button type="primary"  @click="MADetails(scope.row.acId)" size="mini">查看详情</el-button>
 
-                        <el-button type="primary" v-if="scope.row.state==0"  @click="audi(scope.row,0)" size="mini">提交</el-button>
-                        <el-button type="primary" disabled v-show="scope.row.state>=1" class="disa" size="mini">已提交</el-button>
+                        <el-button type="primary" v-if="scope.row.state==0 && $store.state.userInfo.type!=0"  @click="audi(scope.row,0)" size="mini">提交</el-button>
+                        <el-button type="primary" disabled v-show="scope.row.state>=1&& $store.state.userInfo.type!=0" class="disa" size="mini">已提交</el-button>
 
                         <!-- <el-button type="primary"  @click="audi(scope.row,1)" size="mini">管理审核</el-button> -->
-                        <el-button type="primary"  v-show="scope.row.state==1" @click="audi(scope.row,1)" size="mini">审核1</el-button>
-                        <el-button type="primary" disabled v-show="scope.row.state==2" class="disa" size="mini">审核1</el-button>
-                        <el-button type="primary" disabled v-show="scope.row.state!=2 && scope.row.state!=1" class="disa" size="mini">已审核1</el-button>
+                        <el-button type="primary"  v-show="scope.row.state==1&& $store.state.userInfo.type==0" @click="audi(scope.row,1)" size="mini">审核</el-button>
+                        <el-button type="primary" disabled v-show="scope.row.state==2&& $store.state.userInfo.type==0" class="disa" size="mini">审核</el-button>
+                        <el-button type="primary" disabled v-show="scope.row.state!=2 && scope.row.state!=1&& $store.state.userInfo.type==0" class="disa" size="mini">已审核</el-button>
 
                         
                         <!-- <el-button type="primary"  size="mini" @click="edit(scope.row.acId)">申请表</el-button> -->
 
-                        <el-button type="primary" v-show="scope.row.state!=2 && scope.row.state!=3" class="disa" size="mini" @click="end(scope.row)" >完结</el-button>
-                        <el-button type="primary" v-show="scope.row.state==2" size="mini" @click="end(scope.row)" >完结</el-button>
-                        <el-button type="primary" v-show="scope.row.state==3" size="mini" class="disa">已完结</el-button>
+                        <el-button type="primary" v-show="scope.row.state!=2 && scope.row.state!=3 && $store.state.userInfo.type==0" class="disa" size="mini" @click="end(scope.row)" >完结</el-button>
+                        <el-button type="primary" v-show="scope.row.state==2&& $store.state.userInfo.type==0" size="mini" @click="end(scope.row)" >完结</el-button>
+                        <el-button type="primary" v-show="scope.row.state==3&& $store.state.userInfo.type==0" size="mini" class="disa">已完结</el-button>
 
               </div>
           </template>

src/views/fundManage/makerfund.vue

@@ -184,23 +184,23 @@
               <div class="operations">
                 <el-button type="primary" size="mini" @click="details(scope.row.fid,scope.row.title,scope.row.acId)">查看详情</el-button>
 
-                <el-button type="primary" v-show="scope.row.state==0" size="mini" @click="Audit(scope.row,0)">提交</el-button>
-                <el-button type="primary"  v-show="scope.row.state==1" class="disa" size="mini">已提交</el-button>
-                <el-button type="primary"  v-show="scope.row.state!=1 && scope.row.state!=0" class="disa" size="mini">已提交</el-button>
+                <el-button type="primary" v-show="scope.row.state==0&& $store.state.userInfo.type!=0" size="mini" @click="Audit(scope.row,0)">提交</el-button>
+                <el-button type="primary"  v-show="scope.row.state==1&& $store.state.userInfo.type!=0" class="disa" size="mini">已提交</el-button>
+                <el-button type="primary"  v-show="scope.row.state!=1 && scope.row.state!=0&& $store.state.userInfo.type!=0" class="disa" size="mini">已提交</el-button>
 
                 <!-- <el-button type="primary"  v-show="scope.row.state==2" class="disa" size="mini">已审核</el-button> -->
 
-                <el-button type="primary"   v-show="scope.row.state==0" class="disa" size="mini">审核1</el-button>
-                <el-button type="primary" @click="Audit(scope.row,1)"  v-show="scope.row.state==1" size="mini">审核1</el-button>
-                <el-button type="primary"   v-show="scope.row.state==2" class="disa" size="mini">审核1</el-button>
-                <el-button type="primary"   v-show="scope.row.state==3" class="disa" size="mini">审核1</el-button>
+                <el-button type="primary"   v-show="scope.row.state==0&& $store.state.userInfo.type==0" class="disa" size="mini">审核</el-button>
+                <el-button type="primary" @click="Audit(scope.row,1)"  v-show="scope.row.state==1&& $store.state.userInfo.type==0" size="mini">审核</el-button>
+                <el-button type="primary"   v-show="scope.row.state==2&& $store.state.userInfo.type==0" class="disa" size="mini">审核</el-button>
+                <el-button type="primary"   v-show="scope.row.state==3&& $store.state.userInfo.type==0" class="disa" size="mini">审核</el-button>
 
 
 
-                <el-button  v-show="scope.row.state==0"  class="disa" type="primary"  size="mini">完结</el-button>
-                <el-button  v-show="scope.row.state==1" class="disa"  type="primary"  size="mini">完结</el-button>
-                <el-button  v-show="scope.row.state==2" @click="endDialogShow(scope.row.fid)"   type="primary" size="mini">完结</el-button>
-                <el-button  v-show="scope.row.state==3" class="disa" type="primary" size="mini">已完结</el-button>
+                <el-button  v-show="scope.row.state==0&& $store.state.userInfo.type==0"  class="disa" type="primary"  size="mini">完结</el-button>
+                <el-button  v-show="scope.row.state==1&& $store.state.userInfo.type==0" class="disa"  type="primary"  size="mini">完结</el-button>
+                <el-button  v-show="scope.row.state==2&& $store.state.userInfo.type==0" @click="endDialogShow(scope.row.fid)"   type="primary" size="mini">完结</el-button>
+                <el-button  v-show="scope.row.state==3&& $store.state.userInfo.type==0" class="disa" type="primary" size="mini">已完结</el-button>
 
 
               </div>
@@ -426,6 +426,7 @@
           this.ajax
               .post(this.$store.state.api+"/UpdateMakerFundState",param)
               .then(res=>{
+                console.log(res);
                   this.dialogVisible=false;
                   if (res.data) {
                       this.$message.success('审核成功')

src/views/messageNotification.vue

@@ -293,7 +293,7 @@
               .get(this.$store.state.api+'/SelectNotification',param)
               .then(res=>{  
                 // 不是在第一页进行分页请求，请求数据为空，再发送一次请求获取数据,判断是否为第一页，防止无限循环
-                // console.log(res)
+                console.log(res)
                 if(this.table.currentPage!==1 && res.data[0].length==0){
                   this.table.currentPage=1
                   this.getCourseManagement();

src/views/projectApply/components/MakerSpaceWordDetail.vue

@@ -4,7 +4,7 @@
         <MakerSpaceWordShow :wordData="wordData" v-if="state!=0"/>
         <div>
             <el-button type="primary" @click="getWord">下载表格</el-button>
-            <el-button type="primary" @click="test" v-if="state==0">立即修改</el-button>
+            <el-button type="primary" @click="test" v-if="state==0&& $store.state.userInfo.type!=0">立即修改</el-button>
         </div>
         <el-dialog
           title="提示"

src/views/projectApply/components/studentProjectWordDetail.vue

@@ -4,7 +4,7 @@
         <studentProjectWordShow v-if="isupload!=0" :downWordData="downWordData" :reversedMessage="reversedMessage"/>
           <div style="width: 300px;margin: 20px auto;display: flex;justify-content: space-between;">
               <el-button style="width: 120px;margin: 20px auto;" @click="downloadDig=true" type="primary">下载文档</el-button>
-              <el-button style="width: 120px;margin: 20px auto;" @click="test" type="primary" v-if="isupload==0">立即修改</el-button>
+              <el-button style="width: 120px;margin: 20px auto;" @click="test" type="primary" v-if="isupload==0 && $store.state.userInfo.type!=0">立即修改</el-button>
           </div>
           <!-- 立即修改开始 -->
                 <el-dialog

src/views/projectApply/projectApplication.vue

@@ -278,7 +278,7 @@
                 type="primary"
                 class="disa"
                 size="mini"
-                >管理员审核</el-button
+                >审核</el-button
               >
               <!--1管理员审核 -->
               <el-button
@@ -286,34 +286,33 @@
                 type="primary"
                 size="mini"
                 @click="audit(scope.row, 1)"
-                >管理员审核</el-button
+                >审核</el-button
               >
               <el-button
                 v-show="scope.row.isupload == 2 && $store.state.userInfo.type==0"
                 type="primary"
                 class="disa"
                 size="mini"
-                >已审核1</el-button
+                >已审核</el-button
               >
               <el-button
                 v-show="scope.row.isupload == 3&& $store.state.userInfo.type==0"
                 type="primary"
                 class="disa"
                 size="mini"
-                >待结项1</el-button
+                >待结项</el-button
               >
               <el-button
                 v-show="scope.row.isupload == 4&& $store.state.userInfo.type==0"
                 type="primary"
                 class="disa"
                 size="mini"
-                >已结项1</el-button
+                >已结项</el-button
               >
 
               <!-- <el-button type="primary"  size="mini" @click="appTable(scope.row.typeid,scope.row.courseId)" >申请表</el-button> -->
 
-              <el-button type="primary" size="mini" @click="del(scope.row)"
-                >删除</el-button
+              <el-button type="primary" v-if="$store.state.userInfo.type!=0" size="mini" @click="del(scope.row)">删除</el-button
               >
             </div>
           </template>