Browse Source

订单增加快递

lxf 1 year ago
parent
commit
50d56d92d0

+ 1 - 1
src/views/group/order/management/detail.vue

@@ -424,7 +424,7 @@ const formConfig = computed(() => {
       type: "select",
       label: "选择快递",
       prop: "expressDeliveryId",
-      data: [],
+      data: proxy.useUserStore().allDict["express_delivery"],
       itemWidth: 25,
       clearable: true,
     },

+ 2 - 2
src/views/subsidiary/order/management/add.vue

@@ -509,7 +509,7 @@ const formConfig = computed(() => {
       type: "select",
       label: "选择快递",
       prop: "expressDeliveryId",
-      data: [],
+      data: proxy.useUserStore().allDict["express_delivery"],
       itemWidth: 25,
       clearable: true,
     },
@@ -566,7 +566,7 @@ const rules = ref({
   consignee: [{ required: true, message: "请输入联系人", trigger: "blur" }],
   consigneeNumber: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
   deliveryTime: [{ required: true, message: "请选择交货时间", trigger: "change" }],
-  //   expressDeliveryId: [{ required: true, message: "请选择快递", trigger: "change" }],
+  expressDeliveryId: [{ required: true, message: "请选择快递", trigger: "change" }],
   sourcePlatform: [{ required: true, message: "请选择店铺来源", trigger: "change" }],
   shopName: [{ required: true, message: "请选择店铺", trigger: "change" }],
   quantity: [{ required: true, message: "请输入数量", trigger: "blur" }],

+ 4 - 2
src/views/subsidiary/order/management/design.vue

@@ -252,7 +252,9 @@
           </div>
         </template>
         <template #expressDeliveryId>
-          <div style="width: 100%"></div>
+          <div style="width: 100%">
+            {{ dictKeyValue(formData.data.sourcePlatform, useUserStore().allDict["express_delivery"]) }}
+          </div>
         </template>
         <template #sourcePlatform>
           <div style="width: 100%">
@@ -453,7 +455,7 @@ const rules = ref({
   consignee: [{ required: true, message: "请输入联系人", trigger: "blur" }],
   consigneeNumber: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
   deliveryTime: [{ required: true, message: "请选择交货时间", trigger: "change" }],
-  //   expressDeliveryId: [{ required: true, message: "请选择快递", trigger: "change" }],
+  expressDeliveryId: [{ required: true, message: "请选择快递", trigger: "change" }],
   sourcePlatform: [{ required: true, message: "请选择店铺来源", trigger: "change" }],
   shopName: [{ required: true, message: "请选择店铺", trigger: "change" }],
   quantity: [{ required: true, message: "请输入数量", trigger: "blur" }],