.env.development

@@ -2,5 +2,5 @@ VITE_CRM_PATH=https://crm.zoho.com/crm/ShowHomePage.do
 VITE_PO_PATH=https://crm.zoho.com/crm/org742735154/tab/PurchaseOrders/
 VITE_PO_APPEND=/canvas/4791186000049921685
 VITE_API_PREFIX='//zohocrmapi.promocollection.com.au'
-VITE_API2_PREFIX='/bpi'
+VITE_API2_PREFIX='//zohocrmapi.promocollection.com.au'
 VITE_APP_OSS_PREFIX = '//promocollection.s3.ap-southeast-2.amazonaws.com'

src/pages/indent-manage/indent/components/calcPrice/index.vue

@@ -7,8 +7,9 @@
       :step3-form-list="step3FormList"
       :step2-form-list="formList"
       :creator-options="creatorOptions"
-      :city="formData.cal_city.local_city"
+      :city="exportForm.pdf_city"
     ></exportQuota>
+    <!-- :city="formData.cal_city.local_city" -->
     <el-dialog
       v-model="show"
       class="custom-calc-price-dialog"
@@ -43,6 +44,7 @@
               v-model="formData.cal_city.local_city"
               style="width: 120px; margin-right: 12px"
               size="small"
+              @change="($e) => (exportForm.pdf_city = $e)"
             >
               <el-option
                 v-for="city in cityList"
@@ -485,6 +487,7 @@
         :step3-form-list="step3FormList"
         :creator-options="creatorOptions"
         :form-data="exportForm"
+        :city-list="cityList"
         @save="onExportFormSave"
       ></CompExportForm>
     </el-dialog>
@@ -558,6 +561,7 @@ const formData = ref({
 
 // 导出pdf那个表单
 let exportForm = ref({
+  city: '', // 显示在导出pdf的城市地址, 不是step2的运费选择地址.
   exchange: '',
   days: '30',
   gst_name: '+GST',
@@ -733,6 +737,7 @@ let resetData = () => {
     cal_shipment_method: {},
   }
   exportForm.value = {
+    pdf_city: '',
     cycle_name: '',
     exchange: '',
     days: '30',
@@ -1025,6 +1030,7 @@ let initForm = (switchStatus = [] as any[], useOldFormData = false) => {
       formList.value.push(t)
     })
     exportForm.value = {
+      pdf_city: productInfo.value.save_cal.pdf_city || cityList.value[0],
       exchange: productInfo.value.save_cal.exchange || '',
       days: productInfo.value.save_cal.days || '',
       gst_name: productInfo.value.save_cal.gst_name || '+GST',
@@ -1230,7 +1236,7 @@ let setFreight = () => {
   productInfo.value.number.forEach((item: any, index: number) => {
     // 早起的需求限制3个, 现在暂定放开了. 限制的话, 超过3个的货物数量的运费直接就跳过不计算了.
     // if (index > 2) {
-      // return
+    // return
     // }
     const cityPrice = calcCityPrice(
       computedTotalWeight.value[index],

src/pages/indent-manage/indent/components/exportForm.vue

@@ -27,6 +27,19 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="Export PDF City">
+          <el-select
+            v-model="form.pdf_city"
+            filterable
+          >
+            <el-option
+              v-for="item in cityList"
+              :key="item"
+              :label="item"
+              :value="item"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item
           v-for="item in step3FormList"
           :key="item.tabLabel"
@@ -107,11 +120,13 @@ const {
   formData = {} as any,
   creatorOptions = [],
   step3FormList = [],
+  cityList = [],
 } = defineProps<{
   visible: boolean
   formData: object
   creatorOptions: any[]
   step3FormList: any[]
+  cityList: any[]
 }>()
 const $emit = defineEmits(['update:visible', 'save'])
 const show = ref(false)

src/pages/indent-manage/indent/components/exportQuota.vue

@@ -141,7 +141,7 @@
         <div class="notes">{{ productInfo.notes }}</div>
       </div> -->
 
-      <div class="price-valid-info">
+      <div class="pb-2">
         Freight to {{ city_short[city] }} is included.Price based on exchange
         rate of {{ exportForm.exchange }}. Price is only valid for
         {{ exportForm.days }} days.
@@ -153,7 +153,31 @@
         class="background other-picture"
         :style="{ backgroundImage: `url(${item})` }"
       ></div>
+      <div class="w-[2px] h-[32px]"></div>
+      <div class="leading-5">
+        <a
+          :href="mainPicture"
+          class="break-all text-sky-700"
+        >
+          {{ mainPicture }}
+        </a>
+      </div>
+      <div class="mb-[12pt]">
+        <div
+          v-for="p in otherPicture"
+          :key="p"
+          class="leading-5"
+        >
+          <a
+            :href="p"
+            class="break-all text-sky-700"
+          >
+            {{ p }}
+          </a>
+        </div>
+      </div>
 
+      <div class="w-[2px] h-[8px]"></div>
       <div class="end-flag flex justify-center items-center">
         <div class="end-line"></div>
         <div class="end-text flex justify-center items-center">End</div>
@@ -427,10 +451,6 @@ $subColor: #777;
     width: 100%;
   }
 }
-.price-valid-info {
-  // margin-bottom: 12pt;
-  padding-bottom: 12pt;
-}
 .other-picture {
   display: inline-block;
   height: 150pt;