瀏覽代碼

按钮权限

zhouhao 2 年之前
父節點
當前提交
69548326db
共有 2 個文件被更改,包括 13 次插入13 次删除
  1. 6 6
      src/views/supply/apply/apply_list.vue
  2. 7 7
      src/views/supply/apply/engin_list.vue

+ 6 - 6
src/views/supply/apply/apply_list.vue

@@ -382,7 +382,7 @@
                 <el-popconfirm
                   v-if="
                     $checkBtnRole('apply', $route.meta.roles) &&
-                    (( isCustomer  && !scope.row.automaticStatus &&
+                    ((  !scope.row.automaticStatus &&
                     scope.row.examineStatus === 'SAVE') || (
                     !isCustomer  &&  scope.row.automaticStatus &&
                      scope.row.examineStatus === 'SAVE' &&
@@ -398,7 +398,7 @@
                 <el-popconfirm
                   v-if="
                     $checkBtnRole('apply', $route.meta.roles) &&
-                    ((isCustomer  &&!scope.row.automaticStatus &&
+                    ((!scope.row.automaticStatus &&
                     scope.row.examineStatus === 'WAIT')||( !isCustomer  && scope.row.automaticStatus &&
                     scope.row.examineStatus === 'WAIT'&& scope.row.type==2))
                   "
@@ -411,7 +411,7 @@
                 <el-popconfirm
                   v-if="
                     $checkBtnRole('examine', $route.meta.roles) &&
-                    ((isCustomer  &&!scope.row.automaticStatus &&
+                    ((!scope.row.automaticStatus &&
                     scope.row.examineStatus === 'OK')||( !isCustomer && scope.row.automaticStatus &&
                     scope.row.examineStatus === 'OK' && scope.row.type==2))
                   "
@@ -436,7 +436,7 @@
                 <el-button
                   v-if="
                     $checkBtnRole('edit', $route.meta.roles) &&
-                      ((isCustomer  && !scope.row.automaticStatus &&
+                      (( !scope.row.automaticStatus &&
                       (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
                       scope.row.type === 2) ||
                       ( !isCustomer && scope.row.automaticStatus &&
@@ -452,7 +452,7 @@
                 <el-button
                   v-if="
                     $checkBtnRole('examine', $route.meta.roles) &&
-                    ((isCustomer  &&!scope.row.automaticStatus &&
+                    ((!scope.row.automaticStatus &&
                     scope.row.examineStatus === 'WAIT')|| (!isCustomer && scope.row.automaticStatus &&
                     scope.row.examineStatus === 'WAIT' && scope.row.type==2))
                   "
@@ -465,7 +465,7 @@
                 <el-popconfirm
                   v-if="
                     $checkBtnRole('del', $route.meta.roles) &&
-                    ((isCustomer  &&!scope.row.automaticStatus &&
+                    ((!scope.row.automaticStatus &&
                     scope.row.examineStatus !== 'OK') || ( !isCustomer &&scope.row.automaticStatus && scope.row.examineStatus !== 'OK' && scope.row.type==2 ) )
                   "
                   style="margin-left: 10px"

+ 7 - 7
src/views/supply/apply/engin_list.vue

@@ -411,7 +411,7 @@
                 <el-popconfirm
                   v-if="
                     $checkBtnRole('apply', $route.meta.roles) &&
-                    ((isCustomer  &&!scope.row.automaticStatus &&
+                    ((!scope.row.automaticStatus &&
                     scope.row.examineStatus === 'SAVE') || (
                      !isCustomer  && scope.row.automaticStatus &&
                      scope.row.examineStatus === 'SAVE' &&
@@ -427,7 +427,7 @@
                 <el-popconfirm
                   v-if="
                   $checkBtnRole('apply', $route.meta.roles) &&
-                    ((isCustomer  &&!scope.row.automaticStatus &&
+                    ((!scope.row.automaticStatus &&
                     scope.row.examineStatus === 'WAIT')||(!isCustomer  && scope.row.automaticStatus &&
                     scope.row.examineStatus === 'WAIT'&& scope.row.type==2))
                   "
@@ -440,7 +440,7 @@
                 <el-popconfirm
                   v-if="
                     $checkBtnRole('examine', $route.meta.roles) &&
-                    ((isCustomer  &&!scope.row.automaticStatus &&
+                    ((!scope.row.automaticStatus &&
                     scope.row.examineStatus === 'OK')||( !isCustomer  && scope.row.automaticStatus &&
                     scope.row.examineStatus === 'OK' && scope.row.type==2))
                   "
@@ -465,7 +465,7 @@
                 <el-button
                   v-if="
                   $checkBtnRole('edit', $route.meta.roles) &&
-                    ((isCustomer  && !scope.row.automaticStatus &&
+                    (( !scope.row.automaticStatus &&
                       (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
                       scope.row.type === 2 ) ||
                        (!isCustomer  &&scope.row.automaticStatus &&
@@ -480,7 +480,7 @@
                 <el-button
                   v-if="
                     $checkBtnRole('examine', $route.meta.roles) &&
-                    ((isCustomer  &&!scope.row.automaticStatus &&
+                    ((!scope.row.automaticStatus &&
                     scope.row.examineStatus === 'WAIT')|| ( !isCustomer  &&scope.row.automaticStatus &&
                     scope.row.examineStatus === 'WAIT' && scope.row.type==2))
                   "
@@ -492,8 +492,8 @@
                 <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 &&
+                  v-if="  $checkBtnRole('del', $route.meta.roles) &&
+                    ((!scope.row.automaticStatus &&
                     scope.row.examineStatus !== 'OK') || ( !isCustomer  && scope.row.automaticStatus && scope.row.examineStatus !== 'OK' && scope.row.type==2 ) )"
                   style="margin-left: 10px"
                   title="确定删除吗?"