对接快递100

.env.development

@@ -1,6 +1,6 @@
 VITE_APP_NAME=后台管理(开发环境)
-#VITE_API_URL=http://127.0.0.1:9200/api
+VITE_API_URL=http://127.0.0.1:9200/api
 #VITE_SERVER_API_URL=http://127.0.0.1:8000/api
 
 
-VITE_API_URL=https://cms-api.websoft.top/api
+#VITE_API_URL=https://cms-api.websoft.top/api

src/views/shop/shopOrder/components/deliveryModal.vue

@@ -20,7 +20,7 @@
       <a-form-item label="配送方式" name="deliveryType">
         <a-radio-group v-model:value="form.deliveryType">
           <a-radio :value="0">
-            <span style="color: #1890ff;">快递配送</span>
+            <span style="color: #1890ff">快递配送</span>
           </a-radio>
           <a-radio :value="1">无需发货</a-radio>
           <a-radio :value="2">商家送货</a-radio>
@@ -31,7 +31,7 @@
       <a-form-item label="发货类型" name="deliveryMethod">
         <a-radio-group v-model:value="form.deliveryMethod">
           <a-radio value="manual">
-            <span style="color: #1890ff;">手动填写</span>
+            <span style="color: #1890ff">手动填写</span>
           </a-radio>
           <a-radio value="print">电子面单打印</a-radio>
         </a-radio-group>
@@ -69,27 +69,50 @@
         </a-row>
       </a-form-item>
 
-      <!-- 快递单号 -->
+      <template v-if="form.deliveryType === 0">
-      <a-form-item
+        <a-form-item label="发货人" name="sendName">
-        label="快递单号"
+          <a-input
-        name="trackingNumber"
+            v-model:value="form.sendName"
-        v-if="form.deliveryType === 0"
+            placeholder="请输入发货人"
-      >
+            :maxlength="50"
-        <a-input
+          />
-          v-model:value="form.trackingNumber"
+        </a-form-item>
-          placeholder="请输入快递单号"
+        <a-form-item label="发货人联系方式" name="sendPhone">
-          :maxlength="50"
+          <a-input
-        />
+            v-model:value="form.sendPhone"
-      </a-form-item>
+            placeholder="请输入发货人联系方式"
+            :maxlength="50"
+          />
+        </a-form-item>
+        <a-form-item label="发货地址" name="sendAddress">
+          <a-input
+            v-model:value="form.sendAddress"
+            placeholder="请输入发货地址"
+          />
+        </a-form-item>
+      </template>
 
-      <!-- 分单发货 -->
+      <!-- 快递单号 -->
-      <a-form-item label="分单发货" v-if="form.deliveryType === 0">
+      <!--      <a-form-item-->
-        <a-switch
+      <!--        label="快递单号"-->
-          v-model:checked="form.partialDelivery"
+      <!--        name="trackingNumber"-->
-          checked-children="支持"
+      <!--        v-if="form.deliveryType === 0"-->
-          un-checked-children="不支持"
+      <!--      >-->
-        />
+      <!--        <a-input-->
-      </a-form-item>
+      <!--          v-model:value="form.trackingNumber"-->
+      <!--          placeholder="请输入快递单号"-->
+      <!--          :maxlength="50"-->
+      <!--        />-->
+      <!--      </a-form-item>-->
+
+      <!--      &lt;!&ndash; 分单发货 &ndash;&gt;-->
+      <!--      <a-form-item label="分单发货" v-if="form.deliveryType === 0">-->
+      <!--        <a-switch-->
+      <!--          v-model:checked="form.partialDelivery"-->
+      <!--          checked-children="支持"-->
+      <!--          un-checked-children="不支持"-->
+      <!--        />-->
+      <!--      </a-form-item>-->
 
       <!-- 发货备注 -->
       <a-form-item label="发货备注" name="deliveryNote">
