Merge branch 'master' into 测试

src/views/subsidiary/order/management/index.vue

@@ -327,7 +327,7 @@ const config = computed(() => {
       },
       renderHTML(row) {
         return [
-          row.status == 10 && row.wlnStatus > 1
+          row.status == 10 && ![1, 14].includes(row.wlnStatus)
             ? {
                 attrs: {
                   label: "上传设计稿",