按钮权限

src/views/supply/apply/apply_list.vue

@@ -382,8 +382,12 @@
                 <el-popconfirm
                   v-if="
                     $checkBtnRole('apply', $route.meta.roles) &&
-                    !scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'SAVE'
+                    ((!scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'SAVE') || (
+                      scope.row.automaticStatus &&
+                     scope.row.examineStatus === 'SAVE' &&
+                     scope.row.type===2
+                    ) )
                   "
                   style="margin-right: 10px"
                   title="确定申请吗？"
@@ -430,9 +434,13 @@
                 <el-button
                   v-if="
                     $checkBtnRole('edit', $route.meta.roles) &&
-                      !scope.row.automaticStatus &&
+                      ((!scope.row.automaticStatus &&
                       (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
-                      scope.row.type === 2
+                      scope.row.type === 2) ||
+                      ( scope.row.automaticStatus &&
+                     (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
+                     scope.row.type===2)
+                      )
                   "
                   type="text"
                   @click="toReturnForm(scope.row)"
@@ -454,8 +462,12 @@
                 <el-popconfirm
                   v-if="
                     $checkBtnRole('del', $route.meta.roles) &&
-                    !scope.row.automaticStatus &&
-                    scope.row.examineStatus !== 'OK'
+                    ((!scope.row.automaticStatus &&
+                    scope.row.examineStatus !== 'OK') ||(
+                     scope.row.automaticStatus &&
+                     scope.row.examineStatus !== 'OK' &&
+                     scope.row.type===2
+                    ))
                   "
                   style="margin-left: 10px"
                   title="确定删除吗？"

src/views/supply/apply/engin_list.vue

@@ -3,13 +3,14 @@
     <div v-show="!isShowDetail && !isShowExamine && !isShowForm && !isShowReturnForm">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <Collapse   :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #left_btn>
             <el-radio-group size="mini" v-model="screenForm.status" @change="getList()">
               <el-radio-button label="">全部</el-radio-button>
               <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
                   item.label
-                }}</el-radio-button>
+                }}
+              </el-radio-button>
             </el-radio-group>
           </template>
           <template #right_btn>
@@ -171,7 +172,8 @@
               type="primary"
               icon="el-icon-plus"
               @click="toForm()"
-            >发货申请</el-button
+            >发货申请
+            </el-button
             >
             <el-button
               v-if="$checkBtnRole('refund', $route.meta.roles)"
@@ -179,7 +181,8 @@
               type="primary"
               icon="el-icon-plus"
               @click="toReturnForm()"
-            >退货申请</el-button
+            >退货申请
+            </el-button
             >
             <el-button
               v-if="$checkBtnRole('examine', $route.meta.roles)"
@@ -188,7 +191,8 @@
               icon="el-icon-finished"
               :disabled="multipleSelection.length < 1"
               @click="batchExamine"
-            >批量审批</el-button
+            >批量审批
+            </el-button
             >
           </div>
           <div class="fr">
@@ -406,9 +410,12 @@
               <template slot-scope="scope">
                 <el-popconfirm
                   v-if="
-                    !scope.row.automaticStatus &&
-                    $checkBtnRole('apply', $route.meta.roles) &&
-                    scope.row.examineStatus === 'SAVE'
+                   $checkBtnRole('apply', $route.meta.roles) &&
+                   ( (!scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'SAVE' ) ||
+                      (scope.row.automaticStatus &&
+                     scope.row.examineStatus === 'SAVE' &&
+                     scope.row.type===2))
                   "
                   style="margin-right: 10px"
                   title="确定申请吗？"
@@ -454,10 +461,13 @@
                 </el-button>
                 <el-button
                   v-if="
-                    !scope.row.automaticStatus &&
-                      $checkBtnRole('edit', $route.meta.roles) &&
+                  $checkBtnRole('edit', $route.meta.roles) &&
+                    ((!scope.row.automaticStatus &&
+                      (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
+                      scope.row.type === 2 ) ||
+                       (scope.row.automaticStatus &&
                       (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
-                      scope.row.type === 2
+                     scope.row.type===2))
                   "
                   type="text"
                   @click="toReturnForm(scope.row)"
@@ -475,10 +485,13 @@
                 >
                   审单
                 </el-button>
-                <el-button type="text" @click="toDetail(scope.row)"> 详情 </el-button>
+                <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="$checkBtnRole('del', $route.meta.roles) &&
+( (!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)"
@@ -850,7 +863,7 @@ export default {
      * @param {String} index - 索引值
      * @return Boolean
      */
-    selectable: function (row, index) {
+    selectable: function(row, index) {
       if (row.automaticStatus) {
         return false
       }