1

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

@@ -362,6 +362,7 @@ const router = useRouter();
 const route = useRoute();
 const submit = ref(null);
 const departmentList = ref([]);
+const expressDeliveryList = ref([]);
 const activeNames = ref([]);
 const formOption = reactive({
   inline: true,
@@ -424,7 +425,7 @@ const formConfig = computed(() => {
       type: "select",
       label: "选择快递",
       prop: "expressDeliveryId",
-      data: proxy.useUserStore().allDict["express_delivery"],
+      data: expressDeliveryList.value,
       itemWidth: 25,
       clearable: true,
     },
@@ -481,7 +482,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" }],
   commercePlatform: [{ required: true, message: "请选择电商平台", trigger: "change" }],
   quantity: [{ required: true, message: "请输入数量", trigger: "blur" }],
   type: [{ required: true, message: "请选择订单类型", trigger: "change" }],
@@ -498,6 +499,16 @@ const getDemandData = () => {
       });
     }
   });
+  proxy.post("/expressDelivery/page", { pageNum: 1, pageSize: 999 }).then((res) => {
+    if (res.rows && res.rows.length > 0) {
+      expressDeliveryList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.expressage,
+        };
+      });
+    }
+  });
 };
 getDemandData();
 const openFile = (path) => {

src/views/production/shipment/print-order/index.vue

@@ -141,7 +141,7 @@
       <el-form :model="formExpress.data" :rules="rulesExpress" label-width="100px" ref="refExpress">
         <el-form-item label="快递" prop="expressDeliveryId">
           <el-select v-model="formExpress.data.expressDeliveryId" placeholder="请选择快递" style="width: 100%">
-            <el-option v-for="item in useUserStore().allDict['express_delivery']" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
+            <el-option v-for="item in expressDeliveryList.value" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
           </el-select>
         </el-form-item>
       </el-form>
@@ -172,6 +172,7 @@ import PackTotal from "/src/views/production/shipment/print-order/packTotal.vue"
 
 const { proxy } = getCurrentInstance();
 const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const expressDeliveryList = ref([]);
 const sourceList = ref({
   data: [],
   pagination: {
@@ -398,6 +399,16 @@ const getDemandData = () => {
       );
     }
   });
+  proxy.post("/expressDelivery/page", { pageNum: 1, pageSize: 999 }).then((res) => {
+    if (res.rows && res.rows.length > 0) {
+      expressDeliveryList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.expressage,
+        };
+      });
+    }
+  });
 };
 getDemandData();
 const getList = async (req, status) => {

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

@@ -427,6 +427,7 @@ const route = useRoute();
 const submit = ref(null);
 const departmentList = ref([]);
 const activeNames = ref([]);
+const expressDeliveryList = ref([]);
 const formOption = reactive({
   inline: true,
   labelWidth: "120px",
@@ -509,7 +510,7 @@ const formConfig = computed(() => {
       type: "select",
       label: "选择快递",
       prop: "expressDeliveryId",
-      data: proxy.useUserStore().allDict["express_delivery"],
+      data: expressDeliveryList.value,
       itemWidth: 25,
       clearable: true,
     },
@@ -584,6 +585,16 @@ const getDemandData = () => {
       });
     }
   });
+  proxy.post("/expressDelivery/page", { pageNum: 1, pageSize: 999 }).then((res) => {
+    if (res.rows && res.rows.length > 0) {
+      expressDeliveryList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.expressage,
+        };
+      });
+    }
+  });
 };
 getDemandData();
 const drawingFileIndex = ref(0);

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

@@ -253,7 +253,7 @@
         </template>
         <template #expressDeliveryId>
           <div style="width: 100%">
-            {{ dictKeyValue(formData.data.sourcePlatform, useUserStore().allDict["express_delivery"]) }}
+            {{ dictKeyValue(formData.data.sourcePlatform, expressDeliveryList.value) }}
           </div>
         </template>
         <template #sourcePlatform>
@@ -343,6 +343,7 @@ const route = useRoute();
 const submit = ref(null);
 const departmentList = ref([]);
 const activeNames = ref([]);
+const expressDeliveryList = ref([]);
 const formOption = reactive({
   inline: true,
   labelWidth: "120px",
@@ -472,6 +473,16 @@ const getDemandData = () => {
       });
     }
   });
+  proxy.post("/expressDelivery/page", { pageNum: 1, pageSize: 999 }).then((res) => {
+    if (res.rows && res.rows.length > 0) {
+      expressDeliveryList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.expressage,
+        };
+      });
+    }
+  });
 };
 getDemandData();
 const drawingFileIndex = ref(0);