gks 1 жил өмнө
parent
commit
b48740042f

+ 7 - 5
src/views/GATHER/index.vue

@@ -281,11 +281,11 @@
             v-if="
               scope.row.collStatus == 1 &&
               (scope.row.audit == 0 || scope.row.audit == null) &&
-              checkPermi(['gather:GATHER:check'])
+              checkPermi(['gather:GATHER:approve'])
             "
           >
             <el-popconfirm
-              title="确定提交绩效审核吗?"
+              title="确定提交审核吗?"
               @confirm="handleAudit(scope.row)"
             >
               <el-button
@@ -293,7 +293,7 @@
                 size="mini"
                 type="text"
                 slot="reference"
-                >审核绩效</el-button
+                >提交审核</el-button
               >
             </el-popconfirm>
           </template>
@@ -312,7 +312,7 @@
               scope.row.audit == 1 &&
               (scope.row.approveStatus == 0 ||
                 scope.row.approveStatus == null) &&
-              checkPermi(['gather:GATHER:approve'])
+              checkPermi(['gather:GATHER:check'])
             "
           >
             <!-- <el-popconfirm
@@ -325,7 +325,7 @@
               size="mini"
               type="text"
               slot="reference"
-              >提交审核</el-button
+              >审核绩效</el-button
             >
             <!-- </el-popconfirm> -->
           </template>
@@ -1011,6 +1011,7 @@ export default {
           if (res.code == 200) {
             this.$modal.msgSuccess("通过审核成功");
             this.getList();
+            this.openDetail = false;
           }
         });
       } else {
@@ -1018,6 +1019,7 @@ export default {
           if (res.code == 200) {
             this.$modal.msgSuccess("驳回成功");
             this.getList();
+            this.openDetail = false;
           }
         });
       }

+ 2 - 1
src/views/system/user/index.vue

@@ -163,7 +163,7 @@
             width="160"
             class-name="small-padding fixed-width"
           >
-            <template slot-scope="scope" v-if="scope.row.userId !== 1">
+            <template slot-scope="scope" >
               <el-button
                 size="mini"
                 type="text"
@@ -172,6 +172,7 @@
                 v-hasPermi="['system:user:edit']"
               >修改</el-button>
               <el-button
+              v-if="scope.row.userId !== 1"
                 size="mini"
                 type="text"
                 icon="el-icon-delete"