@@ -123,189 +146,197 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive, watch } from 'vue';
+  import { ref, reactive, watch } from 'vue';
-import { Form, message } from 'ant-design-vue';
+  import { Form, message } from 'ant-design-vue';
-import { ShopOrder } from '@/api/shop/shopOrder/model';
+  import { ShopOrder } from '@/api/shop/shopOrder/model';
-import { updateShopOrder } from '@/api/shop/shopOrder';
+  import { updateShopOrder } from '@/api/shop/shopOrder';
-import { listShopExpress } from '@/api/shop/shopExpress';
+  import { listShopExpress } from '@/api/shop/shopExpress';
-import { ShopExpress } from '@/api/shop/shopExpress/model';
+  import { ShopExpress } from '@/api/shop/shopExpress/model';
-import { toDateString } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
-import dayjs, { Dayjs } from 'dayjs';
+  import dayjs, { Dayjs } from 'dayjs';
-import ExpressSettingModal from './expressSettingModal.vue';
+  import ExpressSettingModal from './expressSettingModal.vue';
 
-const useForm = Form.useForm;
+  const useForm = Form.useForm;
 
-const props = defineProps<{
+  const props = defineProps<{
-  visible: boolean;
+    visible: boolean;
-  data?: ShopOrder | null;
+    data?: ShopOrder | null;
-}>();
+  }>();
 
-const emit = defineEmits<{
+  const emit = defineEmits<{
-  (e: 'update:visible', visible: boolean): void;
+    (e: 'update:visible', visible: boolean): void;
-  (e: 'done'): void;
+    (e: 'done'): void;
-}>();
+  }>();
 
-// 表单数据
+  // 表单数据
-const form = reactive({
+  const form = reactive({
-  deliveryType: 0, // 0快递配送 1无需发货 2商家送货
+    deliveryType: 0, // 0快递配送 1无需发货 2商家送货
-  deliveryMethod: 'manual', // manual手动填写 print电子面单打印
+    deliveryMethod: 'manual', // manual手动填写 print电子面单打印
-  expressId: undefined as number | undefined,
+    expressId: undefined as number | undefined,
-  expressName: '',
+    expressName: '',
-  trackingNumber: '',
+    trackingNumber: '',
-  partialDelivery: false,
+    partialDelivery: false,
-  deliveryNote: '',
+    deliveryNote: '',
-  deliveryTime: dayjs() as Dayjs
+    sendName: '',
-});
+    sendPhone: '',
+    sendAddress: '',
+    deliveryTime: dayjs() as Dayjs
+  });
 
