Forráskód Böngészése

【修改】零售操作权限设置

howie 2 éve
szülő
commit
57d913fdfd

+ 8 - 4
src/views/supply/apply/apply_list.vue

@@ -467,10 +467,14 @@
                 <el-button type="text" @click="toDetail(scope.row)"> 详情 </el-button>
                 <el-popconfirm
                   v-if="
-                    $checkBtnRole('del', $route.meta.roles) &&
-                    !scope.row.automaticStatus &&
-                    scope.row.type == 2 &&
-                    (scope.row.examineStatus !== 'OK' || scope.row.examineStatus === 'SAVE')
+                    ($checkBtnRole('del', $route.meta.roles) &&
+                      !scope.row.automaticStatus &&
+                      scope.row.type == 2 &&
+                      (scope.row.examineStatus !== 'OK' || scope.row.examineStatus === 'SAVE')) ||
+                    ($checkBtnRole('del', $route.meta.roles) &&
+                      scope.row.automaticStatus &&
+                      scope.row.type == 2 &&
+                      (scope.row.examineStatus !== 'OK' || scope.row.examineStatus === 'SAVE'))
                   "
                   style="margin-left: 10px"
                   title="确定删除吗?"

+ 4 - 1
src/views/supply/apply/engin_list.vue

@@ -498,7 +498,10 @@
                 <el-button type="text" @click="toDetail(scope.row)"> 详情 </el-button>
                 <!--             !scope.row.automaticStatus &&  -->
                 <el-popconfirm
-                  v-if="!scope.row.automaticStatus && scope.row.examineStatus !== 'OK'"
+                  v-if="
+                    (!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)"