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

src/views/supply/apply/apply_list.vue

@@ -397,7 +397,7 @@
                       scope.row.examineStatus === 'WAIT') ||
                     ($checkBtnRole('apply', $route.meta.roles) &&
                       scope.row.automaticStatus &&
-                      scope.row.examineStatus === 'SAVE' &&
+                      scope.row.examineStatus === 'WAIT' &&
                       scope.row.type == 2)
                   "
                   style="margin-right: 10px"
@@ -413,7 +413,7 @@
                       scope.row.examineStatus === 'OK') ||
                     ($checkBtnRole('examine', $route.meta.roles) &&
                       scope.row.automaticStatus &&
-                      scope.row.examineStatus === 'SAVE' &&
+                      scope.row.examineStatus === 'OK' &&
                       scope.row.type == 2)
                   "
                   style="margin-right: 10px"
@@ -439,7 +439,10 @@
                     ($checkBtnRole('del', $route.meta.roles) &&
                       !scope.row.automaticStatus &&
                       scope.row.examineStatus !== 'OK') ||
-                    ($checkBtnRole('del', $route.meta.roles) && scope.row.automaticStatus && scope.row.type == 2)
+                    ($checkBtnRole('del', $route.meta.roles) &&
+                      scope.row.examineStatus !== 'OK' &&
+                      scope.row.automaticStatus &&
+                      scope.row.type == 2)
                   "
                   type="text"
                   @click="toReturnForm(scope.row)"
@@ -451,7 +454,10 @@
                     ($checkBtnRole('examine', $route.meta.roles) &&
                       !scope.row.automaticStatus &&
                       scope.row.examineStatus === 'WAIT') ||
-                    ($checkBtnRole('examine', $route.meta.roles) && scope.row.automaticStatus && scope.row.type === 2)
+                    ($checkBtnRole('examine', $route.meta.roles) &&
+                      scope.row.examineStatus === 'WAIT' &&
+                      scope.row.automaticStatus &&
+                      scope.row.type === 2)
                   "
                   type="text"
                   @click="toExamine(scope.row)"

src/views/supply/apply/engin_list.vue

@@ -410,9 +410,9 @@
                       $checkBtnRole('apply', $route.meta.roles) &&
                       scope.row.examineStatus === 'SAVE') ||
                     ($checkBtnRole('apply', $route.meta.roles) &&
-                      scope.row.automaticStatus &&
                       scope.row.examineStatus === 'SAVE' &&
-                      scope.row.type == 2)
+                      scope.row.automaticStatus &&
+                      scope.row.type === 2)
                   "
                   style="margin-right: 10px"
                   title="确定申请吗？"
@@ -422,9 +422,13 @@
                 </el-popconfirm>
                 <el-popconfirm
                   v-if="
-                    !scope.row.automaticStatus &&
-                    $checkBtnRole('apply', $route.meta.roles) &&
-                    scope.row.examineStatus === 'WAIT'
+                    (!scope.row.automaticStatus &&
+                      $checkBtnRole('apply', $route.meta.roles) &&
+                      scope.row.examineStatus === 'WAIT') ||
+                    ($checkBtnRole('apply', $route.meta.roles) &&
+                      scope.row.examineStatus === 'WAIT' &&
+                      scope.row.automaticStatus &&
+                      scope.row.type === 2)
                   "
                   style="margin-right: 10px"
                   title="确定撤回吗？"
@@ -437,10 +441,10 @@
                     (!scope.row.automaticStatus &&
                       $checkBtnRole('examine', $route.meta.roles) &&
                       scope.row.examineStatus === 'OK') ||
-                    ($checkBtnRole('apply', $route.meta.roles) &&
+                    ($checkBtnRole('examine', $route.meta.roles) &&
+                      scope.row.examineStatus === 'OK' &&
                       scope.row.automaticStatus &&
-                      scope.row.examineStatus === 'SAVE' &&
-                      scope.row.type == 2)
+                      scope.row.type === 2)
                   "
                   style="margin-right: 10px"
                   title="确定弃审吗？"
@@ -466,7 +470,10 @@
                       $checkBtnRole('edit', $route.meta.roles) &&
                       (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
                       scope.row.type === 2) ||
-                    ($checkBtnRole('edit', $route.meta.roles) && scope.row.automaticStatus && scope.row.type == 2)
+                    ($checkBtnRole('examine', $route.meta.roles) &&
+                      (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
+                      scope.row.automaticStatus &&
+                      scope.row.type === 2)
                   "
                   type="text"
                   @click="toReturnForm(scope.row)"
@@ -475,9 +482,13 @@
                 </el-button>
                 <el-button
                   v-if="
-                    !scope.row.automaticStatus &&
-                    $checkBtnRole('examine', $route.meta.roles) &&
-                    scope.row.examineStatus === 'WAIT'
+                    (!scope.row.automaticStatus &&
+                      $checkBtnRole('examine', $route.meta.roles) &&
+                      scope.row.examineStatus === 'WAIT') ||
+                    ($checkBtnRole('examine', $route.meta.roles) &&
+                      scope.row.examineStatus === 'WAIT' &&
+                      scope.row.automaticStatus &&
+                      scope.row.type === 2)
                   "
                   type="text"
                   @click="toExamine(scope.row)"