#

src/App.vue

@@ -4,6 +4,8 @@
       <img src="./assets/img/sclogo4.png" alt="" />
       <!-- <img src="@/assets/img/szjsxy.png" alt=""> -->
       <div class="homeExitContent">
+        <!-- <el-button size="mini" @click="$store.commit('update',['userInfo',{userid:'2021400203',username:'yym',type:2}])">yym</el-button> -->
+        <!-- <el-button size="mini" @click="$store.commit('update',['userInfo',{userid:'201901766',username:'qgt',type:0}])">qgt</el-button> -->
         <div>你好，{{ $store.state.userInfo.username }}</div>
         <div class="homeExit" @click="homeExit">退出</div>
       </div>

src/views/activityManage/makerActvity.vue

@@ -159,28 +159,30 @@
         </el-table-column>
         <el-table-column
           prop="operation"
-          width="300"
+          width="380"
           align="center"
           label="操作"
           >
           <template #default="scope">
               <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" v-if="scope.row.state==0 && ($store.state.userInfo.type!=0 || scope.row.userid==$store.state.userInfo.userid)"  @click="audi(scope.row,0)" size="mini">提交</el-button>
-                        <el-button type="primary" disabled v-if="scope.row.state>=1&& $store.state.userInfo.type!=0" class="disa" size="mini">已提交</el-button>
+                        <el-button type="primary" disabled v-if="scope.row.state>=1" class="disa" size="mini">已提交</el-button>
 
                         <!-- <el-button type="primary"  @click="audi(scope.row,1)" size="mini">管理审核</el-button> -->
                         <el-button type="primary"  v-if="scope.row.state==1&& $store.state.userInfo.type==0 " @click="audi(scope.row,1)" size="mini">审核</el-button>
+                        
                         <el-button type="primary" disabled v-if="scope.row.state==0&& $store.state.userInfo.type==0" class="disa" size="mini">审核</el-button>
+
                         <el-button type="primary" disabled v-if="(scope.row.state==2 || scope.row.state==3) && 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-if="scope.row.state!=2 && scope.row.state!=3 && $store.state.userInfo.type!=0" class="disa" size="mini">完结</el-button>
-                        <el-button type="primary" v-if="scope.row.state==2&& $store.state.userInfo.type!=0" size="mini" @click="end(scope.row)" >完结</el-button>
-                        <el-button type="primary" v-if="scope.row.state==3&& $store.state.userInfo.type!=0" size="mini" class="disa">已完结</el-button>
+                        <el-button type="primary" v-if="scope.row.state!=2 && scope.row.state!=3" class="disa" size="mini">完结</el-button>
+                        <el-button type="primary" v-if="scope.row.state==2" size="mini" @click="end(scope.row)" >完结</el-button>
+                        <el-button type="primary" v-if="scope.row.state==3" size="mini" class="disa">已完结</el-button>
 
               </div>
           </template>
@@ -327,7 +329,7 @@
           <el-button type="primary" @click="endTable.file=''">删除文件</el-button>
       </div> -->
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="ending" class="AllDialogBtn">确认提交</el-button>
+        <el-button type="primary" @click="ending" class="AllDialogBtn">确认</el-button>
         <el-button @click="endDialog=false" class="AllDialogBtn">取消</el-button>
       </div>
     </el-dialog>

src/views/fundManage/makerfund.vue

@@ -177,16 +177,16 @@
         <el-table-column
           prop="operation"
           align="center"
-          width="300"
+          width="380"
           label="操作"
           >
           <template #default="scope">
               <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-if="scope.row.state==0&& $store.state.userInfo.type!=0" size="mini" @click="Audit(scope.row,0)">提交</el-button>
-                <el-button type="primary"  v-if="scope.row.state==1&& $store.state.userInfo.type!=0" class="disa" size="mini">已提交</el-button>
-                <el-button type="primary"  v-if="scope.row.state!=1 && scope.row.state!=0&& $store.state.userInfo.type!=0" class="disa" size="mini">已提交</el-button>
+                <el-button type="primary" v-if="scope.row.state==0" size="mini" @click="Audit(scope.row,0)">提交</el-button>
+                <el-button type="primary"  v-if="scope.row.state==1" class="disa" size="mini">已提交</el-button>
+                <el-button type="primary"  v-if="scope.row.state!=1 && scope.row.state!=0" class="disa" size="mini">已提交</el-button>
 
                 <!-- <el-button type="primary"  v-if="scope.row.state==2" class="disa" size="mini">已审核</el-button> -->
 
@@ -197,10 +197,10 @@
 
 
 
-                <el-button  v-if="scope.row.state==0&& $store.state.userInfo.type!=0"  class="disa" type="primary"  size="mini">完结</el-button>
-                <el-button  v-if="scope.row.state==1&& $store.state.userInfo.type!=0" class="disa"  type="primary"  size="mini">完结</el-button>
-                <el-button  v-if="scope.row.state==2&& $store.state.userInfo.type!=0" @click="endDialogShow(scope.row.fid)"   type="primary" size="mini">完结</el-button>
-                <el-button  v-if="scope.row.state==3&& $store.state.userInfo.type!=0" class="disa" type="primary" size="mini">已完结</el-button>
+                <el-button  v-if="scope.row.state==0"  class="disa" type="primary"  size="mini">完结</el-button>
+                <el-button  v-if="scope.row.state==1" class="disa"  type="primary"  size="mini">完结</el-button>
+                <el-button  v-if="scope.row.state==2" @click="endDialogShow(scope.row.fid)"   type="primary" size="mini">完结</el-button>
+                <el-button  v-if="scope.row.state==3" class="disa" type="primary" size="mini">已完结</el-button>
 
 
               </div>
