2 Commits 71199916af ... 52508ce1b8

Tác giả SHA1 Thông báo Ngày
  peter 52508ce1b8 feat: cargo-consolidation-request增加货船轨迹地图插件. 1 tháng trước cách đây
  peter 94c50e8419 change: indent商品详情.其他信息字段文本换行处理. 1 tháng trước cách đây

+ 1 - 0
index.html

@@ -6,6 +6,7 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <meta name="keywords" content="zoho crm extend">
     <script src="/crm.sdk.js"></script>
+    <script src="https://tracking.4portun.com/sgld.umd.min.js?appId=AJY&version=1.0"></script>
    <title>crm_extend</title>
   </head>
   <body>

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

@@ -103,6 +103,18 @@
           label="船东"
           min-width="120"
         />
+        <el-table-column label="操作">
+          <template #default="scope">
+            <el-button
+              size="small"
+              type="warning"
+              link
+              @click="openMapDrawer(scope.row)"
+            >
+              查看轨迹
+            </el-button>
+          </template>
+        </el-table-column>
       </el-table>
       <div
         v-show="currentRow.Name?.length"
@@ -458,12 +470,34 @@
           :scene="'QC'"
         />
       </el-drawer>
+      <el-drawer
+        v-model:model-value="mapDrawerVisible"
+        :size="'1050px'"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        :destroy-on-close="true"
+        :with-header="false"
+        header-class="mb-1"
+      >
+        <div class="relative h-[20px]">
+          <span
+            @click="closeMapDrawer"
+            class="absolute top-[-16px] right-0 text-gray-600 text-sm cursor-pointer"
+          >
+            关闭地图窗口
+          </span>
+        </div>
+        <div
+          id="mapDrawer"
+          class="h-[100%]"
+        ></div>
+      </el-drawer>
     </div>
   </div>
 </template>
 
 <script lang="ts" setup>
-import { defineComponent, ref, watch, computed } from 'vue'
+import { defineComponent, ref, watch, computed, nextTick } from 'vue'
 import {
   ElButton,
   ElForm,
@@ -1043,6 +1077,26 @@ let computedTotalFOB = computed(() => {
     return t
   }, 0)
 })
+
+// 订单轨迹地图插件
+let mapDrawerVisible = ref(false)
+const openMapDrawer = (row: any) => {
+  mapDrawerVisible.value = true
+  console.log(row.Carrier, 'row.value.Carrier')
+  console.log(row.Booking_Number, 'row.value.Booking_Number')
+  if (window.Sgld) {
+    nextTick(() => {
+      window.Sgld.createContainerTrack({
+        id: 'mapDrawer',
+        carrierCode: row.Carrier, // 船公司代码
+        billNo: row.Booking_Number, // 提单号
+      })
+    })
+  }
+}
+const closeMapDrawer = () => {
+  mapDrawerVisible.value = false
+}
 </script>
 <style lang="scss">
 .page-cargo-consolidation {

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

@@ -38,7 +38,7 @@
         <div class="color-req">
           颜色定制要求: {{ productInfo.product_require_color }}
         </div>
-        <div class="other">其他信息: {{ productInfo.product_other }}</div>
+        <div class="other whitespace-pre-wrap">其他信息: {{ productInfo.product_other }}</div>
         <div class="note">备注: {{ productInfo.notes }}</div>
       </div>
     </div>

+ 1 - 1
src/pages/indent-manage/indent/components/exportQuota2.vue

@@ -132,7 +132,7 @@
 
             <p v-if="productInfo.product_other">
               <strong>More Details:</strong>
-              {{ productInfo.product_other }}
+              <span v-html="productInfo.product_other.replace(/\n/g, '<br>')"></span>
             </p>
           </td>
         </tr>