Merge branch '新建订单流程' into 测试

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

@@ -340,7 +340,7 @@ const config = computed(() => {
                 },
               }
             : {},
-          row.status == 0 && row.flowStatus !== 2
+          row.status == 0 && row.flowStatus !== 1 && row.flowStatus !== 2
             ? {
                 attrs: {
                   label: "编辑",