Merge branch 'master' into 测试

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

@@ -376,7 +376,7 @@ const config = computed(() => {
                   clickSelect(row);
                 },
               }
-            : row.status == 40 || row.status == 50
+            : [40, 50].includes(row.status)
             ? {
                 attrs: {
                   label: "售后",
@@ -415,7 +415,7 @@ const config = computed(() => {
                 },
               }
             : {},
-          !props.selectStatus && (row.status == 0 || row.status == 10 || row.status == 20)
+          !props.selectStatus && [0, 10, 20].includes(row.status)
             ? {
                 attrs: {
                   label: "删除",
@@ -428,7 +428,7 @@ const config = computed(() => {
                 },
               }
             : {},
-          !props.selectStatus && row.status == 30
+          !props.selectStatus && [30, 40].includes(row.status)
             ? {
                 attrs: {
                   label: "删除",

src/views/production/schedule/production-order/index.vue

@@ -161,7 +161,7 @@ const tagList = ref({
 const status = ref([
   {
     dictKey: 30,
-    dictValue: "生产中",
+    dictValue: "已打标",
   },
   {
     dictKey: 40,