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

src/views/activityManage/makerActvity.vue

@@ -178,9 +178,9 @@
                         
                         <!-- <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 && $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>
+                        <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>
@@ -343,7 +343,7 @@
       <div class="deleteContent">"{{ endTable.title }}"项目活动还有资金未完结！</div>
       <div class="deleteContent1">未完结资金编号</div>
 
-      <div class="download" v-for="(item,index) in endFundData" :key="item.fid">
+      <div class="download" v-for="(item) in endFundData" :key="item.fid">
         <div>{{ item.fundNo }}</div>
       </div>
       <div slot="footer" class="dialog-footer">

src/views/fundManage/makerfund.vue

@@ -197,10 +197,10 @@
 
 
 
-                <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>
+                <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>