3 Commits bcd444a68d ... 00a32fb206

Author SHA1 Message Date
  peter 00a32fb206 fix: cargo集货.修复 转移航次成功后不继续执行流程 的问题. 2 weeks ago
  peter 2b698211fe change: indent.转单场景-sku选择组件禁用申请sku功能. 2 weeks ago
  peter 4d68e85950 change: indent计价.国外本地运费计算API参数调整. 2 weeks ago

+ 1 - 1
src/pages/cargo-consolidation-request/index.vue

@@ -1383,7 +1383,7 @@ const commitWithSDK = async () => {
         duration: 10000,
       })
     } else {
-      return
+      console.log(res2, '转移到临时航次成功')
     }
   }
   if (sendToTempShipFlag === false) {

+ 1 - 0
src/pages/indent-manage/indent/components/calcPrice/index.vue

@@ -676,6 +676,7 @@ let fetchFreightParams = async (flag = true) => {
       freight_type: formData.value.cal_city.type,
       postcode: formData.value.cal_city.postcode,
       moq: Number(item),
+      totalWeight: computedTotalWeight.value[index],
       size: {
         x: parseFloat(info.package_size_length),
         y: parseFloat(info.package_size_width),

+ 1 - 0
src/pages/indent-manage/indent/components/quoteRecord.vue

@@ -371,6 +371,7 @@
 
     <sku-select
       v-model:visible="skuSelectVisible"
+      :scene="'changeOrder'"
       @select="selectSku"
     ></sku-select>
   </div>

+ 10 - 4
src/pages/indent-manage/indent/components/skuSelect.vue

@@ -42,6 +42,7 @@
         </div>
         <div class="flex-auto pl-[24px]">
           <el-button
+            v-if="scene !== 'changeOrder'"
             type="primary"
             class="mb-2"
             @click="dialogApplySkuVisible = true"
@@ -78,6 +79,13 @@
               </div>
             </div>
           </div>
+          <div
+            v-else-if="scene === 'changeOrder'"
+            class="sku-area flex-auto flex items-center"
+            style="padding-left: 25%"
+          >
+            未找到你想要的Indent商品
+          </div>
           <div
             v-else
             class="sku-area flex-auto flex items-center"
@@ -127,7 +135,7 @@ defineComponent({
 })
 
 const $mediaRegExp = inject('mediaRegExp') as RegExp
-const { visible = false } = defineProps<{ visible: boolean }>()
+const { visible = false, scene = '' } = defineProps<{ visible: boolean; scene?: string }>()
 
 const $emit = defineEmits(['update:visible', 'select'])
 const defaultProps = {
@@ -226,9 +234,7 @@ const getSku = () => {
         return {
           ...item,
           images: t.map((i: string) => {
-            return $mediaRegExp.test(i)
-              ? i
-              : import.meta.env.VITE_APP_OSS_PREFIX + i
+            return $mediaRegExp.test(i) ? i : import.meta.env.VITE_APP_OSS_PREFIX + i
           }),
         }
       })