Merge branch 'dev' into 'master'

Dev

See merge request !50

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

@@ -45,7 +45,7 @@ const submitForm = async () => {
       visible.value = false
       visible.value = false
       emits('success')
       emits('success')
       await ElMessageBox.alert(
       await ElMessageBox.alert(
-        '请修改/刷新地址后取消物流重新创建物流订单、获取跟踪号、获取打印面单。',
+        '请修改/刷新地址后取消物流或者更换物流在重新创建物流订单、获取跟踪号、获取打印面单',
         '提示',
         '提示',
         {
         {
           type: 'warning',
           type: 'warning',

src/views/order/podUs/index.vue

@@ -1087,7 +1087,9 @@
                   <div
                   <div
                     :style="{
                     :style="{
                       visibility:
                       visibility:
-                        status === 'IN_PRODUCTION' || status === 'PICKING'
+                        status === 'IN_PRODUCTION' ||
+                        status === 'PICKING' ||
+                        status === 'TO_BE_ARRANGE'
                           ? 'visible'
                           ? 'visible'
                           : 'hidden',
                           : 'hidden',
                     }"
                     }"
@@ -1108,7 +1110,7 @@
                       {{ cardItem?.baseSku }}
                       {{ cardItem?.baseSku }}
                     </span>
                     </span>
                   </div>
                   </div>
-                  <div class="grid-item">
+                  <div v-if="status !== 'TO_BE_ARRANGE'" class="grid-item">
                     <span class="grid-item-label">补胚数量：</span>
                     <span class="grid-item-label">补胚数量：</span>
                     <span class="grid-item-value">
                     <span class="grid-item-value">
                       {{ cardItem?.replenishmentNum || 0 }}
                       {{ cardItem?.replenishmentNum || 0 }}
@@ -1821,7 +1823,7 @@ const handleRefreshAddress = async (row: PodUsOrderListData) => {
   }
   }
   await refreshAddressApi([row.id])
   await refreshAddressApi([row.id])
   await ElMessageBox.alert(
   await ElMessageBox.alert(
-    '请修改/刷新地址后取消物流重新创建物流订单、获取跟踪号、获取打印面单。',
+    '请修改/刷新地址后取消物流或者更换物流在重新创建物流订单、获取跟踪号、获取打印面单',
     '提示',
     '提示',
     {
     {
       type: 'warning',
       type: 'warning',
@@ -2236,7 +2238,7 @@ const downloadTif = async (type: string) => {
       tifDownloadLoading.value = false
       tifDownloadLoading.value = false
     } else {
     } else {
       fetch(url)
       fetch(url)
-        .then(response => {
+        .then((response) => {
           // 确保响应是 OK
           // 确保响应是 OK
           if (!response.ok) {
           if (!response.ok) {
             throw new Error('网络响应错误')
             throw new Error('网络响应错误')
@@ -2244,15 +2246,17 @@ const downloadTif = async (type: string) => {
           // 返回图片的二进制数据（Blob）
           // 返回图片的二进制数据（Blob）
           return response.blob()
           return response.blob()
         })
         })
-        .then(blob => {
+        .then((blob) => {
           const a = document.createElement('a')
           const a = document.createElement('a')
           a.href = window.URL.createObjectURL(blob)
           a.href = window.URL.createObjectURL(blob)
           a.target = '_blank'
           a.target = '_blank'
-          a.download = (res.message as string).split('/')[ (res.message as string).split('/').length - 1]
+          a.download = (res.message as string).split('/')[
+            (res.message as string).split('/').length - 1
+          ]
           a.click()
           a.click()
           pngDownloadLoading.value = false
           pngDownloadLoading.value = false
         })
         })
-        .catch(error => {
+        .catch((error) => {
           console.error('下载图片时出错:', error)
           console.error('下载图片时出错:', error)
           pngDownloadLoading.value = false
           pngDownloadLoading.value = false
         })
         })