Merge branch 'dev' into 'master'

Dev

See merge request !185

src/api/podUsOrder.ts

@@ -583,6 +583,7 @@ export function reissueOrderApi(data: {
   ids: string
   ids: string
   reissueType: number
   reissueType: number
   trackingNumber?: string
   trackingNumber?: string
+  trackRegisterSelect?: number
   expressSheet: string
   expressSheet: string
 }) {
 }) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(

src/views/order/podUs/components/ReissueOrder.vue

@@ -21,6 +21,10 @@ const props = defineProps({
     type: Array,
     type: Array,
     default: () => [],
     default: () => [],
   },
   },
+  trackRegisterSelect: {
+    type: Number,
+    default: '',
+  },
 })
 })
 const formRules = {
 const formRules = {
   reissueType: {
   reissueType: {
@@ -64,6 +68,7 @@ const submit = async () => {
   await reissueOrderApi({
   await reissueOrderApi({
     ids: (props.selection as PodUsOrderListData[]).map(e => e.id).join(),
     ids: (props.selection as PodUsOrderListData[]).map(e => e.id).join(),
     reissueType: form.value.reissueType,
     reissueType: form.value.reissueType,
+    trackRegisterSelect: props.trackRegisterSelect,
     trackingNumber: form.value.trackingNumber,
     trackingNumber: form.value.trackingNumber,
     expressSheet: form.value.expressSheet,
     expressSheet: form.value.expressSheet,
   })
   })

src/views/order/podUs/index.vue

@@ -982,7 +982,7 @@
           </span>
           </span>
         </ElFormItem>
         </ElFormItem>
         <ElFormItem
         <ElFormItem
-          v-if="['WAIT_TRACK'].includes(status) && waitTrackStatus === 5"
+          v-if="['WAIT_TRACK'].includes(status) && [1,2,5].includes(waitTrackStatus)"
         >
         >
           <span class="item">
           <span class="item">
             <ElButton type="success" @click="reissueOrder">补发</ElButton>
             <ElButton type="success" @click="reissueOrder">补发</ElButton>
@@ -3153,6 +3153,7 @@
   <ReissueOrderComponent
   <ReissueOrderComponent
     ref="reissueOrderRef"
     ref="reissueOrderRef"
     :selection="selection"
     :selection="selection"
+    :trackRegisterSelect="waitTrackStatus"
     @success="handleSuccess"
     @success="handleSuccess"
   ></ReissueOrderComponent>
   ></ReissueOrderComponent>