Merge branch 'dev_sorting_rule' into release_v2.27.0

src/views/order/allocationSortingRule/index.vue

@@ -271,14 +271,17 @@ const deleteArea = async (id: number) => {
     confirmButtonText: '确定',
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     cancelButtonText: '取消',
     type: 'warning',
     type: 'warning',
-  }).then(async () => {
+  })
+    .then(async () => {
       loading.value = true
       loading.value = true
       const res = await deleteAreaApi(id)
       const res = await deleteAreaApi(id)
       if (res.code !== 200) return
       if (res.code !== 200) return
       ElMessage.success('删除成功')
       ElMessage.success('删除成功')
       await getSortingRuleList()
       await getSortingRuleList()
     })
     })
+    .finally(() => {
       loading.value = false
       loading.value = false
+    })
 }
 }
 
 
 // 查看日志
 // 查看日志

src/views/order/podUs/PodMakeOrder.vue

@@ -186,7 +186,7 @@
 
 
                 <span class="box-top-item-box-index-text">号箱</span>
                 <span class="box-top-item-box-index-text">号箱</span>
 
 
-                <span style="font-size: 30px">放入第</span>
+                <span style="font-size: 30px; white-space: nowrap">放入第</span>
                 <div
                 <div
                   class="box-top-item-box-index-number"
                   class="box-top-item-box-index-number"
                   :style="{
                   :style="{
@@ -206,7 +206,7 @@
                     podOrderDetailsData.pickingNumber ===
                     podOrderDetailsData.pickingNumber ===
                       podOrderDetailsData.purchaseNumber
                       podOrderDetailsData.purchaseNumber
                   "
                   "
-                  style="font-size: 30px"
+                  style="font-size: 30px; white-space: nowrap"
                   >件已配齐</span
                   >件已配齐</span
                 >
                 >
                 <span v-else style="font-size: 30px">件商品</span>
                 <span v-else style="font-size: 30px">件商品</span>
@@ -1675,13 +1675,14 @@ const getSortingAreaList = async () => {
 .box-top-item-box-index-text {
 .box-top-item-box-index-text {
   margin-right: 15px;
   margin-right: 15px;
   font-size: 30px;
   font-size: 30px;
+  white-space: nowrap;
 }
 }
 .box-top-item-box-index-number {
 .box-top-item-box-index-number {
   font-size: 60px;
   font-size: 60px;
   color: red;
   color: red;
   display: inline-block;
   display: inline-block;
   text-align: center;
   text-align: center;
-  width: 80px;
+  flex: 1;
   font-weight: 600;
   font-weight: 600;
 }
 }
 .box-top-item-status {
 .box-top-item-status {