fix: indent 若干零碎问题修复. 移除部分无用代码.

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

@@ -67,10 +67,7 @@ import { $t } from '@/i18n/index'
 defineComponent({
   name: 'ComponentDialogCalcPriceSetLCL',
 })
-const {
-  visible = false,
-  formData = {} as any,
-}  = defineProps<{
+const { visible = false, formData = {} as any } = defineProps<{
   visible: boolean
   formData: object
 }>()
@@ -88,7 +85,6 @@ watch(
 watch(
   () => form.value.unit_lcl,
   (value) => {
-    console.log('form.value.unit_lcl watch change')
     if (typeof Number(value) === 'number') {
       form.value.price = mathjs
         .chain(Number(value))

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

@@ -1,7 +1,7 @@
 <template>
   <div class="compnent-price-calc">
     <exportQuota
-      ref="compExportQuota"
+      ref="compExportQuotaRef"
       :product-info="productInfo"
       :export-form="exportForm"
       :step3-form-list="step3FormList"
@@ -1349,7 +1349,7 @@ let getCurrentPrice = (key: string | number, heavy: number) => {
   const target = setting.value[`${key}_airline`]
   let result = 0
   if (Array.isArray(target) && target.length) {
-    result = target.findIndex((i: any) => i.min < heavy && i.max > heavy)
+    result = target.findIndex((i: any) => i.min <= heavy && i.max > heavy)
   }
   return target[result].price
 }
@@ -1359,7 +1359,7 @@ let getCurrentPricePlus = (heavy: number) => {
 
   let result = 0
   if (Array.isArray(target) && target.length) {
-    result = target.findIndex((i: any) => i.min < heavy && i.max > heavy)
+    result = target.findIndex((i: any) => i.min <= heavy && i.max > heavy)
   }
 
   return target[result].price
@@ -1547,7 +1547,6 @@ let dtdChange = (data: any) => {
   generateStep3Form()
 }
 let openLCLDialog = (columnNum: number, rowNum: number) => {
-  console.log(columnNum, rowNum)
   lclData.value = {
     rowNum,
     columnNum,
@@ -1664,14 +1663,13 @@ let onExportFormSave = (data: any) => {
   })
 }
 
-const compExportQuotaRef = useTemplateRef('compExportQuota')
+const compExportQuotaRef = ref()
 let generate = () => {
-  const target: ShallowRef = compExportQuotaRef
   if (
-    target.value.generatePDF &&
-    typeof target.value.generatePDF === 'function'
+    compExportQuotaRef.value.generatePDF &&
+    typeof compExportQuotaRef.value.generatePDF === 'function'
   ) {
-    target.value.generatePDF()
+    compExportQuotaRef.value.generatePDF()
   }
 }
 </script>
@@ -1680,6 +1678,7 @@ let generate = () => {
 .compnent-price-calc {
   .custom-calc-price-dialog {
     margin-top: 0 !important;
+    margin-bottom: 0 !important;
     height: 100vh;
     .el-dialog__body {
       max-height: calc(100vh - 56px);

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

@@ -195,7 +195,7 @@ const city_short = {
 } as any
 
 const getLogoPath = () => {
-  return new URL('/logo.png', import.meta.url).href
+  return new URL('/assets/logo.png', import.meta.url).href
 }
 const getFreightType = (row: any) => {
   let result = 'Sea'
@@ -233,9 +233,9 @@ const generatePDF = () => {
     const multiple = Math.ceil(
       (lableListID[i]!.offsetTop + lableListID[i].clientHeight) / pageHeight,
     )
-    console.log('element在第', multiple, '页')
+    // console.log('element在第', multiple, '页')
     if (shouldSplit(lableListID, i, multiple * pageHeight)) {
-      console.log('\n在第', i, '个元素后插入\n')
+      // console.log('\n在第', i, '个元素后插入\n')
       const divParent = lableListID[i].parentNode as HTMLElement // 获取该div的父节点
       const newNode = document.createElement('div')
       newNode.className = 'empty-div'
@@ -322,6 +322,8 @@ const generatePDF = () => {
     document.querySelectorAll('.empty-div').forEach((i) => i.remove())
   })
 }
+// 把这个方法暴露给父组件, 否则无法在父组件被调用
+defineExpose({ generatePDF })
 const shouldSplit = (
   nodes: HTMLElement[],
   index: number,

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

@@ -570,7 +570,6 @@ const freightForm = ref<FormInstance>()
 const checkForm = (formEl: FormInstance | undefined) => {
   if (!formEl) return
   formEl.validate((valid: boolean) => {
-    // console.log(valid, 'valid')
     if (!valid) return
     saveSetting(form.value).then((response: any) => {
       if (response.code === 1) {

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

@@ -1041,12 +1041,12 @@ const {
   visible = 0,
   alreadyHasIndentCount = 0,
   parentId = 0,
-  dataForEdit = {} as any,
+  dataForEdit = { vendor_name: '' } as any,
 } = defineProps<{
   visible: number
   alreadyHasIndentCount?: number
-  parentId: number | string
-  dataForEdit: object
+  parentId?: number | string
+  dataForEdit?: object
 }>()
 const $mediaRegExp = inject('mediaRegExp') as RegExp
 const prefix = 'order.indent_edit_info.'
@@ -1136,7 +1136,6 @@ const vendorList = ref([] as any[][])
 const manualVendor = ref({} as any)
 
 const commonCopyFormItem = function (index: number, key: string) {
-  // console.log(index, key, 'index key')
   if (['vendor_id', 'vendor_name', 'vendor_phone'].includes(key)) {
     vendorList.value.splice(index + 1, 1, cloneDeep(vendorList.value[index]))
     forms.value[index + 1].vendor_name = forms.value[index].vendor_name
@@ -1439,7 +1438,7 @@ const commonCheck = (rule: any, value: any, cb: any) => {
   }
 }
 const close = (done = {} as any) => {
-  $emit('update:visible', false)
+  $emit('update:visible', 0)
   if (typeof done === 'function') done()
 }
 </script>

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

@@ -130,7 +130,6 @@ const checkForm = (formEl: FormInstance | undefined) => {
     loading.value = true
     applySKU(form.value)
       .then((response: any) => {
-        // console.log(response)
         if (response.code === 1) {
           ElNotification({
             title: '操作成功',

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

@@ -166,7 +166,6 @@ const clickNode = (obj: any) => {
 }
 const getCategory = () => {
   getCategoryTree().then((response: any) => {
-    // console.log(response)
     const res = response.result
     categoryList.value = res
     categoryList.value.forEach((i) => {

src/pages/indent-manage/indent/edit.vue

@@ -264,9 +264,10 @@
         </div>
       </template>
     </el-dialog>
-    <!-- <edit-info
-      :visible.sync="infoVisible"
-      @create="quotaCreated"></edit-info> -->
+    <editInfo
+      v-model:visible="infoVisible"
+      @create="quotaCreated"
+    ></editInfo>
     <sku-select
       v-model:visible="skuSelectVisible"
       @select="selectSku"
@@ -275,13 +276,7 @@
 </template>
 
 <script lang="ts" setup>
-import {
-  defineComponent,
-  ref,
-  watch,
-  nextTick,
-  inject,
-} from 'vue'
+import { defineComponent, ref, watch, nextTick, inject } from 'vue'
 import {
   ElButton,
   ElForm,
@@ -299,6 +294,7 @@ import type { FormInstance } from 'element-plus'
 import cloneDeep from 'lodash.clonedeep'
 import dayjs from 'dayjs'
 import ImageUpload from '@/components/ImageUpload.vue'
+import editInfo from './components/info.vue'
 
 import skuSelect from './components/skuSelect.vue'
 import { $t } from '@/i18n/index'

src/pages/indent-manage/indent/list.vue

@@ -860,13 +860,10 @@ const valuation = function (row: any) {
 }
 // 采纳
 const adopt = function (row: any, parentRow: any) {
-  // console.log(row, 'row')
-  // console.log(parentRow, 'parent row')
   const p = {
     id: parentRow.id,
     quote_id: row.id,
   }
-  console.log(p)
   setDefaultQuote(p).then((res: any) => {
     if (res.code === 1) {
       ElNotification({
@@ -943,7 +940,6 @@ watch(bigImageVisible, () => {
 const changeOrderID = ref('')
 const dialogChangeOrderVisible = ref(false)
 const onBtnChangeOrderClick = (row: any) => {
-  console.log('row')
   changeOrderID.value = row.id
   dialogChangeOrderVisible.value = true
 }

src/pages/indent-manage/login.vue

@@ -93,13 +93,11 @@ const tryLogin = () => {
     return
   }
   formRef.value.validate((valid: boolean) => {
-    console.log(valid, 'valid')
     if (!valid) {
       ElMessage.error('请检查账户密码输入')
       return
     }
     userAPI.login(form.value).then((res: any) => {
-      console.log(res, 'res')
       if (res.code !== 1) {
         ElMessage.error(res.msg || 'login error')
         return

src/pages/indent-manage/product/components/record.vue

@@ -78,7 +78,6 @@ const getRecord = () => {
       if (res.code !== 1) {
         return
       }
-      console.log(res, 'examine record')
       if (Array.isArray(res.result)) {
         record.value = res.result
       }