@@ -308,7 +308,7 @@
           <el-button type="primary" @click="auditPass(1)"  v-if="isManager==0" class="AllDialogBtn">审核</el-button>
 
 
-          <el-button type="primary" @click="auditPass(2)"  v-if="isManager==1" class="AllDialogBtn">审核通过</el-button>
+          <el-button type="primary" @click="auditPass(2)"  v-if="isManager==1" class="AllDialogBtn">通过</el-button>
           <el-button type="primary" v-if="isManager==1" @click="auditPass(0)" class="AllDialogBtn">撤回</el-button>
 
           <el-button @click="dialogVisible=false" class="AllDialogBtn">取消</el-button>
@@ -327,7 +327,7 @@
       
       <div class="deleteContent">确定完结?</div>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="confirmEnd" class="AllDialogBtn">确认完结</el-button>
+        <el-button type="primary" @click="confirmEnd" class="AllDialogBtn">确认</el-button>
         <el-button @click="dialogVisible1=false" class="AllDialogBtn">取消</el-button>
       </span>
     </el-dialog>

src/views/fundManage/makerfundDetails.vue

@@ -85,8 +85,8 @@
     <div class="baseBtn">
         <div class="blockWidth">
             <el-button type="primary" @click="download">生成表单</el-button>
-            <el-button type="primary" v-if="!state&& $store.state.userInfo.type!=0" @click="submitData">提交</el-button>
-            <el-button type="primary" v-if="state>0&& $store.state.userInfo.type!=0" class="disa">提交</el-button>
+            <el-button type="primary" v-if="!state " @click="submitData">提交</el-button>
+            <el-button type="primary" v-if="state>0" class="disa">提交</el-button>
         </div>
     </div>
 

src/views/projectApply/projectApplication.vue

@@ -224,7 +224,7 @@
         </el-table-column>
         <el-table-column
           prop="operation"
-          width="300"
+          width="370"
           align="center"
           label="操作"
         >
@@ -240,47 +240,50 @@
 
               <el-button
                 type="primary"
-                v-if="scope.row.isupload == 0 && $store.state.userInfo.type!=0"
+                v-if="scope.row.isupload == 0"
                 @click="audit(scope.row, 0)"
                 >提交</el-button
               >
               <!--0申请人审核 -->
               <el-button
                 type="primary"
-                v-if="scope.row.isupload == 1&& $store.state.userInfo.type!=0"
+                v-if="scope.row.isupload == 1"
                 class="disa"
                 >已提交</el-button
               >
               <el-button
                 type="primary"
-                v-if="scope.row.isupload == 2&& $store.state.userInfo.type!=0"
+                v-if="scope.row.isupload == 2"
                 class="disa"
                 size="mini"
                 >已审核</el-button
               >
               <el-button
                 type="primary"
-                v-if="scope.row.isupload == 3&& $store.state.userInfo.type!=0"
+                v-if="scope.row.isupload == 3"
                 class="disa"
                 size="mini"
                 >待结项</el-button
               >
               <el-button
                 type="primary"
-                v-if="scope.row.isupload == 4&& $store.state.userInfo.type!=0"
+                v-if="scope.row.isupload == 4"
                 class="disa"
                 size="mini"
                 >已结项</el-button
               >
 
+              <!--1管理员审核 -->
               <el-button
-                v-if="scope.row.isupload == 0 && $store.state.userInfo.type==0"
+                v-if="scope.row.isupload == 0&& $store.state.userInfo.type==0"
                 type="primary"
                 class="disa"
                 size="mini"
                 >审核</el-button
               >
-              <!--1管理员审核 -->
+
+
+
               <el-button
                 v-if="scope.row.isupload == 1 && $store.state.userInfo.type==0"
                 type="primary"
@@ -288,6 +291,7 @@
                 @click="audit(scope.row, 1)"
                 >审核</el-button
               >
+
               <el-button
                 v-if="scope.row.isupload == 2 && $store.state.userInfo.type==0"
                 type="primary"
@@ -296,14 +300,14 @@
                 >已审核</el-button
               >
               <el-button
-                v-if="scope.row.isupload == 3&& $store.state.userInfo.type==0"
+                v-if="scope.row.isupload == 3 && $store.state.userInfo.type==0"
                 type="primary"
                 class="disa"
                 size="mini"
                 >待结项</el-button
               >
               <el-button
-                v-if="scope.row.isupload == 4&& $store.state.userInfo.type==0"
+                v-if="scope.row.isupload == 4 && $store.state.userInfo.type==0"
                 type="primary"
                 class="disa"
                 size="mini"
@@ -312,7 +316,7 @@
 
               <!-- <el-button type="primary"  size="mini" @click="appTable(scope.row.typeid,scope.row.courseId)" >申请表</el-button> -->
 
-              <el-button type="primary" v-if="$store.state.userInfo.type!=0" size="mini" @click="del(scope.row)">删除</el-button
+              <el-button type="primary" size="mini" @click="del(scope.row)">删除</el-button
               >
             </div>
           </template>

src/views/projectSettlement/projectSettlement.vue

@@ -197,7 +197,7 @@
           
           <div class="deleteContent">确定“{{tit}}”完结？</div>
           <span slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="submitAll" class="AllDialogBtn">确认提交</el-button>
+            <el-button type="primary" @click="submitAll" class="AllDialogBtn">确认</el-button>
             <el-button @click="init" size="small" class="AllDialogBtn">取消</el-button>
           </span>
         </el-dialog>