按钮权限

src/views/supply/apply/apply_list.vue

@@ -397,9 +397,10 @@
                 </el-popconfirm>
                 <el-popconfirm
                   v-if="
-                    $checkBtnRole('apply', $route.meta.roles) && (!isCustomer && scope.row.type!==2) &&
-                    !scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'WAIT'
+                    $checkBtnRole('apply', $route.meta.roles) && !isCustomer  &&
+                    ((!scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT')||(scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT'&& scope.row.type==2))
                   "
                   style="margin-right: 10px"
                   title="确定撤回吗？"
@@ -409,9 +410,10 @@
                 </el-popconfirm>
                 <el-popconfirm
                   v-if="
-                    $checkBtnRole('examine', $route.meta.roles) && (!isCustomer && scope.row.type!==2) &&
-                    !scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'OK'
+                    $checkBtnRole('examine', $route.meta.roles) && !isCustomer &&
+                    ((!scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'OK')||(scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'OK' && scope.row.type==2))
                   "
                   style="margin-right: 10px"
                   title="确定弃审吗？"
@@ -449,14 +451,15 @@
                 </el-button>
                 <el-button
                   v-if="
-                    $checkBtnRole('examine', $route.meta.roles) && (!isCustomer && scope.row.type!==2) &&
-                    !scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'WAIT'
+                    $checkBtnRole('examine', $route.meta.roles) && !isCustomer  &&
+                    ((!scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT')|| ( scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT' && scope.row.type==2))
                   "
                   type="text"
                   @click="toExamine(scope.row)"
                 >
-                  审单
+                  审核
                 </el-button>
                 <el-button type="text" @click="toDetail(scope.row)"> 详情</el-button>
                 <el-popconfirm

src/views/supply/apply/engin_list.vue

@@ -410,12 +410,13 @@
               <template slot-scope="scope">
                 <el-popconfirm
                   v-if="
-                   $checkBtnRole('apply', $route.meta.roles) && !isCustomer &&
-                   ( (!scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'SAVE' ) ||
-                      (scope.row.automaticStatus &&
+                    $checkBtnRole('apply', $route.meta.roles) && !isCustomer  &&
+                    ((!scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'SAVE') || (
+                      scope.row.automaticStatus &&
                      scope.row.examineStatus === 'SAVE' &&
-                     scope.row.type===2))
+                     scope.row.type===2
+                    ) )
                   "
                   style="margin-right: 10px"
                   title="确定申请吗？"
@@ -425,9 +426,10 @@
                 </el-popconfirm>
                 <el-popconfirm
                   v-if="
-                    !scope.row.automaticStatus && (!isCustomer && scope.row.type!==2) &&
-                    $checkBtnRole('apply', $route.meta.roles) &&
-                    scope.row.examineStatus === 'WAIT'
+                  $checkBtnRole('apply', $route.meta.roles) && !isCustomer  &&
+                    ((!scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT')||(scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT'&& scope.row.type==2))
                   "
                   style="margin-right: 10px"
                   title="确定撤回吗？"
@@ -437,9 +439,10 @@
                 </el-popconfirm>
                 <el-popconfirm
                   v-if="
-                    !scope.row.automaticStatus && (!isCustomer && scope.row.type!==2) &&
-                    $checkBtnRole('examine', $route.meta.roles) &&
-                    scope.row.examineStatus === 'OK'
+                    $checkBtnRole('examine', $route.meta.roles) && !isCustomer &&
+                    ((!scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'OK')||(scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'OK' && scope.row.type==2))
                   "
                   style="margin-right: 10px"
                   title="确定弃审吗？"
@@ -476,20 +479,22 @@
                 </el-button>
                 <el-button
                   v-if="
-                    !scope.row.automaticStatus && (!isCustomer && scope.row.type!==2) &&
-                    $checkBtnRole('examine', $route.meta.roles) &&
-                    scope.row.examineStatus === 'WAIT'
+                    $checkBtnRole('examine', $route.meta.roles) && !isCustomer  &&
+                    ((!scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT')|| ( scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT' && scope.row.type==2))
                   "
                   type="text"
                   @click="toExamine(scope.row)"
                 >
-                  审单
+                  审核
                 </el-button>
                 <el-button type="text" @click="toDetail(scope.row)"> 详情</el-button>
                 <!--             !scope.row.automaticStatus &&  -->
                 <el-popconfirm
-                  v-if="$checkBtnRole('del', $route.meta.roles) && !isCustomer  &&
-( (!scope.row.automaticStatus && (scope.row.examineStatus !== 'OK')) || (scope.row.automaticStatus && scope.row.examineStatus !== 'OK' && scope.row.type==2 ) )"
+                  v-if="  $checkBtnRole('del', $route.meta.roles) && !isCustomer  &&
+                    ((!scope.row.automaticStatus &&
+                    scope.row.examineStatus !== 'OK') || (scope.row.automaticStatus && scope.row.examineStatus !== 'OK' && scope.row.type==2 ) )"
                   style="margin-left: 10px"
                   title="确定删除吗？"
                   @onConfirm="handleDelete(scope.row.id)"