Merge branch 'hotfix/Hotfix-zh-309' into develop

src/views/supply/apply/apply_list.vue

@@ -424,10 +424,10 @@
                 </el-button>
                 <el-button
                   v-if="
-                    $checkBtnRole('edit', $route.meta.roles) &&
-                    !scope.row.automaticStatus &&
-                    (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
-                    scope.row.type === 2
+                    ($checkBtnRole('del', $route.meta.roles) &&
+                      !scope.row.automaticStatus &&
+                      scope.row.examineStatus !== 'OK') ||
+                    ($checkBtnRole('del', $route.meta.roles) && scope.row.automaticStatus && scope.row.type == 2)
                   "
                   type="text"
                   @click="toReturnForm(scope.row)"
@@ -436,9 +436,10 @@
                 </el-button>
                 <el-button
                   v-if="
-                    $checkBtnRole('examine', $route.meta.roles) &&
-                    !scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'WAIT'
+                    ($checkBtnRole('examine', $route.meta.roles) &&
+                      !scope.row.automaticStatus &&
+                      scope.row.examineStatus === 'WAIT') ||
+                    ($checkBtnRole('examine', $route.meta.roles) && scope.row.automaticStatus && scope.row.type === 2)
                   "
                   type="text"
                   @click="toExamine(scope.row)"