Merge branch 'master' into 测试

src/components/process/order.vue

@@ -468,6 +468,16 @@ const formConfig = computed(() => {
   return [
     {
       type: "title",
+      title: "产品",
+      label: "",
+    },
+    {
+      type: "slot",
+      prop: "orderSkuList",
+      slotName: "orderSkuList",
+    },
+    {
+      type: "title",
       title: "类型",
       label: "",
     },
@@ -484,16 +494,6 @@ const formConfig = computed(() => {
       label: "事业部",
       itemWidth: 25,
     },
-    {
-      type: "title",
-      title: "产品",
-      label: "",
-    },
-    {
-      type: "slot",
-      prop: "orderSkuList",
-      slotName: "orderSkuList",
-    },
     formOption.disabled
       ? {}
       : {

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

@@ -440,6 +440,16 @@ const formConfig = computed(() => {
   return [
     {
       type: "title",
+      title: "产品",
+      label: "",
+    },
+    {
+      type: "slot",
+      prop: "orderSkuList",
+      slotName: "orderSkuList",
+    },
+    {
+      type: "title",
       title: "类型",
       label: "",
     },
@@ -458,16 +468,6 @@ const formConfig = computed(() => {
     },
     {
       type: "title",
-      title: "产品",
-      label: "",
-    },
-    {
-      type: "slot",
-      prop: "orderSkuList",
-      slotName: "orderSkuList",
-    },
-    {
-      type: "title",
       title: "贸易",
       label: "",
     },

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

@@ -449,6 +449,16 @@ const formConfig = computed(() => {
   return [
     {
       type: "title",
+      title: "产品",
+      label: "",
+    },
+    {
+      type: "slot",
+      prop: "orderSkuList",
+      slotName: "orderSkuList",
+    },
+    {
+      type: "title",
       title: "类型",
       label: "",
     },
@@ -465,16 +475,6 @@ const formConfig = computed(() => {
       label: "事业部",
       itemWidth: 25,
     },
-    {
-      type: "title",
-      title: "产品",
-      label: "",
-    },
-    {
-      type: "slot",
-      prop: "orderSkuList",
-      slotName: "orderSkuList",
-    },
     route.query && route.query.detailId
       ? {}
       : {

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

@@ -365,6 +365,16 @@ const formConfig = computed(() => {
   return [
     {
       type: "title",
+      title: "产品",
+      label: "",
+    },
+    {
+      type: "slot",
+      prop: "orderSkuList",
+      slotName: "orderSkuList",
+    },
+    {
+      type: "title",
       title: "类型",
       label: "",
     },
@@ -383,16 +393,6 @@ const formConfig = computed(() => {
     },
     {
       type: "title",
-      title: "产品",
-      label: "",
-    },
-    {
-      type: "slot",
-      prop: "orderSkuList",
-      slotName: "orderSkuList",
-    },
-    {
-      type: "title",
       title: "贸易",
       label: "",
     },