-// 表单验证规则
+  // 表单验证规则
-const rules = {
+  const rules = {
-  deliveryType: [
+    deliveryType: [{ required: true, message: '请选择配送方式' }],
-    { required: true, message: '请选择配送方式' }
+    deliveryMethod: [{ required: true, message: '请选择发货类型' }],
-  ],
+    expressId: [
-  deliveryMethod: [
+      {
-    { required: true, message: '请选择发货类型' }
+        required: true,
-  ],
+        message: '请选择快递公司',
-  expressId: [
+        validator: (_: any, value: any) => {
-    {
+          if (form.deliveryType === 0 && !value) {
-      required: true,
+            return Promise.reject('请选择快递公司');
-      message: '请选择快递公司',
+          }
-      validator: (_: any, value: any) => {
+          return Promise.resolve();
-        if (form.deliveryType === 0 && !value) {
-          return Promise.reject('请选择快递公司');
         }
-        return Promise.resolve();
       }
+    ],
+    // trackingNumber: [
+    //   {
+    //     required: true,
+    //     message: '请输入快递单号',
+    //     validator: (_: any, value: any) => {
+    //       if (form.deliveryType === 0 && !value) {
+    //         return Promise.reject('请输入快递单号');
+    //       }
+    //       return Promise.resolve();
+    //     }
+    //   }
+    // ],
+    deliveryTime: [{ required: true, message: '请选择发货时间' }],
+    sendName: [{ required: true, message: '请输入发货人' }],
+    sendPhone: [{ required: true, message: '请输入发货人联系方式' }],
+    sendAddress: [{ required: true, message: '请输入发货地址' }],
+
+  };
+
+  const formRef = ref();
+  const { resetFields, validate } = useForm(form, rules);
+
+  // 状态
+  const loading = ref(false);
+  const expressList = ref<ShopExpress[]>([]);
+  const expressModalVisible = ref(false);
+
+  // 加载快递公司列表
+  const loadExpressList = async () => {
+    try {
+      const data = await listShopExpress({});
+      expressList.value = data || [];
+    } catch (error) {
+      console.error('加载快递公司失败:', error);
     }
-  ],
+  };
-  trackingNumber: [
+
-    {
+  // 快递公司筛选
-      required: true,
+  const filterExpressOption = (input: string, option: any) => {
-      message: '请输入快递单号',
+    return option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
-      validator: (_: any, value: any) => {
+  };
-        if (form.deliveryType === 0 && !value) {
+
-          return Promise.reject('请输入快递单号');
+  // 快递公司选择变化
-        }
+  const onExpressChange = (value: number) => {
-        return Promise.resolve();
+    const express = expressList.value.find((item) => item.expressId === value);
-      }
+    if (express) {
+      form.expressName = express.expressName || '';
     }
-  ],
+  };
-  deliveryTime: [
-    { required: true, message: '请选择发货时间' }
-  ]
-};
 
-const formRef = ref();
+  // 打开快递公司设置
-const { resetFields, validate } = useForm(form, rules);
+  const openExpressModal = () => {
+    expressModalVisible.value = true;
+  };
 
-// 状态
+  // 更新弹窗显示状态
-const loading = ref(false);
+  const updateVisible = (visible: boolean) => {
-const expressList = ref<ShopExpress[]>([]);
+    emit('update:visible', visible);
-const expressModalVisible = ref(false);
+  };
 
-// 加载快递公司列表
+  // 取消
-const loadExpressList = async () => {
+  const handleCancel = () => {
-  try {
-    const data = await listShopExpress({});
-    expressList.value = data || [];
-  } catch (error) {
-    console.error('加载快递公司失败:', error);
-  }
-};
-
-// 快递公司筛选
-const filterExpressOption = (input: string, option: any) => {
-  return option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
-};
-
-// 快递公司选择变化
-const onExpressChange = (value: number) => {
-  const express = expressList.value.find(item => item.expressId === value);
-  if (express) {
-    form.expressName = express.expressName || '';
-  }
-};
-
-// 打开快递公司设置
-const openExpressModal = () => {
-  expressModalVisible.value = true;
-};
-
-// 更新弹窗显示状态
-const updateVisible = (visible: boolean) => {
-  emit('update:visible', visible);
-};
-
-// 取消
-const handleCancel = () => {
-  updateVisible(false);
-};
-
-// 提交发货
-const handleSubmit = async () => {
-  try {
-    await validate();
-    loading.value = true;
-
-    const deliveryTime = toDateString(form.deliveryTime.toDate(), 'yyyy-MM-dd HH:mm:ss');
-
-    const updateData = {
-      ...props.data,
-      deliveryStatus: 20, // 已发货
-      deliveryType: form.deliveryType,
-      deliveryTime: deliveryTime,
-      deliveryNote: form.deliveryNote
-    };
-
-    // 如果是快递配送，添加快递信息
-    if (form.deliveryType === 0) {
-      updateData.expressId = form.expressId;
-      updateData.expressName = form.expressName;
-      updateData.trackingNumber = form.trackingNumber;
-    }
-
-    // 分单发货
-    if(form.partialDelivery){
-      updateData.deliveryStatus = 30;
-    }
-
-    await updateShopOrder(updateData);
-
-    message.success('发货成功');
-    emit('done');
     updateVisible(false);
-  } catch (error: any) {
+  };
-    message.error(error.message || '发货失败');
-  } finally {
-    loading.value = false;
-  }
-};
 
-// 监听弹窗显示状态
+  // 提交发货
-watch(
+  const handleSubmit = async () => {
-  () => props.visible,
+    try {
-  (visible) => {
+      await validate();
-    if (visible) {
+      loading.value = true;
-      // 重置表单
-      form.deliveryType = 0;
-      form.deliveryMethod = 'manual';
-      form.expressId = undefined;
-      form.expressName = '';
-      form.trackingNumber = '';
-      form.partialDelivery = false;
-      form.deliveryNote = '';
-      form.deliveryTime = dayjs();
 
-      // 加载快递公司列表
+      const deliveryTime = toDateString(
-      loadExpressList();
+        form.deliveryTime.toDate(),
-    } else {
+        'yyyy-MM-dd HH:mm:ss'
-      resetFields();
+      );
+
+      const updateData = {
+        ...props.data,
+        deliveryStatus: 20, // 已发货
+        deliveryType: form.deliveryType,
+        deliveryTime: deliveryTime,
+        deliveryNote: form.deliveryNote,
+      };
+
+      // 如果是快递配送，添加快递信息
+      if (form.deliveryType === 0) {
+        updateData.expressId = form.expressId;
+        updateData.sendName = form.sendName;
+        updateData.sendPhone = form.sendPhone;
+        updateData.sendAddress = form.sendAddress;
+        // updateData.expressName = form.expressName;
+        // updateData.trackingNumber = form.trackingNumber;
+      }
+
+      // 分单发货
+      if (form.partialDelivery) {
+        updateData.deliveryStatus = 30;
+      }
+
+      await updateShopOrder(updateData);
+
+      message.success('发货成功');
+      emit('done');
+      updateVisible(false);
+    } catch (error: any) {
+      console.log(error)
+      message.error(error.message || '发货失败');
+    } finally {
+      loading.value = false;
     }
-  }
+  };
-);
+
+  // 监听弹窗显示状态
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        // 重置表单
+        form.deliveryType = 0;
+        form.deliveryMethod = 'manual';
+        form.expressId = undefined;
+        form.expressName = '';
+        form.trackingNumber = '';
+        form.partialDelivery = false;
+        form.deliveryNote = '';
+        form.deliveryTime = dayjs();
+
+        // 加载快递公司列表
+        loadExpressList();
+      } else {
+        resetFields();
+      }
+    }
+  );
 </script>
 
 <style scoped>
-.ant-radio-wrapper {
+  .ant-radio-wrapper {
-  margin-right: 16px;
+    margin-right: 16px;
-}
+  }
 </style>

src/views/shop/shopOrder/components/orderInfo.vue

@@ -386,6 +386,43 @@
         </a-descriptions>
       </a-spin>
     </a-card>
+    <a-card v-if="form.shopOrderDelivery" title="发货信息" style="margin-bottom: 20px" :bordered="false">
+      <a-spin :spinning="loading">
+        <a-descriptions :column="2">
+          <a-descriptions-item
+            label="发货人"
+            :labelStyle="{ width: '90px', color: '#808080' }"
+          >
+            {{ form.shopOrderDelivery.sendName || '未填写' }}
+          </a-descriptions-item>
+          <a-descriptions-item
+            label="联系电话"
+            :labelStyle="{ width: '90px', color: '#808080' }"
+          >
+            {{ form.shopOrderDelivery.sendPhone || '未填写' }}
+          </a-descriptions-item>
+          <a-descriptions-item
+            label="发货地址"
+            :labelStyle="{ width: '90px', color: '#808080' }"
+            :span="2"
+          >
+            {{ form.shopOrderDelivery.sendAddress || '未填写' }}
+          </a-descriptions-item>
+          <a-descriptions-item
+            label="快递公司"
+            :labelStyle="{ width: '90px', color: '#808080' }"
+          >
+            {{ form.shopOrderDelivery.expressName || '未填写' }}
+          </a-descriptions-item>
+          <a-descriptions-item
+            label="物流单号"
+            :labelStyle="{ width: '90px', color: '#808080' }"
+          >
+            {{ form.shopOrderDelivery.expressNo || '未填写' }}
+          </a-descriptions-item>
+        </a-descriptions>
+      </a-spin>
+    </a-card>
 
     <a-card title="商品信息" style="margin-bottom: 20px" :bordered="false">
       <a-spin :spinning="loading">
@@ -640,6 +677,8 @@ const form = reactive<ShopOrder>({
   selfTakeCode: undefined,
   // 是否已收到赠品
   hasTakeGift: undefined,
+  // 发货信息
+  shopOrderDelivery: undefined
 });
 
 // 请求状态