Merge branch '11_3_week' into develop

src/views/supply/apply/apply_list.vue

@@ -483,8 +483,13 @@
                 <el-popconfirm
                   v-if="
                     $checkBtnRole('del', $route.meta.roles) &&
-                    !scope.row.automaticStatus &&
-                    scope.row.examineStatus !== 'OK'
+                   ( !scope.row.automaticStatus &&
+                    scope.row.examineStatus !== 'OK')
+                    ||
+                     $checkBtnRole('apply', $route.meta.roles) &&
+                    (scope.row.automaticStatus &&
+                      scope.row.examineStatus === 'WAIT' &&
+                      scope.row.type == 2)
                   "
                   style="margin-left: 10px"
                   title="确定删除吗？"

src/views/supply/apply/engin_list.vue

@@ -508,7 +508,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)"