Browse Source

change: indent计价.国外本土运费调整为从api获取. 触发计价的逻辑重构.

peter 3 weeks ago
parent
commit
a1b4e46e42

+ 1 - 1
package.json

@@ -13,7 +13,7 @@
     "axios": "~0.27.2",
     "clipboard": "^2.0.11",
     "dayjs": "^1.11.17",
-    "element-plus": "2.10.7",
+    "element-plus": "2.11.2",
     "html2canvas": "^1.4.1",
     "js-cookie": "^3.0.5",
     "jspdf": "3.0.1",

+ 7 - 0
src/api/indent.js

@@ -151,3 +151,10 @@ export const downloadPDF = (data) =>
     method: 'post',
     data,
   })
+
+export const getForginCityFreightFunc = (data) =>
+  request({
+    url: '/indent/getWebShippingCost',
+    method: 'post',
+    data,
+  })

File diff suppressed because it is too large
+ 337 - 294
src/pages/indent-manage/indent/components/calcPrice/index.vue


+ 4 - 16
src/pages/indent-manage/indent/components/exportForm.vue

@@ -47,13 +47,9 @@
           :label="item.tabLabel"
         >
           <div class="flex items-center">
-            <el-input
-              v-model="form[`zdy_date_${item.typeNumber}_${item.number}`]"
-            ></el-input>
+            <el-input v-model="form[`zdy_date_${item.typeNumber}_${item.number}`]"></el-input>
             &nbsp;
-            <el-select
-              v-model="form[`cycle_name_${item.typeNumber}_${item.number}`]"
-            >
+            <el-select v-model="form[`cycle_name_${item.typeNumber}_${item.number}`]">
               <el-option value="weeks">weeks</el-option>
               <el-option value="business days">business days</el-option>
             </el-select>
@@ -103,15 +99,7 @@
 
 <script lang="ts" setup>
 import { defineComponent, ref, watch } from 'vue'
-import {
-  ElButton,
-  ElForm,
-  ElFormItem,
-  ElInput,
-  ElSelect,
-  ElDialog,
-  ElOption,
-} from 'element-plus'
+import { ElButton, ElForm, ElFormItem, ElInput, ElSelect, ElDialog, ElOption } from 'element-plus'
 import cloneDeep from 'lodash.clonedeep'
 defineComponent({
   name: 'ComponentIndentExportForm',
@@ -127,7 +115,7 @@ const {
   formData: object
   creatorOptions: any[]
   step3FormList: any[]
-  cityList: any[]
+  cityList?: any[]
 }>()
 const $emit = defineEmits(['update:visible', 'save'])
 const show = ref(false)

Some files were not shown because too many files changed in this diff