SHA1
--- a/.env.development
+++ b/.env.development
@@ -1,6 +1,8 @@
 
				 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_SO_PATH=https://crm.zoho.com/crm/org742735154/tab/SalesOrders/
			
 
				+VITE_SO_APPEND=/canvas/4791186000044787304
			
 
				 VITE_API_PREFIX='//zohocrmapi.promocollection.com.au'
			
 
				 VITE_API2_PREFIX='//zohocrmapi.promocollection.com.au'
			
 
				 VITE_APP_OSS_PREFIX = '//promocollection.s3.ap-southeast-2.amazonaws.com'
			
--- a/.env.production
+++ b/.env.production
@@ -1,6 +1,8 @@
 
				 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_SO_PATH=https://crm.zoho.com/crm/org742735154/tab/SalesOrders/
			
 
				+VITE_SO_APPEND=/canvas/4791186000044787304
			
 
				 VITE_API_PREFIX='//zohocrm.promocollection.com.au/api'
			
 
				 VITE_API2_PREFIX='//zohocrm.promocollection.com.au/api'
			
 
				 VITE_APP_OSS_PREFIX = '//promocollection.s3.ap-southeast-2.amazonaws.com'
			
--- a/index.html
+++ b/index.html
@@ -7,6 +7,7 @@
 
				     <meta name="keywords" content="zoho crm extend">
			
 
				     <script src="/crm.sdk.js"></script>
			
 
				    <title>crm_extend</title>
			
 
				+   <link href="/src/assets/tailwind.css" rel="stylesheet">
			
 
				   </head>
			
 
				   <body>
			
 
				     <div id="app"></div>
			
--- a/package.json
+++ b/package.json
@@ -11,12 +11,13 @@
 
				   },
			
 
				   "dependencies": {
			
 
				     "@element-plus/icons-vue": "^2.1.0",
			
 
				+    "@tailwindcss/vite": "^4.0.17",
			
 
				     "axios": "~0.27.2",
			
 
				     "dayjs": "^1.11.13",
			
 
				-    "element-plus": "2.9.1",
			
 
				+    "element-plus": "2.9.7",
			
 
				     "html2canvas": "^1.4.1",
			
 
				     "js-cookie": "^3.0.5",
			
 
				-    "jspdf": "^2.5.2",
			
 
				+    "jspdf": "3.0.1",
			
 
				     "lodash": "^4.17.21",
			
 
				     "lodash.clonedeep": "^4.5.0",
			
 
				     "lodash.debounce": "^4.0.8",
			
@@ -29,23 +30,23 @@
 
				   },
			
 
				   "devDependencies": {
			
 
				     "@nabla/vite-plugin-eslint": "^2.0.5",
			
 
				+    "@tailwindcss/vite": "^4.1.0",
			
 
				     "@types/js-cookie": "^3.0.6",
			
 
				     "@types/lodash.clonedeep": "^4.5.9",
			
 
				     "@types/lodash.debounce": "^4.0.9",
			
 
				     "@types/qrcode": "^1.5.5",
			
 
				     "@typescript-eslint/eslint-plugin": "^7.18.0",
			
 
				     "@typescript-eslint/parser": "^7.18.0",
			
 
				-    "@vitejs/plugin-vue": "^5.2.0",
			
 
				+    "@vitejs/plugin-vue": "^5.2.3",
			
 
				     "@vue/eslint-config-prettier": "^9.0.0",
			
 
				-    "autoprefixer": "^10.4.20",
			
 
				     "eslint": "^8.57.1",
			
 
				     "eslint-config-prettier": "^9.1.0",
			
 
				     "eslint-plugin-vue": "^9.32.0",
			
 
				-    "prettier": "^3.3.3",
			
 
				-    "sass": "^1.81.0",
			
 
				-    "tailwindcss": "^3.4.17",
			
 
				-    "typescript": "^5.6.3",
			
 
				-    "vite": "^5.4.11",
			
 
				-    "vue-tsc": "^2.2.0"
			
 
				+    "prettier": "^3.5.3",
			
 
				+    "sass": "^1.85.1",
			
 
				+    "tailwindcss": "^4.1.0",
			
 
				+    "typescript": "^5.8.2",
			
 
				+    "vite": "^6.2.4",
			
 
				+    "vue-tsc": "^2.2.8"
			
 
				   }
			
 
				 }
			
--- a/postcss.config.cjs
+++ b/postcss.config.cjs
@@ -1,9 +0,0 @@
 
				-// https://github.com/michael-ciniawsky/postcss-load-config
			
 
				-
			
 
				-module.exports = {
			
 
				-  'plugins': {
			
 
				-    tailwindcss: {},
			
 
				-    // to edit target browsers: use "browserslist" field in package.json
			
 
				-    'autoprefixer': {}
			
 
				-  }
			
 
				-}
			
--- a/src/App.vue
+++ b/src/App.vue
@@ -19,7 +19,6 @@ const locale = ref(zhCn)
 
				 </script>
			
 
				 
			
 
				 <style lang="scss">
			
 
				-@use '@/assets/css/tailwind.scss';
			
 
				 body {
			
 
				   position: relative;
			
 
				   margin: 0;
			
--- a/src/api/indent.js
+++ b/src/api/indent.js
@@ -136,3 +136,10 @@ export const generateOrder = (data) =>
 
				     method: 'post',
			
 
				     data,
			
 
				   })
			
 
				+
			
 
				+export const downloadPDF = (data) =>
			
 
				+  request({
			
 
				+    url: '/indent/export',
			
 
				+    method: 'post',
			
 
				+    data,
			
 
				+  })
			
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -43,4 +43,16 @@ export default {
 
				       method: 'POST',
			
 
				       data: params,
			
 
				     }),
			
 
				+  getAuditUser: (p) =>
			
 
				+    request({
			
 
				+      url: `/indent_checkusers/getList`,
			
 
				+      method: 'GET',
			
 
				+      params: p,
			
 
				+    }),
			
 
				+  setAuditUser: (p) =>
			
 
				+    request({
			
 
				+      url: `/indent_checkusers/addcheckuser`,
			
 
				+      method: 'POST',
			
 
				+      data: p,
			
 
				+    }),
			
 
				 }
			
--- a/src/assets/css/flex-custom.scss
+++ b/src/assets/css/flex-custom.scss
@@ -1,35 +0,0 @@
 
				-// 自定义flex布局class。vant-ui的布局默认带有flex-wrap，且有其他干扰，干脆自己定义
			
 
				-.flex {
			
 
				-  display: flex;
			
 
				-  align-content: flex-start; // 侧轴方向 行与行的对齐
			
 
				-  align-items: center; // 侧轴方向 行内item的对齐
			
 
				-  &.column {
			
 
				-    flex-direction: column; // 定义主轴方向
			
 
				-  }
			
 
				-  &.wrap {
			
 
				-    flex-wrap: wrap;
			
 
				-  }
			
 
				-  /* 主轴方向 item的对齐 */
			
 
				-  &.around {
			
 
				-    justify-content: space-around;
			
 
				-  }
			
 
				-  &.between {
			
 
				-    justify-content: space-between;
			
 
				-  }
			
 
				-  &.center {
			
 
				-    justify-content: center;
			
 
				-  }
			
 
				-  &.end {
			
 
				-    justify-content: flex-end;
			
 
				-  }
			
 
				-  &.baseline {
			
 
				-    align-items: baseline;
			
 
				-  }
			
 
				-  &.start {
			
 
				-    align-items: flex-start;
			
 
				-  }
			
 
				-  &.stretch {
			
 
				-    align-items: stretch;
			
 
				-  }
			
 
				-}
			
 
				-.flex-auto { flex: auto; }
			
--- a/src/assets/css/tailwind.scss
+++ b/src/assets/css/tailwind.scss
@@ -1,3 +0,0 @@
 
				-@tailwind base;
			
 
				-@tailwind components;
			
 
				-@tailwind utilities;
			
--- a/src/assets/tailwind.css
+++ b/src/assets/tailwind.css
@@ -0,0 +1,4 @@
 
				+/* @import "tailwindcss"; */
			
 
				+@layer theme, base, components, utilities;
			
 
				+@import 'tailwindcss/theme.css' layer(theme);
			
 
				+@import 'tailwindcss/utilities.css' layer(utilities);
			
--- a/src/components/print.vue
+++ b/src/components/print.vue
@@ -0,0 +1,384 @@
 
				+<template>
			
 
				+  <div class="flex flex-col items-stretch w-[24cm] max-w-[24cm]">
			
 
				+    <div class="flex justify-between">
			
 
				+      <div class="mb-2">
			
 
				+        <el-tooltip
			
 
				+          content="其实二维码在提交SO后就会自动刷新, 除非你点了右边的Clean QR Code"
			
 
				+        >
			
 
				+          <el-button
			
 
				+            class="custom-button"
			
 
				+            @click="reGenerateQrCode"
			
 
				+          >
			
 
				+            Generate QR Code
			
 
				+          </el-button>
			
 
				+        </el-tooltip>
			
 
				+        <el-tooltip content="除非你不想打印二维码">
			
 
				+          <el-button @click="qrcodeVisible = false">Clean QR Code</el-button>
			
 
				+        </el-tooltip>
			
 
				+      </div>
			
 
				+      <div>
			
 
				+        <el-button
			
 
				+          type="danger"
			
 
				+          @click="clean"
			
 
				+        >
			
 
				+          Clean Input Job
			
 
				+        </el-button>
			
 
				+        <el-tooltip content="确认下面的预览内容没问题再点打印">
			
 
				+          <el-button
			
 
				+            class="custom-button"
			
 
				+            :loading="printing"
			
 
				+            @click="onBtnPrint"
			
 
				+          >
			
 
				+            Print Page
			
 
				+          </el-button>
			
 
				+        </el-tooltip>
			
 
				+      </div>
			
 
				+    </div>
			
 
				+    <div class="">
			
 
				+      <el-form inline>
			
 
				+        <el-form-item
			
 
				+          v-if="scene === 'SO'"
			
 
				+          label="QR Code Content"
			
 
				+          class="text-left w-[100%]"
			
 
				+        >
			
 
				+          <div
			
 
				+            class="el-input el-input__wrapper el-input__inner cursor-not-allowed hover:cursor-not-allowed"
			
 
				+          >
			
 
				+            {{ selectedContent.map((i) => i.Reference).join(';') }}
			
 
				+          </div>
			
 
				+        </el-form-item>
			
 
				+
			
 
				+        <el-form-item
			
 
				+          label="Total Page"
			
 
				+          style="width: 20%"
			
 
				+          prop="total"
			
 
				+        >
			
 
				+          <el-input
			
 
				+            v-model.number="total"
			
 
				+            :type="'number'"
			
 
				+          ></el-input>
			
 
				+        </el-form-item>
			
 
				+        <el-form-item
			
 
				+          label="Text direction"
			
 
				+          style="width: 15%"
			
 
				+          prop="rotated"
			
 
				+        >
			
 
				+          <el-switch v-model="rotated"></el-switch>
			
 
				+        </el-form-item>
			
 
				+        <el-form-item
			
 
				+          label="Page width(CM)"
			
 
				+          style="width: 20%"
			
 
				+          prop="pageWidth"
			
 
				+        >
			
 
				+          <el-input
			
 
				+            v-model.number="pageWidth"
			
 
				+            :type="'number'"
			
 
				+          ></el-input>
			
 
				+        </el-form-item>
			
 
				+        <el-form-item
			
 
				+          label="Page Height(CM)"
			
 
				+          style="width: 20%"
			
 
				+          prop="pageHeight"
			
 
				+        >
			
 
				+          <el-input
			
 
				+            v-model.number="pageHeight"
			
 
				+            :type="'number'"
			
 
				+          ></el-input>
			
 
				+        </el-form-item>
			
 
				+
			
 
				+        <el-form-item
			
 
				+          label="Font Size"
			
 
				+          style="width: 50%"
			
 
				+        >
			
 
				+          <el-slider
			
 
				+            v-model="pdfFontSize"
			
 
				+            :step="1"
			
 
				+          ></el-slider>
			
 
				+        </el-form-item>
			
 
				+        <el-form-item
			
 
				+          style="width: 100%"
			
 
				+          label="箱唛"
			
 
				+        >
			
 
				+          <el-input
			
 
				+            v-model="mai"
			
 
				+            type="textarea"
			
 
				+          ></el-input>
			
 
				+        </el-form-item>
			
 
				+        <div class="flex gap-1">
			
 
				+          <div
			
 
				+            v-for="(item, index) in logoList"
			
 
				+            :key="item"
			
 
				+            class="w-[60px] h-[60px] bg-contain bg-center bg-no-repeat cursor-pointer"
			
 
				+            :style="{ backgroundImage: `url(${item})` }"
			
 
				+            @click="selectlogo(index)"
			
 
				+          ></div>
			
 
				+        </div>
			
 
				+      </el-form>
			
 
				+    </div>
			
 
				+    <br />
			
 
				+    <div class="flex flex-wrap">
			
 
				+      <div
			
 
				+        v-for="i in total"
			
 
				+        :key="i"
			
 
				+        :style="{
			
 
				+          width: `${pageWidth}cm`,
			
 
				+          height: `${pageHeight}cm`,
			
 
				+        }"
			
 
				+        class="pdf-wrap relative border border-solid border-gray-200 mb-2 mr-2"
			
 
				+      >
			
 
				+        <div
			
 
				+          :id="`pdfItem-${i}`"
			
 
				+          :ref="(el) => setElement(el, i)"
			
 
				+          class="pdf-area w-[100%] h-[100%] relative text-center p-4 flex flex-col items-stretch justify-center"
			
 
				+          :class="{}"
			
 
				+          :style="{
			
 
				+            width: rotated ? `${pageHeight}cm` : `${pageWidth}cm`,
			
 
				+            height: rotated ? `${pageWidth}cm` : `${pageHeight}cm`,
			
 
				+            transformOrigin: 'top left',
			
 
				+            transform: rotated ? 'rotate(90deg)' : '',
			
 
				+            right: rotated ? `-${pageWidth}cm` : '',
			
 
				+          }"
			
 
				+        >
			
 
				+          <!-- bottom: rotated ? `-${(i - 1) * (pageWidth - pageHeight)}cm` : '', -->
			
 
				+          <div
			
 
				+            class="mai font-medium break-all mb-4"
			
 
				+            :style="{
			
 
				+              fontSize: `${pdfFontSize}pt`,
			
 
				+            }"
			
 
				+            @dblclick="ElMessage.info('hello')"
			
 
				+          >
			
 
				+            {{ mai }}
			
 
				+          </div>
			
 
				+
			
 
				+          <div class="flex justify-center">
			
 
				+            <div class="font-medium text-5xl">{{ i }} / {{ total }}</div>
			
 
				+          </div>
			
 
				+          <div class="flex gap-1 absolute bottom-4 left-4">
			
 
				+            <div
			
 
				+              v-for="item in selectedLogo"
			
 
				+              :key="item"
			
 
				+              class="w-[90px] h-[90px] bg-contain bg-center bg-no-repeat"
			
 
				+              :style="{ backgroundImage: `url(${item})` }"
			
 
				+            ></div>
			
 
				+          </div>
			
 
				+          <div
			
 
				+            v-show="qrcodeVisible"
			
 
				+            class="qrcode absolute bottom-4 right-4 w-[110px] h-[110px] border border-solid border-gray-400"
			
 
				+          >
			
 
				+            <img
			
 
				+              v-show="qrcodeURL.length"
			
 
				+              style="width: 100%; height: auto"
			
 
				+              :src="qrcodeURL"
			
 
				+              alt="qr-code"
			
 
				+            />
			
 
				+          </div>
			
 
				+        </div>
			
 
				+      </div>
			
 
				+    </div>
			
 
				+  </div>
			
 
				+</template>
			
 
				+<!-- todo 后续so search如果有更新, 引用这个组件. -->
			
 
				+<script setup lang="ts">
			
 
				+import {
			
 
				+  defineComponent,
			
 
				+  defineProps,
			
 
				+  nextTick,
			
 
				+  ref,
			
 
				+  watch,
			
 
				+  computed,
			
 
				+} from 'vue'
			
 
				+import {
			
 
				+  ElMessage,
			
 
				+  ElInput,
			
 
				+  ElButton,
			
 
				+  ElForm,
			
 
				+  ElFormItem,
			
 
				+  ElSlider,
			
 
				+  ElTooltip,
			
 
				+  ElSwitch,
			
 
				+} from 'element-plus'
			
 
				+import jspdf from 'jspdf'
			
 
				+import qrcode from 'qrcode'
			
 
				+import html2canvas from 'html2canvas'
			
 
				+import debounce from 'lodash.debounce'
			
 
				+defineComponent({
			
 
				+  name: 'ComponentPrint',
			
 
				+})
			
 
				+const { content = [], scene = 'SO' } = defineProps<{
			
 
				+  content: any[]
			
 
				+  scene?: string
			
 
				+}>()
			
 
				+let selectedContent = ref([] as any[])
			
 
				+const mai = ref('')
			
 
				+watch(
			
 
				+  () => content,
			
 
				+  () => {
			
 
				+    selectedContent.value = content.slice()
			
 
				+    if (scene === 'SO') {
			
 
				+      mai.value = selectedContent.value
			
 
				+        .map((c: any) => `${c.Reference}_${c.Contract_Title}`)
			
 
				+        .join('; ')
			
 
				+    } else if (scene === 'QC') {
			
 
				+      mai.value = selectedContent.value.join('')
			
 
				+    }
			
 
				+    if (mai.value.length) {
			
 
				+      nextTick(() => {
			
 
				+        reGenerateQrCode()
			
 
				+      })
			
 
				+    }
			
 
				+  },
			
 
				+  { deep: true, immediate: true },
			
 
				+)
			
 
				+
			
 
				+const clean = () => {
			
 
				+  mai.value = ''
			
 
				+  selectedContent.value = []
			
 
				+}
			
 
				+let qrcodeVisible = ref(false)
			
 
				+let qrcodeURL = ref('')
			
 
				+async function reGenerateQrCode() {
			
 
				+  await qrcode.toDataURL(
			
 
				+    mai.value,
			
 
				+    { errorCorrectionLevel: 'H' },
			
 
				+    function (err: any, url: any) {
			
 
				+      qrcodeURL.value = url
			
 
				+    },
			
 
				+  )
			
 
				+  qrcodeVisible.value = true
			
 
				+}
			
 
				+
			
 
				+const pdfList = ref({} as any)
			
 
				+const setElement = (el: any, index: number) => {
			
 
				+  pdfList.value[`${index}`] = el
			
 
				+}
			
 
				+const getLogoPath = (path: string) => {
			
 
				+  return new URL(path, import.meta.url).href
			
 
				+}
			
 
				+
			
 
				+const logoList = ref([] as any[])
			
 
				+
			
 
				+async function getLogoList() {
			
 
				+  (
			
 
				+    [
			
 
				+      getLogoPath('/assets/label/heavy.png'),
			
 
				+      getLogoPath('/assets/label/keep_dry.png'),
			
 
				+      getLogoPath('/assets/label/place_up.png'),
			
 
				+      getLogoPath('/assets/label/care.png'),
			
 
				+      getLogoPath('/assets/label/glass.png'),
			
 
				+    ] as string[]
			
 
				+  ).forEach((i: string, index: number) => {
			
 
				+    fetch(i)
			
 
				+      .then((res) => res.blob())
			
 
				+      .then((blob) => (logoList.value[index] = URL.createObjectURL(blob)))
			
 
				+  })
			
 
				+}
			
 
				+getLogoList()
			
 
				+
			
 
				+const selectlogo = (index: number) => {
			
 
				+  const i = selectedLogoIndex.value.indexOf(index)
			
 
				+  if (i > -1) {
			
 
				+    selectedLogoIndex.value.splice(i, 1)
			
 
				+  } else {
			
 
				+    selectedLogoIndex.value.push(index)
			
 
				+  }
			
 
				+}
			
 
				+let selectedLogoIndex = ref([] as number[])
			
 
				+let selectedLogo = computed(() =>
			
 
				+  logoList.value.filter((i: any, index: number) =>
			
 
				+    selectedLogoIndex.value.includes(index),
			
 
				+  ),
			
 
				+)
			
 
				+
			
 
				+let total = ref(1 as number)
			
 
				+let pdfFontSize = ref(32)
			
 
				+let pageWidth = ref(20) // 目标pdf的页宽
			
 
				+let pageHeight = ref(10) // 目标pdf的页高
			
 
				+/**
			
 
				+ * 宽大于等于高
			
 
				+ */
			
 
				+let orientation = computed(() => pageWidth.value >= pageHeight.value)
			
 
				+let rotated = ref(false)
			
 
				+let pdf: any = null
			
 
				+let printing = ref(false)
			
 
				+const reGeneratePDF = debounce(function () {
			
 
				+  printing.value = true
			
 
				+  pdf = null
			
 
				+  pdf = new jspdf({
			
 
				+    orientation: orientation.value ? 'l' : 'p',
			
 
				+    unit: 'cm',
			
 
				+    format: [pageWidth.value, pageHeight.value],
			
 
				+  })
			
 
				+  const pool = []
			
 
				+  for (const key in pdfList.value) {
			
 
				+    if (Object.prototype.hasOwnProperty.call(pdfList.value, key)) {
			
 
				+      pool.push(generatePDF(pdfList.value[key], key))
			
 
				+    }
			
 
				+  }
			
 
				+  Promise.all(pool).then(() => {
			
 
				+    printing.value = false
			
 
				+  })
			
 
				+}, 300)
			
 
				+
			
 
				+watch(
			
 
				+  [
			
 
				+    total,
			
 
				+    mai,
			
 
				+    pdfFontSize,
			
 
				+    pageWidth,
			
 
				+    pageHeight,
			
 
				+    qrcodeVisible,
			
 
				+    rotated,
			
 
				+    selectedLogo,
			
 
				+  ],
			
 
				+  () => {
			
 
				+    nextTick(() => reGeneratePDF())
			
 
				+  },
			
 
				+)
			
 
				+async function onBtnPrint() {
			
 
				+  let fileName = ''
			
 
				+  switch (scene) {
			
 
				+    case 'QC':
			
 
				+      fileName = ''
			
 
				+      break
			
 
				+    default:
			
 
				+      fileName = selectedContent.value.map((i: any) => i.Reference).join('_')
			
 
				+  }
			
 
				+  window.open(
			
 
				+    // @ts-ignore 照着jspdf文档搬的...ts报错
			
 
				+    pdf.output('bloburl', {
			
 
				+      fileName,
			
 
				+    }),
			
 
				+  )
			
 
				+}
			
 
				+function generatePDF(pdfItem: HTMLElement, key: string) {
			
 
				+  return html2canvas(pdfItem, {
			
 
				+    allowTaint: true,
			
 
				+    useCORS: true,
			
 
				+    backgroundColor: '#fff', // 一定要设背景颜色，否则有的浏览器就会变花，比如Edge
			
 
				+    scale: 3, // 缩放倍率调整清晰度
			
 
				+  }).then((canvas) => {
			
 
				+    const width = canvas.width
			
 
				+    const height = canvas.height
			
 
				+    const image = new Image()
			
 
				+    const target = document.createElement('canvas')
			
 
				+    target.height = height
			
 
				+    target.width = width
			
 
				+    image.onload = function () {
			
 
				+      const ctx = target.getContext('2d')
			
 
				+      ctx?.drawImage(image, 0, 0)
			
 
				+      if (Number(key) > 1) pdf.addPage()
			
 
				+      pdf.addImage(
			
 
				+        target.toDataURL('image/jpeg', 1.0),
			
 
				+        'JPEG',
			
 
				+        0,
			
 
				+        0,
			
 
				+        pageWidth.value,
			
 
				+        pageHeight.value,
			
 
				+      )
			
 
				+    }
			
 
				+    image.src = canvas.toDataURL('image/jpeg', 1.0)
			
 
				+  })
			
 
				+}
			
 
				+</script>
			
 
				+
			
 
				+<style scoped></style>
			
--- a/src/pages/cargo-consolidation-request/index.vue
+++ b/src/pages/cargo-consolidation-request/index.vue
@@ -0,0 +1,1095 @@
 
				+<template>
			
 
				+  <div class="w-[100vw] bg-white page-cargo-consolidation">
			
 
				+    <div
			
 
				+      v-loading="loading"
			
 
				+      class="pt-2 w-[100%] min-h-[100vh]"
			
 
				+    >
			
 
				+      <el-form
			
 
				+        style="width: 100%"
			
 
				+        inline
			
 
				+        :loading="loading"
			
 
				+        @submit.prevent="getList"
			
 
				+      >
			
 
				+        <el-form-item label="ETD Range">
			
 
				+          <el-date-picker
			
 
				+            v-model="dateRange"
			
 
				+            type="daterange"
			
 
				+            unlink-panels
			
 
				+            clearable
			
 
				+            start-placeholder="Start date"
			
 
				+            end-placeholder="End date"
			
 
				+            :shortcuts="dateShortcuts"
			
 
				+          />
			
 
				+          <!-- :disabled-date="pickerOptions" -->
			
 
				+        </el-form-item>
			
 
				+        <el-form-item>
			
 
				+          <el-tooltip content="时间范围最好不要选太大, 不然数据太多会卡">
			
 
				+            <el-button
			
 
				+              class="custom-button"
			
 
				+              @click="getList"
			
 
				+            >
			
 
				+              Search
			
 
				+            </el-button>
			
 
				+          </el-tooltip>
			
 
				+        </el-form-item>
			
 
				+      </el-form>
			
 
				+
			
 
				+      <el-tabs v-model="currentTab">
			
 
				+        <el-tab-pane
			
 
				+          v-for="tab in tabs"
			
 
				+          :key="tab.value"
			
 
				+          :label="tab.label"
			
 
				+          :name="tab.value"
			
 
				+        ></el-tab-pane>
			
 
				+      </el-tabs>
			
 
				+      <el-table
			
 
				+        border
			
 
				+        :header-cell-style="{ backgroundColor: 'oklch(0.951 0.026 236.824)' }"
			
 
				+        :data="computedList"
			
 
				+        highlight-current-row
			
 
				+        style="width: 100%"
			
 
				+        max-height="330"
			
 
				+        @row-click="($e) => getSubList($e)"
			
 
				+      >
			
 
				+        <el-table-column
			
 
				+          prop="Name"
			
 
				+          label="Voyage Name"
			
 
				+        />
			
 
				+        <el-table-column
			
 
				+          prop="Forwarder"
			
 
				+          label="Forwarder"
			
 
				+          width="110"
			
 
				+        />
			
 
				+        <el-table-column
			
 
				+          prop="Port_From"
			
 
				+          label="Port From"
			
 
				+          width="100"
			
 
				+        />
			
 
				+        <el-table-column
			
 
				+          label="Port To"
			
 
				+          prop="Port_To"
			
 
				+          width="100"
			
 
				+        />
			
 
				+        <el-table-column
			
 
				+          prop="ETD"
			
 
				+          label="ETD"
			
 
				+          width="100"
			
 
				+        />
			
 
				+        <el-table-column
			
 
				+          prop="ETA"
			
 
				+          label="ETA"
			
 
				+          width="100"
			
 
				+        />
			
 
				+        <el-table-column
			
 
				+          prop="Cut_Off_Date"
			
 
				+          label="Cut Off"
			
 
				+          width="120"
			
 
				+        />
			
 
				+        <!-- <el-table-column
			
 
				+          label="Owner"
			
 
				+          width="100"
			
 
				+        >
			
 
				+          <template #default="scope">
			
 
				+            {{ scope.row.Owner.name }}
			
 
				+          </template>
			
 
				+        </el-table-column> -->
			
 
				+        <el-table-column
			
 
				+          prop="Status"
			
 
				+          label="Status"
			
 
				+          width="100"
			
 
				+        />
			
 
				+        <el-table-column
			
 
				+          label="Last Modify Time"
			
 
				+          width="180"
			
 
				+        >
			
 
				+          <template #default="scope">
			
 
				+            {{ dayjs(scope.row.Modified_Time).format('YYYY-MM-DD HH:mm:ss') }}
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+      </el-table>
			
 
				+      <div
			
 
				+        v-show="currentRow.Name?.length"
			
 
				+        class="flex justify-between mt-8"
			
 
				+      >
			
 
				+        <div class="flex">
			
 
				+          <div class="flex items-center mr-4">
			
 
				+            current clicked Voyage name:&nbsp;
			
 
				+            <div class="text-red-700 font-bold">
			
 
				+              {{ currentRow.Name }}
			
 
				+            </div>
			
 
				+          </div>
			
 
				+          <el-button
			
 
				+            v-if="
			
 
				+              ['可用', '已截仓'].includes(currentRow.Status) &&
			
 
				+              [
			
 
				+                '4791186000259693001',
			
 
				+                '4791186000022965001',
			
 
				+                '4791186000052269001',
			
 
				+              ].includes(currentUser)
			
 
				+            "
			
 
				+            size="small"
			
 
				+            type="danger"
			
 
				+            @click="ensure"
			
 
				+          >
			
 
				+            确认集货
			
 
				+          </el-button>
			
 
				+          <el-button
			
 
				+            v-if="currentTab === 'my_request'"
			
 
				+            size="small"
			
 
				+            @click="addBulkProduct"
			
 
				+          >
			
 
				+            Submit Bulk Production Request
			
 
				+          </el-button>
			
 
				+          <el-button
			
 
				+            v-if="currentTab === 'my_request'"
			
 
				+            size="small"
			
 
				+            @click="addSample"
			
 
				+          >
			
 
				+            Submit Sample Request
			
 
				+          </el-button>
			
 
				+          <el-button
			
 
				+            v-if="currentTab === 'my_request'"
			
 
				+            :disabled="subList.length < 1"
			
 
				+            size="small"
			
 
				+            type="danger"
			
 
				+            @click="generateSubList"
			
 
				+          >
			
 
				+            放弃下方表格改动
			
 
				+          </el-button>
			
 
				+          <el-button
			
 
				+            size="small"
			
 
				+            :disabled="subList.length < 1"
			
 
				+            @click="exportSubTable"
			
 
				+          >
			
 
				+            Export Excel File
			
 
				+          </el-button>
			
 
				+          <el-button
			
 
				+            v-if="currentTab === 'my_request'"
			
 
				+            :disabled="subList.length < 1"
			
 
				+            size="small"
			
 
				+            type="primary"
			
 
				+            class="custom-button small"
			
 
				+            @click="commit(ruleFormRef)"
			
 
				+          >
			
 
				+            Commit
			
 
				+          </el-button>
			
 
				+        </div>
			
 
				+        <div class="flex justify-between w-[350px]">
			
 
				+          <div class="flex">总重量: {{ computedWeight }}</div>
			
 
				+          <div class="flex">总体积: {{ computedCube }}</div>
			
 
				+          <div class="flex">总离岸价: {{ computedTotalFOB }}</div>
			
 
				+        </div>
			
 
				+      </div>
			
 
				+      <el-table
			
 
				+        class="mt-4"
			
 
				+        size="small"
			
 
				+        :data="subList"
			
 
				+        style="width: 100%"
			
 
				+        :row-style="calcRowStyle"
			
 
				+        :header-cell-style="{ backgroundColor: 'oklch(0.951 0.026 236.824)' }"
			
 
				+        :empty-text="
			
 
				+          currentRow.Name?.length
			
 
				+            ? '暂无数据'
			
 
				+            : '请点击voyage表格其中一行以查询相应记录'
			
 
				+        "
			
 
				+        border
			
 
				+      >
			
 
				+        <el-table-column
			
 
				+          fixed
			
 
				+          type="index"
			
 
				+          width="50"
			
 
				+        ></el-table-column>
			
 
				+        <el-table-column
			
 
				+          fixed
			
 
				+          label="CRM批次记录 (Batch Record)"
			
 
				+          width="220"
			
 
				+        >
			
 
				+          <template #default="scope">
			
 
				+            <el-select
			
 
				+              v-model="scope.row.batchRecord"
			
 
				+              size="small"
			
 
				+              :remote-method="debounce(search, 1500)"
			
 
				+              remote
			
 
				+              style="width: 100%"
			
 
				+              :loading="loading2"
			
 
				+              filterable
			
 
				+              clearable
			
 
				+              placeholder="非Sample行必填"
			
 
				+              :disabled="scope.row.Sample"
			
 
				+              @change="($e) => onBatchRecordChange($e, scope.$index)"
			
 
				+            >
			
 
				+              <el-option
			
 
				+                v-for="option in batchListOption.concat(qcList) as any[]"
			
 
				+                :key="option.id"
			
 
				+                :value="option.id"
			
 
				+                :label="
			
 
				+                  option.Name +
			
 
				+                  (option.Reference ? ` - ${option.Reference}` : '')
			
 
				+                "
			
 
				+              ></el-option>
			
 
				+            </el-select>
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+        <el-table-column
			
 
				+          label="User Notes"
			
 
				+          width="180"
			
 
				+          fixed
			
 
				+        >
			
 
				+          <template #default="scope">
			
 
				+            <el-input
			
 
				+              v-model="scope.row.User_Notes"
			
 
				+              size="small"
			
 
				+              :rows="2"
			
 
				+              type="textarea"
			
 
				+              @change="scope.row.editFlag = true"
			
 
				+            ></el-input>
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+        <el-table-column
			
 
				+          label="Sample"
			
 
				+          width="60"
			
 
				+          fixed
			
 
				+        >
			
 
				+          <template #default="scope">
			
 
				+            <el-checkbox v-model="scope.row.Sample"></el-checkbox>
			
 
				+            <div
			
 
				+              class="absolute transparent cursor-not-allowed w-[100%] h-[100%] top-0 left-0 z-[999]"
			
 
				+            ></div>
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+        <el-table-column
			
 
				+          label="箱数(Carton)"
			
 
				+          width="115"
			
 
				+        >
			
 
				+          <template #default="scope">
			
 
				+            <el-input
			
 
				+              v-model="scope.row.Carton"
			
 
				+              size="small"
			
 
				+              @change="scope.row.editFlag = true"
			
 
				+            ></el-input>
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+        <el-table-column
			
 
				+          label="唛头 (Marks & Nos)"
			
 
				+          width="220"
			
 
				+        >
			
 
				+          <template #default="scope">
			
 
				+            <el-input
			
 
				+              v-model="scope.row.Marks_Nos"
			
 
				+              size="small"
			
 
				+              @change="scope.row.editFlag = true"
			
 
				+            ></el-input>
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+        <el-table-column
			
 
				+          label="货物名称 (Description of Goods)"
			
 
				+          width="180"
			
 
				+        >
			
 
				+          <template #default="scope">
			
 
				+            <el-input
			
 
				+              v-model="scope.row.Description_of_Goods"
			
 
				+              size="small"
			
 
				+              @change="scope.row.editFlag = true"
			
 
				+            ></el-input>
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+        <el-table-column
			
 
				+          label="货物材质 (Material goods)"
			
 
				+          width="250"
			
 
				+        >
			
 
				+          <template #default="scope">
			
 
				+            <el-select
			
 
				+              v-model="scope.row.Material_of_Goods"
			
 
				+              size="small"
			
 
				+              multiple
			
 
				+              @change="scope.row.editFlag = true"
			
 
				+            >
			
 
				+              <el-option
			
 
				+                v-for="i in goodMaterialOption"
			
 
				+                :key="i"
			
 
				+                :value="i"
			
 
				+                :label="i"
			
 
				+              ></el-option>
			
 
				+            </el-select>
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+        <el-table-column
			
 
				+          label="数量(Qty)"
			
 
				+          width="110"
			
 
				+        >
			
 
				+          <template #default="scope">
			
 
				+            <el-input
			
 
				+              v-model="scope.row.Quantity"
			
 
				+              size="small"
			
 
				+              @change="scope.row.editFlag = true"
			
 
				+            ></el-input>
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+        <el-table-column
			
 
				+          label="单价(澳币/AUD) (Unit Price)"
			
 
				+          width="220"
			
 
				+        >
			
 
				+          <template #default="scope">
			
 
				+            <el-input
			
 
				+              v-model="scope.row.Unit_Price"
			
 
				+              size="small"
			
 
				+              @change="scope.row.editFlag = true"
			
 
				+            ></el-input>
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+        <el-table-column
			
 
				+          label="负责人(Owner)"
			
 
				+          fixed="right"
			
 
				+          width="140"
			
 
				+        >
			
 
				+          <template #default="scope">
			
 
				+            <el-input
			
 
				+              v-model="scope.row.Requester.name"
			
 
				+              size="small"
			
 
				+              disabled
			
 
				+            ></el-input>
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+        <el-table-column
			
 
				+          label="申请人(Sales Person)"
			
 
				+          fixed="right"
			
 
				+          width="140"
			
 
				+          prop="Sales_Person"
			
 
				+        >
			
 
				+          <template #default="scope">
			
 
				+            <el-input
			
 
				+              v-model="scope.row.Sales_Person"
			
 
				+              size="small"
			
 
				+              disabled
			
 
				+            ></el-input>
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+        <el-table-column
			
 
				+          v-if="currentTab === 'my_request'"
			
 
				+          fixed="right"
			
 
				+          label="更新时间"
			
 
				+          width="90"
			
 
				+        >
			
 
				+          <template #default="scope">
			
 
				+            <div v-if="scope.row.id">
			
 
				+              {{
			
 
				+                dayjs(scope.row.update_time || new Date()).format(
			
 
				+                  'YYYY-MM-DD HH:mm:ss',
			
 
				+                )
			
 
				+              }}
			
 
				+            </div>
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+        <el-table-column
			
 
				+          v-if="
			
 
				+            [
			
 
				+              '4791186000259693001',
			
 
				+              '4791186000022965001',
			
 
				+              '4791186000052269001',
			
 
				+            ].includes(currentUser)
			
 
				+          "
			
 
				+          fixed="right"
			
 
				+          label="action"
			
 
				+          width="95"
			
 
				+        >
			
 
				+          <template #default="scope">
			
 
				+            <el-tooltip
			
 
				+              content="新增未commit的行会被直接移除; 已commit的行只会标记, 正式commit后才会删除"
			
 
				+            >
			
 
				+              <el-button
			
 
				+                v-if="currentTab === 'my_request'"
			
 
				+                type="danger"
			
 
				+                size="small"
			
 
				+                link
			
 
				+                @click="() => onDeleteRow(scope.row, scope.$index)"
			
 
				+              >
			
 
				+                删除
			
 
				+              </el-button>
			
 
				+            </el-tooltip>
			
 
				+            <el-button
			
 
				+              size="small"
			
 
				+              link
			
 
				+              type="primary"
			
 
				+              @click="print(scope.row)"
			
 
				+            >
			
 
				+              打印
			
 
				+            </el-button>
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+        <el-table-column
			
 
				+          fixed="right"
			
 
				+          label="重量 (KG) (Weight)"
			
 
				+          width="70"
			
 
				+        >
			
 
				+          <template #default="scope">
			
 
				+            <el-input
			
 
				+              v-model="scope.row.Weight"
			
 
				+              size="small"
			
 
				+              @change="scope.row.editFlag = true"
			
 
				+            ></el-input>
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+        <el-table-column
			
 
				+          fixed="right"
			
 
				+          label="体积 m&sup3; (Cube)"
			
 
				+          width="70"
			
 
				+        >
			
 
				+          <template #default="scope">
			
 
				+            <el-input
			
 
				+              v-model="scope.row.Cube"
			
 
				+              size="small"
			
 
				+              @change="scope.row.editFlag = true"
			
 
				+            ></el-input>
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+        <el-table-column
			
 
				+          fixed="right"
			
 
				+          label="总离岸价 (澳币/AUD)(Total FOB)"
			
 
				+          width="150"
			
 
				+        >
			
 
				+          <template #default="scope">
			
 
				+            <el-input
			
 
				+              v-model="scope.row.Total_FOB"
			
 
				+              size="small"
			
 
				+              @change="scope.row.editFlag = true"
			
 
				+            ></el-input>
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+      </el-table>
			
 
				+
			
 
				+      <el-drawer
			
 
				+        v-model:model-value="printDrawerVisible"
			
 
				+        :size="'1050px'"
			
 
				+        :title="'打印唛 (注意先写完唛内容和宽高最后再调页数, 不然可能会很卡)'"
			
 
				+        :close-on-click-modal="false"
			
 
				+        :close-on-press-escape="false"
			
 
				+      >
			
 
				+        <comp-print
			
 
				+          v-if="printDrawerVisible"
			
 
				+          :content="[currentPrintRow.Marks_Nos || '']"
			
 
				+          :scene="'QC'"
			
 
				+        />
			
 
				+      </el-drawer>
			
 
				+    </div>
			
 
				+  </div>
			
 
				+</template>
			
 
				+
			
 
				+<script lang="ts" setup>
			
 
				+import { defineComponent, ref, watch, computed } from 'vue'
			
 
				+import {
			
 
				+  ElButton,
			
 
				+  ElForm,
			
 
				+  ElFormItem,
			
 
				+  ElInput,
			
 
				+  ElTabs,
			
 
				+  ElTabPane,
			
 
				+  ElTable,
			
 
				+  ElTableColumn,
			
 
				+  ElDatePicker,
			
 
				+  ElTooltip,
			
 
				+  ElSelect,
			
 
				+  ElOption,
			
 
				+  ElCheckbox,
			
 
				+  ElMessage,
			
 
				+  ElMessageBox,
			
 
				+  ElNotification,
			
 
				+  ElDrawer,
			
 
				+} from 'element-plus'
			
 
				+import type { FormInstance } from 'element-plus'
			
 
				+import cloneDeep from 'lodash.clonedeep'
			
 
				+import dayjs from 'dayjs'
			
 
				+import * as XLSX from 'xlsx'
			
 
				+import debounce from 'lodash.debounce'
			
 
				+import compPrint from '@/components/print.vue'
			
 
				+import request from '@/utils/axios'
			
 
				+// import { useRouter } from 'vue-router'
			
 
				+// const $router = useRouter()
			
 
				+// $router.push('/so-search')
			
 
				+defineComponent({
			
 
				+  name: 'ComponentCargoConsolidationRequest',
			
 
				+})
			
 
				+
			
 
				+const currentUser = ref('')
			
 
				+const currentUserName = ref('')
			
 
				+let loading = ref(false)
			
 
				+let list = ref([] as any[])
			
 
				+let currentTab = ref('all')
			
 
				+
			
 
				+let tabs = [
			
 
				+  {
			
 
				+    label: 'All',
			
 
				+    value: 'all',
			
 
				+  },
			
 
				+  {
			
 
				+    label: 'Avaliable',
			
 
				+    value: 'avaliable',
			
 
				+  },
			
 
				+  {
			
 
				+    label: 'Closed Voyage',
			
 
				+    value: 'voyage_closed',
			
 
				+  },
			
 
				+  {
			
 
				+    label: 'My Request',
			
 
				+    value: 'my_request',
			
 
				+  },
			
 
				+]
			
 
				+let computedList = computed(() => {
			
 
				+  return list.value.filter((i: any) => {
			
 
				+    let condition = true
			
 
				+    switch (currentTab.value) {
			
 
				+      case 'avaliable':
			
 
				+        condition = i.Status && i.Status === '可用'
			
 
				+        break
			
 
				+      case 'voyage_closed':
			
 
				+        condition = ['已截仓', '已确认', '已发出'].includes(i.Status)
			
 
				+        break
			
 
				+    }
			
 
				+    return condition
			
 
				+  })
			
 
				+})
			
 
				+
			
 
				+let dateRange = ref([] as any[])
			
 
				+const generateDateRange = (days = 7) => {
			
 
				+  const today = new Date()
			
 
				+  const endDate = new Date()
			
 
				+  endDate.setDate(today.getDate() + days)
			
 
				+  return [today, endDate]
			
 
				+}
			
 
				+
			
 
				+const dateShortcuts = ref([
			
 
				+  {
			
 
				+    text: 'Next 3 days',
			
 
				+    value: generateDateRange(3),
			
 
				+  },
			
 
				+  {
			
 
				+    text: 'Next week',
			
 
				+    value: generateDateRange(7),
			
 
				+  },
			
 
				+  {
			
 
				+    text: 'Next 14days',
			
 
				+    value: generateDateRange(14),
			
 
				+  },
			
 
				+] as any[])
			
 
				+
			
 
				+dateRange.value = generateDateRange(14)
			
 
				+
			
 
				+const clearSubList = () => {
			
 
				+  subList.value = []
			
 
				+  subListBackup = []
			
 
				+  currentRow.value = {}
			
 
				+}
			
 
				+
			
 
				+let getList = () => {
			
 
				+  loading.value = true
			
 
				+  zoho.CRM.API.coql({
			
 
				+    select_query:
			
 
				+      'select Name,Forwarder,Port_From,Port_To,ETD,ETA,Cut_Off_Date,Owner,Status,Modified_Time from Sea_Freight_Table' +
			
 
				+      " where ETD between '" +
			
 
				+      `${dateRange.value.map((i) => dayjs(i).format('YYYY-MM-DD')).join("' and '")}` +
			
 
				+      "'",
			
 
				+  })
			
 
				+    .then((res: any) => {
			
 
				+      if (Array.isArray(res.data) && res.data.length) {
			
 
				+        list.value = res.data
			
 
				+      } else if (res.status === 204) {
			
 
				+        ElMessage.info(res.statusText || 'zoho api return:' + res.status)
			
 
				+        list.value = []
			
 
				+        clearSubList()
			
 
				+      }
			
 
				+    })
			
 
				+    .finally(() => (loading.value = false))
			
 
				+}
			
 
				+
			
 
				+let currentRow = ref({} as any)
			
 
				+let subList = ref([] as any[])
			
 
				+// 未经过滤的crm数据
			
 
				+let subListBackup: any[] = []
			
 
				+
			
 
				+watch(currentTab, (value: string) => {
			
 
				+  // 切到可用tab, 但是当前行是不是 可用 状态
			
 
				+  let notAvaliable = value === 'avaliable' && currentRow.value.Status !== '可用'
			
 
				+
			
 
				+  // 切到关闭tab, 但当前行不是‘关闭’状态
			
 
				+  let notClose =
			
 
				+    value === 'voyage_closed' &&
			
 
				+    !['已截仓', '已确认', '已发出'].includes(currentRow.value.Status)
			
 
				+
			
 
				+  if (notAvaliable || notClose) {
			
 
				+    clearSubList()
			
 
				+  } else {
			
 
				+    generateSubList()
			
 
				+  }
			
 
				+})
			
 
				+
			
 
				+const generateSubList = () => {
			
 
				+  // clonedeep 是因为数据里面有 object array, 担心浅复制到表单变量会影响到原始数据
			
 
				+  subList.value = cloneDeep(
			
 
				+    subListBackup
			
 
				+      .filter(
			
 
				+        (i: any) =>
			
 
				+          i.Parent_Id.id === currentRow.value.id &&
			
 
				+          (currentTab.value === 'my_request'
			
 
				+            ? i.Sales_Person === currentUserName.value
			
 
				+            : true),
			
 
				+      )
			
 
				+      .map((i: any) => ({
			
 
				+        ...i,
			
 
				+        Requester: i.Requester?.id
			
 
				+          ? {
			
 
				+              name: i.Requester.name || '',
			
 
				+              id: i.Requester.id,
			
 
				+            }
			
 
				+          : { name: '', id: '' },
			
 
				+        Sample: i.Sample || false,
			
 
				+        batchRecord: i.Batch_Record?.id || '',
			
 
				+        addFlag: false,
			
 
				+        editFlag: false,
			
 
				+        deleteFlag: false,
			
 
				+      })),
			
 
				+  )
			
 
				+}
			
 
				+/**
			
 
				+ *  用来增加新行的数据模版
			
 
				+ */
			
 
				+const newLineTemplate = {
			
 
				+  addFlag: true,
			
 
				+  editFlag: true,
			
 
				+  deleteFlag: false,
			
 
				+  batchRecord: '',
			
 
				+  // 提交表单前删掉以上字段
			
 
				+  // id: '',
			
 
				+  Sample: false,
			
 
				+  Batch_Record: {
			
 
				+    name: '',
			
 
				+    id: '',
			
 
				+  } as any,
			
 
				+  Parent_Id: {
			
 
				+    name: '',
			
 
				+    id: '',
			
 
				+  } as any,
			
 
				+  Carton: '',
			
 
				+  Marks_Nos: '',
			
 
				+  Description_of_Goods: '',
			
 
				+  Material_of_Goods: [],
			
 
				+  Quantity: '',
			
 
				+  Unit_Price: '',
			
 
				+  Weight: '',
			
 
				+  Cube: '',
			
 
				+  Total_FOB: '',
			
 
				+  Requester: { name: '', id: '' } as any,
			
 
				+  Sales_Person: '', // 申请人
			
 
				+  User_Notes: '',
			
 
				+}
			
 
				+// 用在弹窗里面给批次记录做候选项
			
 
				+let batchListOption = computed(() =>
			
 
				+  subList.value
			
 
				+    .filter(
			
 
				+      (i) =>
			
 
				+        i.Batch_Record && i.Batch_Record.name && i.Batch_Record.name.length,
			
 
				+    )
			
 
				+    .map((i) => {
			
 
				+      return {
			
 
				+        Name: i.Batch_Record.name || '',
			
 
				+        id: i.Batch_Record.id || '',
			
 
				+      }
			
 
				+    })
			
 
				+    // ai生成的去重逻辑.
			
 
				+    .filter(
			
 
				+      (item, index, self) =>
			
 
				+        index ===
			
 
				+        self.findIndex((t) => t.Name === item.Name && t.id === item.id),
			
 
				+    ),
			
 
				+)
			
 
				+
			
 
				+let getSubList = (e: any = {}) => {
			
 
				+  if (e.id) currentRow.value = e
			
 
				+  loading.value = true
			
 
				+  zoho.CRM.API.searchRecord({
			
 
				+    Entity: 'Sea_Freight_Details',
			
 
				+    Type: 'criteria',
			
 
				+    Query: `(Parent_Id:equals:${currentRow.value.id})`,
			
 
				+    delay: false,
			
 
				+  })
			
 
				+    .then((res: any) => {
			
 
				+      if (Array.isArray(res.data) && res.data.length) {
			
 
				+        subListBackup = res.data.slice()
			
 
				+
			
 
				+        generateSubList()
			
 
				+        newLineTemplate.Parent_Id = { id: currentRow.value.id }
			
 
				+        newLineTemplate.Sales_Person = currentUserName.value
			
 
				+        newLineTemplate.Requester = {
			
 
				+          id: currentUser.value,
			
 
				+          name: currentUserName.value,
			
 
				+        }
			
 
				+      }
			
 
				+    })
			
 
				+    .finally(() => (loading.value = false))
			
 
				+}
			
 
				+
			
 
				+const goodMaterialOption = ref([
			
 
				+  'Cotton 棉',
			
 
				+  'Iron 铁',
			
 
				+  'Neoprene 潜水料',
			
 
				+  'Paper 纸质',
			
 
				+  'Plastic 塑料',
			
 
				+  'Polyester Fibre 聚酯纤维',
			
 
				+  'PU 聚氨酯',
			
 
				+  'PVC 聚氯乙烯',
			
 
				+  'Velvet 天鹅绒',
			
 
				+  'Zinc alloy 锌合金',
			
 
				+])
			
 
				+
			
 
				+const addBulkProduct = () => {
			
 
				+  let temp = cloneDeep(newLineTemplate)
			
 
				+  temp.Sample = false
			
 
				+  subList.value.unshift(temp)
			
 
				+}
			
 
				+const addSample = () => {
			
 
				+  let temp = cloneDeep(newLineTemplate)
			
 
				+  temp.Sample = true
			
 
				+  subList.value.unshift(temp)
			
 
				+}
			
 
				+
			
 
				+const onDeleteRow = (row: any, index: number = -1) => {
			
 
				+  if (row.addFlag) {
			
 
				+    subList.value.splice(index, 1)
			
 
				+  } else {
			
 
				+    row.deleteFlag = true
			
 
				+    ElNotification({
			
 
				+      type: 'warning',
			
 
				+      title: '已标记删除',
			
 
				+      duration: 3000,
			
 
				+      message: '点 提交 按钮后会正式删除. 误操作请点击 放弃改动.',
			
 
				+    })
			
 
				+  }
			
 
				+}
			
 
				+
			
 
				+const onBatchRecordChange = ($e: string, line = -1) => {
			
 
				+  const temp = qcList.value.filter((i) => i.id === $e)
			
 
				+  let result: any = {}
			
 
				+  if (temp.length) {
			
 
				+    result = cloneDeep(temp[0])
			
 
				+  }
			
 
				+
			
 
				+  if (line > -1) {
			
 
				+    // 主页面数据编辑
			
 
				+    subList.value[line].editFlag = true
			
 
				+    subList.value[line].Batch_Record = { id: result.id, name: result.Name }
			
 
				+    if (result.Owner) {
			
 
				+      subList.value[line].Requester = {
			
 
				+        name: result.Owner.name,
			
 
				+        id: result.Owner.id,
			
 
				+      }
			
 
				+    }
			
 
				+  }
			
 
				+}
			
 
				+// 给子表格加红绿背景. 颜色用的tailwind的 red green
			
 
				+const calcRowStyle = ($e: any) => {
			
 
				+  const result = {} as any
			
 
				+  if ($e.row.addFlag) result['background-color'] = 'rgb(187, 247, 208)'
			
 
				+  if ($e.row.editFlag) result['background-color'] = 'rgb(187, 247, 208)'
			
 
				+  if ($e.row.deleteFlag) result['background-color'] = 'rgb(254, 202, 202)'
			
 
				+  return result
			
 
				+}
			
 
				+
			
 
				+const ruleFormRef = ref<FormInstance>()
			
 
				+
			
 
				+const commit = (formEl: FormInstance | undefined) => {
			
 
				+  let temp = cloneDeep(subList.value)
			
 
				+  let result = temp
			
 
				+    .filter((i) => !i.deleteFlag)
			
 
				+    .map((i) => {
			
 
				+      return {
			
 
				+        id: i.id,
			
 
				+        Sample: i.Sample || false,
			
 
				+        Batch_Record: i.batchRecord
			
 
				+          ? {
			
 
				+              name: i.Batch_Record.name,
			
 
				+              id: i.Batch_Record.id,
			
 
				+            }
			
 
				+          : '',
			
 
				+        Parent_Id: {
			
 
				+          name: i.Parent_Id.name,
			
 
				+          id: i.Parent_Id.id || '',
			
 
				+        },
			
 
				+        Material_of_Goods: i.Material_of_Goods,
			
 
				+        Requester: i.Requester.name
			
 
				+          ? {
			
 
				+              name: i.Requester.name,
			
 
				+              id: i.Requester.id || '',
			
 
				+            }
			
 
				+          : '',
			
 
				+        Sales_Person: i.Sales_Person || '',
			
 
				+        Carton: i.Carton || '',
			
 
				+        Marks_Nos: i.Marks_Nos || '',
			
 
				+        Description_of_Goods: i.Description_of_Goods || '',
			
 
				+        Quantity: i.Quantity || '',
			
 
				+        Unit_Price: i.Unit_Price || '',
			
 
				+        Weight: i.Weight || '',
			
 
				+        Cube: i.Cube || '',
			
 
				+        Total_FOB: i.Total_FOB || '',
			
 
				+        User_Notes: i.User_Notes || '',
			
 
				+      }
			
 
				+    }) as any[]
			
 
				+
			
 
				+  result = result.concat(
			
 
				+    temp
			
 
				+      .filter((i) => i.deleteFlag)
			
 
				+      .map((i) => ({ id: i.id, _delete: null, Material_of_Goods: null })),
			
 
				+  )
			
 
				+  const emptyBatchRecordList: number[] = []
			
 
				+  result.forEach((i, index) => {
			
 
				+    if (!i.Sample) {
			
 
				+      if (!i.Batch_Record) {
			
 
				+        emptyBatchRecordList.push(index)
			
 
				+      }
			
 
				+    }
			
 
				+  })
			
 
				+
			
 
				+  if (emptyBatchRecordList.length) {
			
 
				+    ElNotification({
			
 
				+      title: '请检查表单',
			
 
				+      message: `第 ${emptyBatchRecordList.map((i) => i + 1).join(', ')} 行的Batch Record数据`,
			
 
				+      duration: 5000,
			
 
				+    })
			
 
				+    return
			
 
				+  }
			
 
				+
			
 
				+  if (!formEl) return
			
 
				+  formEl.validate((valid) => {
			
 
				+    if (valid) {
			
 
				+      console.log(result, 'submit result')
			
 
				+      loading.value = true
			
 
				+      request
			
 
				+        .post('/sea_freight/updateSeaFreightData', {
			
 
				+          id: newLineTemplate.Parent_Id.id,
			
 
				+          Sea_Freight_array: result,
			
 
				+          Sales_Person: currentUserName.value,
			
 
				+          Sales_Person_Obj: {
			
 
				+            id: currentUser.value,
			
 
				+            name: currentUserName.value,
			
 
				+          },
			
 
				+        })
			
 
				+        .then((res) => {
			
 
				+          if (res.data.code === 1) {
			
 
				+            ElNotification({
			
 
				+              title: '保存成功',
			
 
				+              message: '正在刷新数据',
			
 
				+              duration: 3000,
			
 
				+            })
			
 
				+            getSubList(currentRow.value)
			
 
				+          } else {
			
 
				+            ElMessage.error('保存出错')
			
 
				+            loading.value = false
			
 
				+          }
			
 
				+        })
			
 
				+        .catch((e) => {
			
 
				+          console.log(e, 'commit error')
			
 
				+          loading.value = false
			
 
				+        })
			
 
				+    } else {
			
 
				+      console.log('error submit!')
			
 
				+    }
			
 
				+  })
			
 
				+}
			
 
				+let printDrawerVisible = ref(false)
			
 
				+let currentPrintRow = ref({} as any)
			
 
				+const print = (row: any) => {
			
 
				+  currentPrintRow.value = row
			
 
				+  printDrawerVisible.value = true
			
 
				+}
			
 
				+const exportSubTable = () => {
			
 
				+  const headers = [
			
 
				+    '箱数 Carton',
			
 
				+    '唛头 Marks & Nos',
			
 
				+    '货物名称 Description of Goods',
			
 
				+    '货物材质 Material goods',
			
 
				+    '数量 QTY',
			
 
				+    '单价 澳币/AUD Unit Price',
			
 
				+    '重量KG Weight',
			
 
				+    '体积m³ Cube',
			
 
				+    '总离岸价 澳币/AUD Total FOB',
			
 
				+    '负责人 Owner',
			
 
				+  ]
			
 
				+
			
 
				+  const data: any[] = subList.value.map((i) => {
			
 
				+    return {
			
 
				+      '箱数 Carton': i.Carton || '',
			
 
				+      '唛头 Marks & Nos': i.Marks_Nos || '',
			
 
				+      '货物名称 Description of Goods': i.Description_of_Goods || '',
			
 
				+      '货物材质 Material goods': i.Material_of_Goods,
			
 
				+      '数量 QTY': i.Quantity || '',
			
 
				+      '单价 澳币/AUD Unit Price': i.Unit_Price || '',
			
 
				+      '重量KG Weight': i.Weight || '',
			
 
				+      '体积m³ Cube': i.Cube || '',
			
 
				+      '总离岸价 澳币/AUD Total FOB': i.Total_FOB || '',
			
 
				+      '负责人 Owner': i.Requester.name || '',
			
 
				+    }
			
 
				+  })
			
 
				+  if (data.length === 0) {
			
 
				+    throw new Error('Invalid data: Data array is empty.')
			
 
				+  }
			
 
				+
			
 
				+  const worksheetData = []
			
 
				+  worksheetData.push(['发票/装箱单/INVOICE/PACKING LIST'])
			
 
				+  if (headers && headers.length > 0) {
			
 
				+    worksheetData.push(headers)
			
 
				+  } else {
			
 
				+    worksheetData.push(Object.keys(data[0]))
			
 
				+  }
			
 
				+  data.forEach((row) => {
			
 
				+    worksheetData.push(Object.values(row))
			
 
				+  })
			
 
				+  const wb = XLSX.utils.book_new()
			
 
				+  let ws = XLSX.utils.aoa_to_sheet(worksheetData)
			
 
				+  ws['!merges'] = [
			
 
				+    { s: { r: 0, c: 0 }, e: { r: 0, c: 9 } }, // 合并列作为标题
			
 
				+  ]
			
 
				+
			
 
				+  ws['!cols'] = [
			
 
				+    { wpx: 80 },
			
 
				+    { wpx: 200 },
			
 
				+    { wpx: 180 },
			
 
				+    { wpx: 120 },
			
 
				+    { wpx: 90 },
			
 
				+    { wpx: 120 },
			
 
				+    { wpx: 100 },
			
 
				+    { wpx: 100 },
			
 
				+    { wpx: 120 },
			
 
				+    { wpx: 120 },
			
 
				+  ]
			
 
				+
			
 
				+  XLSX.utils.book_append_sheet(wb, ws, 'Sheet1')
			
 
				+  XLSX.writeFile(wb, 'test.xlsx')
			
 
				+}
			
 
				+
			
 
				+let qcList = ref([] as any[])
			
 
				+let loading2 = ref(false)
			
 
				+
			
 
				+const search = (keyword: string) => {
			
 
				+  if (keyword.length < 2) return
			
 
				+
			
 
				+  loading2.value = true
			
 
				+  zoho.CRM.API.searchRecord({
			
 
				+    Entity: 'QC_Record',
			
 
				+    Type: 'criteria',
			
 
				+    Query: `(Reference:in:${keyword})or(Reference:starts_with:${keyword})or(Purchase_Order.name:in:${keyword})or(Purchase_Order.name:starts_with:${keyword})`,
			
 
				+    delay: false,
			
 
				+  })
			
 
				+    .then((res: any) => {
			
 
				+      if (Array.isArray(res.data) && res.data.length) {
			
 
				+        qcList.value = res.data
			
 
				+      } else {
			
 
				+        qcList.value = []
			
 
				+        ElMessage.warning('No Data Found')
			
 
				+      }
			
 
				+    })
			
 
				+    .finally(() => (loading2.value = false))
			
 
				+}
			
 
				+
			
 
				+const ensure = () => {
			
 
				+  ElMessageBox.confirm('确定要把该记录状态更新为"已确认"吗?', {
			
 
				+    confirmButtonText: '确定',
			
 
				+    cancelButtonText: '取消',
			
 
				+    type: 'warning',
			
 
				+  }).then(() => {
			
 
				+    loading.value = true
			
 
				+    zoho.CRM.API.updateRecord({
			
 
				+      Entity: 'Sea_Freight_Table',
			
 
				+      Trigger: ['workflow'],
			
 
				+      APIData: {
			
 
				+        id: currentRow.value.id,
			
 
				+        Status: '已确认',
			
 
				+      },
			
 
				+    }).then((res: any) => {
			
 
				+      if (
			
 
				+        Array.isArray(res.data) &&
			
 
				+        res.data.length &&
			
 
				+        res.data[0].code === 'SUCCESS'
			
 
				+      ) {
			
 
				+        ElMessage.success('操作成功, 正在刷新数据')
			
 
				+        loading.value = false
			
 
				+        getList()
			
 
				+        clearSubList()
			
 
				+      } else {
			
 
				+        loading.value = false
			
 
				+        ElMessage.error('操作失败, 请稍后再试或者联系管理员')
			
 
				+      }
			
 
				+    })
			
 
				+  })
			
 
				+}
			
 
				+// @ts-ignore
			
 
				+const zoho = window.ZOHO
			
 
				+zoho.embeddedApp.on('PageLoad', function () {
			
 
				+  zoho.CRM.CONFIG.getCurrentUser().then(function (data: any) {
			
 
				+    if (Array.isArray(data.users) && data.users.length) {
			
 
				+      const user = data.users[0]
			
 
				+      // console.log(user, 'user')
			
 
				+      currentUser.value = user.id
			
 
				+      currentUserName.value = user.full_name || ''
			
 
				+      getList()
			
 
				+    }
			
 
				+  })
			
 
				+})
			
 
				+
			
 
				+zoho.embeddedApp.init()
			
 
				+
			
 
				+let computedWeight = computed(() => {
			
 
				+  return subList.value.reduce((t, c) => {
			
 
				+    t = t + Number(c.Weight)
			
 
				+    return t
			
 
				+  }, 0)
			
 
				+})
			
 
				+let computedCube = computed(() => {
			
 
				+  return subList.value.reduce((t, c) => {
			
 
				+    t = t + Number(c.Cube)
			
 
				+    return t
			
 
				+  }, 0)
			
 
				+})
			
 
				+let computedTotalFOB = computed(() => {
			
 
				+  return subList.value.reduce((t, c) => {
			
 
				+    t = t + Number(c.Total_FOB)
			
 
				+    return t
			
 
				+  }, 0)
			
 
				+})
			
 
				+</script>
			
 
				+<style lang="scss">
			
 
				+.page-cargo-consolidation {
			
 
				+  .el-table__body tr.current-row > td.el-table__cell {
			
 
				+    background-color: oklch(0.685 0.169 237.323);
			
 
				+    color: #fff;
			
 
				+  }
			
 
				+}
			
 
				+</style>
			
 
				+<style lang="scss" scoped>
			
 
				+.el-button.custom-button {
			
 
				+  height: 32px;
			
 
				+  line-height: 32px;
			
 
				+  background-image: linear-gradient(
			
 
				+    171deg,
			
 
				+    rgb(28, 74, 136) 49%,
			
 
				+    rgb(0, 130, 193) 100%
			
 
				+  );
			
 
				+  background-color: rgb(97, 165, 245);
			
 
				+  color: #fff;
			
 
				+  font-size: 13px;
			
 
				+  font-family: Zoho_Puvi_Bold sans-serif;
			
 
				+  border-radius: 6px;
			
 
				+  cursor: pointer;
			
 
				+  &:hover,
			
 
				+  &:active {
			
 
				+    background-image: linear-gradient(
			
 
				+      171deg,
			
 
				+      rgb(28, 74, 136) 49%,
			
 
				+      rgb(22, 208, 239) 100%
			
 
				+    );
			
 
				+  }
			
 
				+  &.fb {
			
 
				+    font-weight: 900;
			
 
				+  }
			
 
				+  &.small {
			
 
				+    height: 24px;
			
 
				+    line-height: 24px;
			
 
				+  }
			
 
				+}
			
 
				+</style>
			
--- a/src/pages/indent-manage/indent/components/calcPrice/index.vue
+++ b/src/pages/indent-manage/indent/components/calcPrice/index.vue
@@ -7,6 +7,7 @@
 
				       :step3-form-list="step3FormList"
			
 
				       :step2-form-list="formList"
			
 
				       :creator-options="creatorOptions"
			
 
				+      :city2="formData.cal_city.local_city"
			
 
				       :city="exportForm.pdf_city"
			
 
				     ></exportQuota>
			
 
				     <!-- :city="formData.cal_city.local_city" -->
			
@@ -518,7 +519,7 @@ import setLCL from './components/dialogLCL.vue'
 
				 import freight from '../freight.vue'
			
 
				 import step1 from './components/step1.vue'
			
 
				 import CompExportForm from '../exportForm.vue'
			
 
				-import exportQuota from '../exportQuota.vue'
			
 
				+import exportQuota from '../exportQuota2.vue'
			
 
				 import mathjs, { savePrecision } from '@/utils/math.js'
			
 
				 import { getCalcParams, saveCalcData } from '@/api/indent'
			
 
				 import { $t } from '@/i18n/index'
			
--- a/src/pages/indent-manage/indent/components/exportQuota.vue
+++ b/src/pages/indent-manage/indent/components/exportQuota.vue
@@ -15,7 +15,7 @@
 
				       </div>
			
 
				 
			
 
				       <div class="flex justify-between items-start">
			
 
				-        <div class="">
			
 
				+        <div v-if="city2 !== 'US'">
			
 
				           <div class="">FAIR OCEAN TRADING AUSTRALIA</div>
			
 
				           <div class="">PTY LTD</div>
			
 
				           <div class="">15/10 Chilvers Road,</div>
			
@@ -30,6 +30,13 @@
 
				           <div class="">Fax Number:&nbsp;&nbsp;&nbsp;&nbsp;02 9008 1157</div>
			
 
				         </div>
			
 
				 
			
 
				+        <div v-else>
			
 
				+          <div>Promocollection, LLC</div>
			
 
				+          <div>1309 COFFEEN AVE STE 1200</div>
			
 
				+          <div>SHERIDAN</div>
			
 
				+          <div>WY 82801</div>
			
 
				+        </div>
			
 
				+
			
 
				         <div class="">
			
 
				           <div class="flex items-center">
			
 
				             <div style="font-weight: bold">Sales Person:&nbsp;</div>
			
@@ -142,8 +149,8 @@
 
				       </div> -->
			
 
				 
			
 
				       <div class="pb-2">
			
 
				-        Freight to {{ city_short[city] || city }} is included.Price based on exchange
			
 
				-        rate of {{ exportForm.exchange }}. Price is only valid for
			
 
				+        Freight to {{ city_short[city] || city }} is included.Price based on
			
 
				+        exchange rate of {{ exportForm.exchange }}. Price is only valid for
			
 
				         {{ exportForm.days }} days.
			
 
				       </div>
			
 
				 
			
@@ -157,7 +164,7 @@
 
				       <div class="leading-5">
			
 
				         <a
			
 
				           :href="mainPicture"
			
 
				-          class="break-all text-sky-700"
			
 
				+          class="text-sky-700"
			
 
				         >
			
 
				           {{ mainPicture }}
			
 
				         </a>
			
@@ -170,7 +177,7 @@
 
				         >
			
 
				           <a
			
 
				             :href="p"
			
 
				-            class="break-all text-sky-700"
			
 
				+            class="text-sky-700"
			
 
				           >
			
 
				             {{ p }}
			
 
				           </a>
			
@@ -196,6 +203,7 @@ defineComponent({
 
				 })
			
 
				 const {
			
 
				   city = '',
			
 
				+  city2 = '',
			
 
				   productInfo = {} as any,
			
 
				   exportForm = {} as any,
			
 
				   step2FormList = [],
			
@@ -203,6 +211,7 @@ const {
 
				   creatorOptions = [],
			
 
				 } = defineProps<{
			
 
				   city: string
			
 
				+  city2: string
			
 
				   productInfo: object
			
 
				   exportForm: object
			
 
				   step2FormList: any[]
			
@@ -215,6 +224,7 @@ const city_short = {
 
				   Brisbane: 'Brisbane',
			
 
				   SA: 'Adelaide',
			
 
				   WA: 'Perth',
			
 
				+  US: 'US',
			
 
				   '': '',
			
 
				 } as any
			
 
				 
			
--- a/src/pages/indent-manage/indent/components/exportQuota2.vue
+++ b/src/pages/indent-manage/indent/components/exportQuota2.vue
@@ -0,0 +1,486 @@
 
				+<template>
			
 
				+  <div class="pdf-wrap">
			
 
				+    <table
			
 
				+      id="pdfTarget"
			
 
				+      style="
			
 
				+        width: 850px;
			
 
				+        line-height: 20px;
			
 
				+        font-size: 12px;
			
 
				+        font-family:
			
 
				+          'Source Han Sans', 'Open Sans', 'WebFont-Open Sans', Arial, sans-serif;
			
 
				+      "
			
 
				+    >
			
 
				+      <tbody>
			
 
				+        <tr>
			
 
				+          <td style="vertical-align: bottom">
			
 
				+            <img
			
 
				+              style="position: relative; left: -10pt"
			
 
				+              src="http://zohocrmapi.promocollection.com.au/static/uploads/logo/pdf_logo.png"
			
 
				+              height="50px"
			
 
				+            />
			
 
				+          </td>
			
 
				+          <td style="vertical-align: top; text-align: right">
			
 
				+            <h1>Quotation</h1>
			
 
				+          </td>
			
 
				+        </tr>
			
 
				+        <tr>
			
 
				+          <td style="vertical-align: top">
			
 
				+            <template v-if="city2 === 'US'">
			
 
				+              <p>Promocollection, LLC</p>
			
 
				+              <p>1309 COFFEEN AVE STE 1200</p>
			
 
				+              <p>SHERIDAN</p>
			
 
				+              <p>WY 82801</p>
			
 
				+            </template>
			
 
				+            <template v-else>
			
 
				+              <p>FAIR OCEAN TRADING AUSTRALIA</p>
			
 
				+              <p>PTY LTD</p>
			
 
				+              <p>15/10 Chilvers Road,</p>
			
 
				+              <p>THORNLEIGH NSW 2120,</p>
			
 
				+              <p>AUSTRALIA</p>
			
 
				+            </template>
			
 
				+          </td>
			
 
				+
			
 
				+          <td style="vertical-align: top; text-align: right">
			
 
				+            <table style="width: 250px; float: right">
			
 
				+              <colgroup>
			
 
				+                <col width="100px" />
			
 
				+                <col width="150px" />
			
 
				+              </colgroup>
			
 
				+              <tr>
			
 
				+                <td><strong>Sales Person:</strong></td>
			
 
				+                <td>{{ computedCreator }}</td>
			
 
				+              </tr>
			
 
				+              <tr>
			
 
				+                <td><strong>Order Date:</strong></td>
			
 
				+                <td>{{ dayjs().format('DD MMM YYYY') }}</td>
			
 
				+              </tr>
			
 
				+            </table>
			
 
				+          </td>
			
 
				+        </tr>
			
 
				+        <tr>
			
 
				+          <td style="vertical-align: top">
			
 
				+            <template v-if="city2 !== 'US'">
			
 
				+              <p>
			
 
				+                Email:&nbsp;&nbsp;&nbsp;&nbsp;accounts@promocollection.com.au
			
 
				+              </p>
			
 
				+              <p>Phone Number:&nbsp;&nbsp;&nbsp;&nbsp;02 9008 1152</p>
			
 
				+              <p>Fax Number:&nbsp;&nbsp;&nbsp;&nbsp;02 9008 1157</p>
			
 
				+            </template>
			
 
				+          </td>
			
 
				+
			
 
				+          <td
			
 
				+            rowspan="3"
			
 
				+            style="vertical-align: top; text-align: right"
			
 
				+          >
			
 
				+            <img
			
 
				+              :src="mainPicture"
			
 
				+              width="300px"
			
 
				+            />
			
 
				+          </td>
			
 
				+        </tr>
			
 
				+        <tr>
			
 
				+          <td style="vertical-align: top">
			
 
				+            <p><strong>Information</strong></p>
			
 
				+            <p>
			
 
				+              <strong>{{ productInfo.product_name }}</strong>
			
 
				+            </p>
			
 
				+
			
 
				+            <p v-if="productInfo.package_size">
			
 
				+              <strong>Size:</strong>
			
 
				+              {{ productInfo.product_size }}
			
 
				+            </p>
			
 
				+
			
 
				+            <p v-if="productInfo.product_hd">
			
 
				+              <strong>Thickness:</strong>
			
 
				+              {{ productInfo.product_hd }}
			
 
				+            </p>
			
 
				+
			
 
				+            <p v-if="productInfo.product_capacity">
			
 
				+              <strong>Capacity:</strong>
			
 
				+              {{ productInfo.product_capacity }}
			
 
				+            </p>
			
 
				+
			
 
				+            <p v-if="productInfo.product_material">
			
 
				+              <strong>Material:</strong>
			
 
				+              {{ productInfo.product_material }}
			
 
				+            </p>
			
 
				+
			
 
				+            <p v-if="productInfo.product_require_print">
			
 
				+              <strong>Print:</strong>
			
 
				+              {{ productInfo.product_require_print }}
			
 
				+            </p>
			
 
				+
			
 
				+            <p v-if="productInfo.product_require_color">
			
 
				+              <strong>Color requirements:</strong>
			
 
				+              {{ productInfo.product_require_color }}
			
 
				+            </p>
			
 
				+
			
 
				+            <p v-if="productInfo.product_color">
			
 
				+              <strong>Product Colours Available:</strong>
			
 
				+              {{ productInfo.product_color }}
			
 
				+            </p>
			
 
				+
			
 
				+            <p v-if="productInfo.product_battery">
			
 
				+              <strong>Whether with battery:</strong>
			
 
				+              {{ productInfo.product_battery }}
			
 
				+            </p>
			
 
				+
			
 
				+            <p v-if="productInfo.package_info">
			
 
				+              <strong>Packaging:</strong>
			
 
				+              {{ productInfo.package_info }}
			
 
				+            </p>
			
 
				+
			
 
				+            <p v-if="productInfo.product_other">
			
 
				+              <strong>More Details:</strong>
			
 
				+              {{ productInfo.product_other }}
			
 
				+            </p>
			
 
				+          </td>
			
 
				+        </tr>
			
 
				+        <tr style="vertical-align: top">
			
 
				+          <td><p></p></td>
			
 
				+        </tr>
			
 
				+        <tr style="vertical-align: top">
			
 
				+          <td colspan="2">
			
 
				+            <table style="width: 800px; border-spacing: 0">
			
 
				+              <tbody>
			
 
				+                <tr
			
 
				+                  style="
			
 
				+                    background-color: #eee;
			
 
				+                    line-height: 45px;
			
 
				+                    border-top: solid 1px #ccc;
			
 
				+                    font-weight: bold;
			
 
				+                    text-align: center;
			
 
				+                  "
			
 
				+                >
			
 
				+                  <td
			
 
				+                    style="
			
 
				+                      border-top: solid 1px #ccc;
			
 
				+                      border-bottom: solid 1px #ccc;
			
 
				+                      width: 20px;
			
 
				+                      height: 45px;
			
 
				+                    "
			
 
				+                  >
			
 
				+                    #
			
 
				+                  </td>
			
 
				+                  <td
			
 
				+                    style="
			
 
				+                      border-top: solid 1px #ccc;
			
 
				+                      border-bottom: solid 1px #ccc;
			
 
				+                      text-align: left;
			
 
				+                      width: 230px;
			
 
				+                      height: 45px;
			
 
				+                    "
			
 
				+                  >
			
 
				+                    Items
			
 
				+                  </td>
			
 
				+                  <td
			
 
				+                    style="
			
 
				+                      border-top: solid 1px #ccc;
			
 
				+                      border-bottom: solid 1px #ccc;
			
 
				+                      width: 120px;
			
 
				+                      height: 45px;
			
 
				+                    "
			
 
				+                  >
			
 
				+                    Qty
			
 
				+                  </td>
			
 
				+                  <td
			
 
				+                    style="
			
 
				+                      border-top: solid 1px #ccc;
			
 
				+                      border-bottom: solid 1px #ccc;
			
 
				+                      width: 120px;
			
 
				+                      height: 45px;
			
 
				+                    "
			
 
				+                  >
			
 
				+                    Setup cost
			
 
				+                  </td>
			
 
				+                  <td
			
 
				+                    style="
			
 
				+                      border-top: solid 1px #ccc;
			
 
				+                      border-bottom: solid 1px #ccc;
			
 
				+                      width: 120px;
			
 
				+                      height: 45px;
			
 
				+                    "
			
 
				+                  >
			
 
				+                    Unit cost
			
 
				+                  </td>
			
 
				+                  <td
			
 
				+                    style="
			
 
				+                      border-top: solid 1px #ccc;
			
 
				+                      border-bottom: solid 1px #ccc;
			
 
				+                      width: 120px;
			
 
				+                      height: 45px;
			
 
				+                    "
			
 
				+                  >
			
 
				+                    Local Freight
			
 
				+                  </td>
			
 
				+                  <td
			
 
				+                    style="
			
 
				+                      border-top: solid 1px #ccc;
			
 
				+                      border-bottom: solid 1px #ccc;
			
 
				+                      width: 120px;
			
 
				+                      height: 45px;
			
 
				+                    "
			
 
				+                  >
			
 
				+                    {{ exportForm.gst_name ? 'Total(ex-GST)($)' : 'Total($)' }}
			
 
				+                  </td>
			
 
				+                </tr>
			
 
				+
			
 
				+                <tr
			
 
				+                  v-for="(row, index) in step3FormList"
			
 
				+                  :key="index"
			
 
				+                  style="text-align: center; line-height: 45px"
			
 
				+                >
			
 
				+                  <td style="border-bottom: solid 1px #ccc; height: 45px">
			
 
				+                    {{ index + 1 }}
			
 
				+                  </td>
			
 
				+                  <td
			
 
				+                    style="
			
 
				+                      border-bottom: solid 1px #ccc;
			
 
				+                      text-align: left;
			
 
				+                      height: 45px;
			
 
				+                    "
			
 
				+                  >
			
 
				+                    {{ productInfo.product_name }}
			
 
				+                    <br />
			
 
				+                    By {{ getFreightType(row) }}&nbsp;-&nbsp;{{
			
 
				+                      exportForm[`zdy_date_${row.typeNumber}_${row.number}`]
			
 
				+                    }}{{
			
 
				+                      exportForm[`cycle_name_${row.typeNumber}_${row.number}`]
			
 
				+                    }}
			
 
				+                  </td>
			
 
				+                  <td style="border-bottom: solid 1px #ccc; height: 45px">
			
 
				+                    {{ row.number }} units
			
 
				+                  </td>
			
 
				+                  <td style="border-bottom: solid 1px #ccc; height: 45px">
			
 
				+                    ${{ row.setup_cost }}
			
 
				+                    {{ exportForm.gst_name ? '+GST' : '' }}
			
 
				+                  </td>
			
 
				+                  <td style="border-bottom: solid 1px #ccc; height: 45px">
			
 
				+                    ${{ row.sold_unit }} {{ exportForm.gst_name ? '+GST' : '' }}
			
 
				+                  </td>
			
 
				+                  <td style="border-bottom: solid 1px #ccc; height: 45px">
			
 
				+                    ${{ row.add_freight_cost }}
			
 
				+                    {{ exportForm.gst_name ? '+GST' : '' }}
			
 
				+                  </td>
			
 
				+                  <td style="border-bottom: solid 1px #ccc; height: 45px">
			
 
				+                    ${{ row.sold_price }}
			
 
				+                    {{ exportForm.gst_name ? '+GST' : '' }}
			
 
				+                  </td>
			
 
				+                </tr>
			
 
				+
			
 
				+                <tr>
			
 
				+                  <td
			
 
				+                    colspan="7"
			
 
				+                    style="text-align: left; line-height: 45px"
			
 
				+                  >
			
 
				+                    Freight to {{ city_short[city] || city }} is included.Price
			
 
				+                    based on exchange rate of {{ exportForm.exchange }}.Price is
			
 
				+                    only valid for {{ exportForm.days }} days.
			
 
				+                  </td>
			
 
				+                </tr>
			
 
				+              </tbody>
			
 
				+            </table>
			
 
				+          </td>
			
 
				+        </tr>
			
 
				+
			
 
				+        <!-- <tr>
			
 
				+          <td colspan="2">
			
 
				+            <p style="line-height: 45px">
			
 
				+              <strong style="border-bottom: dashed 2px #000; padding: 10px">
			
 
				+                Notes
			
 
				+              </strong>
			
 
				+            </p>
			
 
				+          </td>
			
 
				+        </tr>
			
 
				+        <tr>
			
 
				+          <td colspan="2">
			
 
				+            <p style="padding-top: 20px">{php}echo $notes;{/php}</p>
			
 
				+          </td>
			
 
				+        </tr> -->
			
 
				+
			
 
				+        <tr>
			
 
				+          <td colspan="2">
			
 
				+            <p style="padding-top: 20px">
			
 
				+              <img
			
 
				+                v-for="(item, index) in otherPicture"
			
 
				+                :key="index"
			
 
				+                :src="item"
			
 
				+                width="250px"
			
 
				+                style="padding-right: 10px"
			
 
				+              />
			
 
				+            </p>
			
 
				+          </td>
			
 
				+        </tr>
			
 
				+        <tr>
			
 
				+          <td colspan="2">
			
 
				+            <p>
			
 
				+              <a :href="mainPicture">{{ mainPicture }}</a>
			
 
				+            </p>
			
 
				+          </td>
			
 
				+        </tr>
			
 
				+        <tr>
			
 
				+          <td colspan="2">
			
 
				+            <p
			
 
				+              v-for="p in otherPicture"
			
 
				+              :key="p"
			
 
				+            >
			
 
				+              <a
			
 
				+                :href="p"
			
 
				+                target="_blank"
			
 
				+              >
			
 
				+                {{ p }}
			
 
				+              </a>
			
 
				+            </p>
			
 
				+          </td>
			
 
				+        </tr>
			
 
				+
			
 
				+        <tr>
			
 
				+          <td
			
 
				+            colspan="2"
			
 
				+            style="text-align: center"
			
 
				+          >
			
 
				+            <img
			
 
				+              style="margin-top: 10px"
			
 
				+              src="http://zohocrmapi.promocollection.com.au/static/uploads/logo/pdf_end.png"
			
 
				+            />
			
 
				+          </td>
			
 
				+        </tr>
			
 
				+      </tbody>
			
 
				+    </table>
			
 
				+  </div>
			
 
				+</template>
			
 
				+
			
 
				+<script lang="ts" setup>
			
 
				+import { defineComponent, computed } from 'vue'
			
 
				+import jspdf from 'jspdf'
			
 
				+import html2canvas from 'html2canvas'
			
 
				+import dayjs from 'dayjs'
			
 
				+import { downloadPDF } from '@/api/indent'
			
 
				+defineComponent({
			
 
				+  name: 'ComponentExportQuota2',
			
 
				+})
			
 
				+const {
			
 
				+  city = '',
			
 
				+  city2 = '',
			
 
				+  productInfo = {} as any,
			
 
				+  exportForm = {} as any,
			
 
				+  step2FormList = [],
			
 
				+  step3FormList = [],
			
 
				+  creatorOptions = [],
			
 
				+} = defineProps<{
			
 
				+  city: string
			
 
				+  city2: string
			
 
				+  productInfo: object
			
 
				+  exportForm: object
			
 
				+  step2FormList: any[]
			
 
				+  step3FormList: any[]
			
 
				+  creatorOptions: any[]
			
 
				+}>()
			
 
				+const city_short = {
			
 
				+  SYD: 'Sydney',
			
 
				+  Melb: 'Melbourne',
			
 
				+  Brisbane: 'Brisbane',
			
 
				+  SA: 'Adelaide',
			
 
				+  WA: 'Perth',
			
 
				+  US: 'US',
			
 
				+  '': '',
			
 
				+} as any
			
 
				+
			
 
				+const getLogoPath = () => {
			
 
				+  return new URL('/assets/logo.png', import.meta.url).href
			
 
				+}
			
 
				+const getFreightType = (row: any) => {
			
 
				+  let result = 'Sea'
			
 
				+
			
 
				+  if (row.typeNumber < 2) {
			
 
				+    result = 'Air'
			
 
				+  }
			
 
				+  if (row.typeNumber === 3) {
			
 
				+    const temp: any[] = step2FormList.filter(
			
 
				+      (i: any) => i.number === row.number,
			
 
				+    )
			
 
				+    if (
			
 
				+      temp.length &&
			
 
				+      temp[0].fclData?.method_fcl &&
			
 
				+      ['快递', '空运'].includes(temp[0].fclData.method_fcl)
			
 
				+    ) {
			
 
				+      result = 'Air'
			
 
				+    }
			
 
				+  }
			
 
				+  return result
			
 
				+}
			
 
				+const generatePDF = () => {
			
 
				+  downloadPDF({
			
 
				+    content: document.getElementById('pdfTarget')?.outerHTML,
			
 
				+    title: 'test_pdf',
			
 
				+    create_time: '',
			
 
				+  }).then((res: any) => {
			
 
				+    console.log(res, 'res pdf')
			
 
				+    if (res.result?.length) {
			
 
				+      window.open(import.meta.env.VITE_API_PREFIX + '/' + res.result)
			
 
				+    }
			
 
				+  })
			
 
				+}
			
 
				+// 把这个方法暴露给父组件, 否则无法在父组件被调用
			
 
				+defineExpose({ generatePDF })
			
 
				+const shouldSplit = (
			
 
				+  nodes: HTMLElement[],
			
 
				+  index: number,
			
 
				+  pageHeight: number,
			
 
				+) => {
			
 
				+  // 计算当前这块dom是否跨越了a4大小，以此分割
			
 
				+  // console.log(index, 'index start')
			
 
				+  if (
			
 
				+    nodes[index].offsetTop + nodes[index].clientHeight < pageHeight &&
			
 
				+    nodes[index + 1] &&
			
 
				+    nodes[index + 1].offsetTop + nodes[index + 1].clientHeight > pageHeight
			
 
				+  ) {
			
 
				+    return true
			
 
				+  }
			
 
				+  return false
			
 
				+}
			
 
				+
			
 
				+const mainPicture = computed(() => {
			
 
				+  if (
			
 
				+    Array.isArray(productInfo.product_image) &&
			
 
				+    productInfo.product_image.length
			
 
				+  ) {
			
 
				+    return productInfo.product_image[0]
			
 
				+  }
			
 
				+  return ''
			
 
				+})
			
 
				+const otherPicture = computed(() => {
			
 
				+  if (
			
 
				+    Array.isArray(productInfo.product_image) &&
			
 
				+    productInfo.product_image.length > 1
			
 
				+  ) {
			
 
				+    return productInfo.product_image.slice(1)
			
 
				+  }
			
 
				+  return []
			
 
				+})
			
 
				+const computedCreator = computed(() => {
			
 
				+  let result = ''
			
 
				+  if (creatorOptions.length) {
			
 
				+    const a: any[] = creatorOptions.filter(
			
 
				+      (i: any) => i.value === exportForm.saleperson,
			
 
				+    )
			
 
				+    if (a.length) result = a[0].label
			
 
				+  }
			
 
				+  return result
			
 
				+})
			
 
				+</script>
			
 
				+<style lang="scss" scoped>
			
 
				+$subColor: #777;
			
 
				+.pdf-wrap {
			
 
				+  position: fixed;
			
 
				+  // top: 0;
			
 
				+  // left: 0;
			
 
				+  // z-index: 9999;
			
 
				+  top: -9999px;
			
 
				+  right: -9999px;
			
 
				+  box-sizing: border-box;
			
 
				+  width: 21cm;
			
 
				+  margin: 0 auto 12px;
			
 
				+  box-shadow: 1px 1px 2pt 0px $subColor;
			
 
				+}
			
 
				+</style>
			
--- a/src/pages/indent-manage/indent/components/info.vue
+++ b/src/pages/indent-manage/indent/components/info.vue
@@ -1031,6 +1031,7 @@ import {
 
				   ElNotification,
			
 
				   ElMessage,
			
 
				   ElIcon,
			
 
				+  ElMessageBox,
			
 
				 } from 'element-plus'
			
 
				 import { CirclePlus, Close, CircleCloseFilled } from '@element-plus/icons-vue'
			
 
				 import debounce from 'lodash.debounce'
			
@@ -1039,6 +1040,7 @@ import { $t } from '@/i18n/index'
 
				 import imageUpload from '@/components/ImageUpload.vue'
			
 
				 // 用来对oss的图片、视频等媒体数据的url进行匹配替换
			
 
				 import { getVendorList, createQuote } from '@/api/indent'
			
 
				+import userAPI from '@/api/user'
			
 
				 
			
 
				 defineComponent({
			
 
				   name: 'EditInfo',
			
@@ -1329,6 +1331,22 @@ const changeVenderSelect = function (value: string | number, index: number) {
 
				     }
			
 
				   }
			
 
				 }
			
 
				+const auditUser = ref('')
			
 
				+const getCurrentAuditUser = () => {
			
 
				+  userAPI.getAuditUser().then((res: any) => {
			
 
				+    // console.log(res, 'res')
			
 
				+    if (
			
 
				+      res.code === 1 &&
			
 
				+      Array.isArray(res.result.data) &&
			
 
				+      res.result.data.length
			
 
				+    ) {
			
 
				+      const temp = res.result.data.filter((i: any) => i.type === 1)
			
 
				+      // console.log(temp, 'temp')
			
 
				+      if (temp.length) auditUser.value = temp[0].email
			
 
				+    }
			
 
				+  })
			
 
				+}
			
 
				+getCurrentAuditUser()
			
 
				 const createQuoteFunc = function () {
			
 
				   const params = {
			
 
				     file: '', // 疑似永远为空
			
@@ -1336,7 +1354,7 @@ const createQuoteFunc = function () {
 
				   if (parentId) {
			
 
				     params.parent_id = parentId
			
 
				   }
			
 
				-
			
 
				+  let notiList: string[] = []
			
 
				   let temp = cloneDeep(forms.value)
			
 
				   temp = temp.map((item, index) => {
			
 
				     const result = { ...item }
			
@@ -1361,12 +1379,26 @@ const createQuoteFunc = function () {
 
				         return i.url.replace($mediaRegExp, '/')
			
 
				       })
			
 
				       .join(',')
			
 
				+    if (result.vendor_id && result.vendor_name === result.vendor_id) {
			
 
				+      notiList.push(result.vendor_name)
			
 
				+    }
			
 
				     return result
			
 
				   })
			
 
				 
			
 
				   //  组装接口数据
			
 
				   Object.assign(params, { lists: temp })
			
 
				-
			
 
				+  if (notiList.length) {
			
 
				+    ElMessageBox.alert(
			
 
				+      '您正在提交系统外供应商 ' +
			
 
				+        notiList.map((i) => `[${i}]`).join(', ') +
			
 
				+        '<br>本次操作已触发审核流程，审核人将会尽快处理，如有问题请联系:' +
			
 
				+        `<a href="mailto:${auditUser.value}">${auditUser.value}</a>`,
			
 
				+      '提示',
			
 
				+      {
			
 
				+        dangerouslyUseHTMLString: true,
			
 
				+      },
			
 
				+    )
			
 
				+  }
			
 
				   createQuote(params).then((response: any) => {
			
 
				     if (response.code !== 1) return
			
 
				 
			
@@ -1408,22 +1440,37 @@ const checkForm = function () {
 
				 
			
 
				   // 表单校验结果
			
 
				   let result = true
			
 
				+  const promisePool: any[] = []
			
 
				   target.forEach((i: string) => {
			
 
				     const r: any = formRef.value[`${i}`]
			
 
				     if (typeof r.validate === 'function') {
			
 
				       r.clearValidate()
			
 
				-      r.validate((valid: boolean) => {
			
 
				-        if (!valid) {
			
 
				-          messageError('请检查表单必填项')
			
 
				-          result = false
			
 
				-          return
			
 
				-        }
			
 
				+      const p = new Promise((resolve) => {
			
 
				+        r.validate((valid: boolean) => {
			
 
				+          if (!valid) {
			
 
				+            messageError('请检查表单必填项')
			
 
				+            resolve(false)
			
 
				+          } else {
			
 
				+            resolve(true)
			
 
				+          }
			
 
				+        })
			
 
				       })
			
 
				+      promisePool.push(p)
			
 
				     } else {
			
 
				       result = false
			
 
				     }
			
 
				   })
			
 
				-  if (result) createQuoteFunc()
			
 
				+  if (!result) {
			
 
				+    // 一般不会到这里
			
 
				+    messageError('表单异常. 请刷新页面再试或者全屏截图联系管理员')
			
 
				+    return
			
 
				+  }
			
 
				+  Promise.all(promisePool).then((res) => {
			
 
				+    const valid = res.every((a) => a === true)
			
 
				+    if (valid) {
			
 
				+      createQuoteFunc()
			
 
				+    }
			
 
				+  })
			
 
				 }
			
 
				 const messageError = debounce(function (info) {
			
 
				   ElMessage.error(info)
			
--- a/src/pages/indent-manage/indent/components/quoteRecord.vue
+++ b/src/pages/indent-manage/indent/components/quoteRecord.vue
@@ -466,8 +466,18 @@ const onChangeOrderClick = (row: any) => {
 
				     loading.value = true
			
 
				     generateOrder(row)
			
 
				       .then((res: any) => {
			
 
				+        console.log(res, 'res')
			
 
				         if (res.code === 1) {
			
 
				           ElMessage.success('转单成功')
			
 
				+          let temp = res.result.data
			
 
				+          if (Array.isArray(temp) && temp.length) {
			
 
				+            let id = temp[0].details?.id
			
 
				+            window.open(
			
 
				+              import.meta.env.VITE_SO_PATH +
			
 
				+                `${id}` +
			
 
				+                import.meta.env.VITE_SO_APPEND,
			
 
				+            )
			
 
				+          }
			
 
				         } else {
			
 
				           ElNotification({
			
 
				             title: '转单失败',
			
--- a/src/pages/indent-manage/indent/components/skuSelect.vue
+++ b/src/pages/indent-manage/indent/components/skuSelect.vue
@@ -14,7 +14,7 @@
 
				         class="flex items-start"
			
 
				         style="max-height: 100%"
			
 
				       >
			
 
				-        <div>
			
 
				+        <div class="max-h-[800px] overflow-auto">
			
 
				           <el-input
			
 
				             v-model="keywords"
			
 
				             placeholder="SKU / 商品名"
			
@@ -212,6 +212,22 @@ watch(
 
				     }
			
 
				   },
			
 
				 )
			
 
				+watch(
			
 
				+  currentCategory,
			
 
				+  () => {
			
 
				+    console.log('watch run bbb')
			
 
				+    if (!currentCategory.value) return
			
 
				+    console.log('watch run')
			
 
				+    keywords.value = ''
			
 
				+    skuList.value = []
			
 
				+    pageForm.value = {
			
 
				+      page: 1,
			
 
				+      limit: 20,
			
 
				+    }
			
 
				+    total.value = 0
			
 
				+    getSku()
			
 
				+  },
			
 
				+)
			
 
				 const close = (done = {} as any) => {
			
 
				   $emit('update:visible', false)
			
 
				   if (typeof done === 'function') done()
			
@@ -240,7 +256,7 @@ const close = (done = {} as any) => {
 
				     width: 180px;
			
 
				     min-width: 180px;
			
 
				     border: 1px solid #eee;
			
 
				-    padding: 0 0 24px 0;
			
 
				+    padding: 0 12px 24px 0;
			
 
				   }
			
 
				   .sku-area {
			
 
				     width: 100%;
			
--- a/src/pages/indent-manage/indent/list.vue
+++ b/src/pages/indent-manage/indent/list.vue
@@ -1,5 +1,5 @@
 
				 <template>
			
 
				-  <div class="page-indent-list py-4 px-2 shadow max-w-[1800px] mx-auto">
			
 
				+  <div class="page-indent-list py-4 px-2 shadow-sm max-w-[1800px] mx-auto">
			
 
				     <el-form
			
 
				       ref="searchForm"
			
 
				       v-loading="loading"
			
--- a/src/pages/indent-manage/login.vue
+++ b/src/pages/indent-manage/login.vue
@@ -4,9 +4,9 @@
 
				     class="flex items-center justify-center"
			
 
				   >
			
 
				     <div
			
 
				-      class="w-[400px] px-4 py-6 border border-solid border-gray-100 rounded shadow"
			
 
				+      class="w-[400px] px-4 py-6 border border-solid border-gray-200 rounded-sm shadow-sm"
			
 
				     >
			
 
				-      <div class="text-center text-gray-2 text-xl font-bold mt-2 mb-8">
			
 
				+      <div class="text-center text-gray-800 text-xl font-bold mt-2 mb-8">
			
 
				         Indent APP Login
			
 
				       </div>
			
 
				       <el-form
			
@@ -33,6 +33,7 @@
 
				             type="password"
			
 
				             :disabled="loading"
			
 
				             placeholder="password"
			
 
				+            @keyup.enter="tryLogin"
			
 
				           ></el-input>
			
 
				         </el-form-item>
			
 
				         <el-form-item>
			
--- a/src/pages/indent-manage/product/list.vue
+++ b/src/pages/indent-manage/product/list.vue
@@ -1,5 +1,5 @@
 
				 <template>
			
 
				-  <div class="page-indent-list py-4 px-2 shadow max-w-[1800px] mx-auto">
			
 
				+  <div class="page-indent-list py-4 px-2 shadow-sm max-w-[1800px] mx-auto">
			
 
				     <el-form
			
 
				       ref="searchForm"
			
 
				       :inline="true"
			
@@ -52,7 +52,7 @@
 
				       </div>
			
 
				     </el-form>
			
 
				 
			
 
				-    <div class="mb-2">
			
 
				+    <div class="mb-2 flex justify-between">
			
 
				       <el-button
			
 
				         size="small"
			
 
				         type="primary"
			
@@ -60,6 +60,37 @@
 
				       >
			
 
				         {{ $t('btn_add') }}
			
 
				       </el-button>
			
 
				+      <el-form inline>
			
 
				+        <el-form-item label="审核人:">
			
 
				+          <el-select
			
 
				+            v-model="auditUser"
			
 
				+            :loading="setAuditUserLoading"
			
 
				+            class="min-w-[200px]"
			
 
				+            filterable
			
 
				+            placeholder="可搜索"
			
 
				+            size="small"
			
 
				+          >
			
 
				+            <el-option
			
 
				+              v-for="user in userList"
			
 
				+              :key="user.id"
			
 
				+              :value="user.id"
			
 
				+              :label="`${user.name} (${user.username})`"
			
 
				+            ></el-option>
			
 
				+          </el-select>
			
 
				+        </el-form-item>
			
 
				+        <el-form-item>
			
 
				+          <el-tooltip content="保存审核人">
			
 
				+            <el-button
			
 
				+              type="primary"
			
 
				+              size="small"
			
 
				+              :loading="setAuditUserLoading"
			
 
				+              @click="setAuditUser"
			
 
				+            >
			
 
				+              保存
			
 
				+            </el-button>
			
 
				+          </el-tooltip>
			
 
				+        </el-form-item>
			
 
				+      </el-form>
			
 
				     </div>
			
 
				 
			
 
				     <el-table
			
@@ -203,6 +234,8 @@ import {
 
				   ElPagination,
			
 
				   ElCascader,
			
 
				   ElDialog,
			
 
				+  ElTooltip,
			
 
				+  ElMessage,
			
 
				 } from 'element-plus'
			
 
				 import compEdit from './components/edit.vue'
			
 
				 import compRecord from './components/record.vue'
			
@@ -210,6 +243,8 @@ import compExamine from './components/examine.vue'
 
				 import { $t } from '@/i18n/index'
			
 
				 import { getProductList, deleteProduct } from '@/api/product.js'
			
 
				 import { getCategoryTree } from '@/api/indent.js'
			
 
				+import userAPI from '@/api/user'
			
 
				+
			
 
				 defineComponent({
			
 
				   name: 'ComponentIndentProductList',
			
 
				 })
			
@@ -404,6 +439,53 @@ const imgClick = (url: string) => {
 
				 watch(bigImageVisible, () => {
			
 
				   if (!bigImageVisible.value) currentBigImage.value = ''
			
 
				 })
			
 
				+const userList = ref([] as any[])
			
 
				+const getUserListFunc = () => {
			
 
				+  userAPI
			
 
				+    .getUserList({
			
 
				+      page: 1,
			
 
				+      limit: 200,
			
 
				+    })
			
 
				+    .then((res: any) => {
			
 
				+      if (res.code !== 1) {
			
 
				+        return
			
 
				+      }
			
 
				+      userList.value =
			
 
				+        res.result.data
			
 
				+          .filter((i: any) => i.status === 1)
			
 
				+          .sort((a: any, b: any) => a.name.localeCompare(b.name)) || []
			
 
				+    })
			
 
				+}
			
 
				+getUserListFunc()
			
 
				+const auditUser = ref('')
			
 
				+const getCurrentAuditUser = () => {
			
 
				+  userAPI.getAuditUser().then((res: any) => {
			
 
				+    console.log(res, 'res')
			
 
				+    if (
			
 
				+      res.code === 1 &&
			
 
				+      Array.isArray(res.result.data) &&
			
 
				+      res.result.data.length
			
 
				+    ) {
			
 
				+      const temp = res.result.data.filter((i: any) => i.type === 2)
			
 
				+      console.log(temp, 'temp')
			
 
				+      if (temp.length) auditUser.value = temp[0].check_id
			
 
				+    }
			
 
				+  })
			
 
				+}
			
 
				+getCurrentAuditUser()
			
 
				+const setAuditUserLoading = ref(false)
			
 
				+const setAuditUser = () => {
			
 
				+  setAuditUserLoading.value = true
			
 
				+  userAPI
			
 
				+    .setAuditUser({ check_id: auditUser.value, type: 2 })
			
 
				+    .then((res: any) => {
			
 
				+      console.log(res, 'res')
			
 
				+      if (res.code === 1) {
			
 
				+        ElMessage.success('设置成功')
			
 
				+      }
			
 
				+    })
			
 
				+    .finally(() => (setAuditUserLoading.value = false))
			
 
				+}
			
 
				 </script>
			
 
				 
			
 
				 <style lang="scss" scoped>
			
--- a/src/pages/indent-manage/supplier/list.vue
+++ b/src/pages/indent-manage/supplier/list.vue
@@ -1,5 +1,5 @@
 
				 <template>
			
 
				-  <div class="page-indent-list py-4 px-2 shadow max-w-[1800px] mx-auto">
			
 
				+  <div class="page-indent-list py-4 px-2 shadow-sm max-w-[1800px] mx-auto">
			
 
				     <el-form
			
 
				       ref="searchForm"
			
 
				       :inline="true"
			
@@ -60,7 +60,7 @@
 
				       </div>
			
 
				     </el-form>
			
 
				 
			
 
				-    <div class="mb-2">
			
 
				+    <div class="mb-2 flex justify-between">
			
 
				       <el-button
			
 
				         size="small"
			
 
				         type="primary"
			
@@ -68,6 +68,37 @@
 
				       >
			
 
				         {{ $t('btn_add') }}
			
 
				       </el-button>
			
 
				+      <el-form inline>
			
 
				+        <el-form-item label="审核人:">
			
 
				+          <el-select
			
 
				+            v-model="auditUser"
			
 
				+            class="min-w-[200px]"
			
 
				+            filterable
			
 
				+            :loading="setAuditUserLoading"
			
 
				+            placeholder="可搜索"
			
 
				+            size="small"
			
 
				+          >
			
 
				+            <el-option
			
 
				+              v-for="user in userList"
			
 
				+              :key="user.id"
			
 
				+              :value="user.id"
			
 
				+              :label="`${user.name} (${user.username})`"
			
 
				+            ></el-option>
			
 
				+          </el-select>
			
 
				+        </el-form-item>
			
 
				+        <el-form-item>
			
 
				+          <el-tooltip content="保存审核人">
			
 
				+            <el-button
			
 
				+              type="primary"
			
 
				+              size="small"
			
 
				+              :loading="setAuditUserLoading"
			
 
				+              @click="setAuditUser"
			
 
				+            >
			
 
				+              保存
			
 
				+            </el-button>
			
 
				+          </el-tooltip>
			
 
				+        </el-form-item>
			
 
				+      </el-form>
			
 
				     </div>
			
 
				 
			
 
				     <el-table
			
@@ -205,11 +236,14 @@ import {
 
				   ElNotification,
			
 
				   ElPagination,
			
 
				   ElDialog,
			
 
				+  ElTooltip,
			
 
				+  ElMessage,
			
 
				 } from 'element-plus'
			
 
				 import compEdit from './components/edit.vue'
			
 
				 import compRecord from './components/record.vue'
			
 
				 import { $t } from '@/i18n/index'
			
 
				 import { getSupplierList, deleteSupplier } from '@/api/supplier.js'
			
 
				+import userAPI from '@/api/user'
			
 
				 
			
 
				 defineComponent({
			
 
				   name: 'ComponentIndentSupplierList',
			
@@ -396,6 +430,53 @@ const imgClick = (url: string) => {
 
				 watch(bigImageVisible, () => {
			
 
				   if (!bigImageVisible.value) currentBigImage.value = ''
			
 
				 })
			
 
				+
			
 
				+const userList = ref([] as any[])
			
 
				+const getUserListFunc = () => {
			
 
				+  userAPI
			
 
				+    .getUserList({
			
 
				+      page: 1,
			
 
				+      limit: 200,
			
 
				+    })
			
 
				+    .then((res: any) => {
			
 
				+      if (res.code !== 1) {
			
 
				+        return
			
 
				+      }
			
 
				+      userList.value =
			
 
				+        res.result.data
			
 
				+          .filter((i: any) => i.status === 1)
			
 
				+          .sort((a: any, b: any) => a.name.localeCompare(b.name)) || []
			
 
				+    })
			
 
				+}
			
 
				+getUserListFunc()
			
 
				+const auditUser = ref('')
			
 
				+const getCurrentAuditUser = () => {
			
 
				+  userAPI.getAuditUser().then((res: any) => {
			
 
				+    console.log(res, 'res')
			
 
				+    if (
			
 
				+      res.code === 1 &&
			
 
				+      Array.isArray(res.result.data) &&
			
 
				+      res.result.data.length
			
 
				+    ) {
			
 
				+      const temp = res.result.data.filter((i: any) => i.type === 1)
			
 
				+      if (temp.length) auditUser.value = temp[0].check_id
			
 
				+    }
			
 
				+  })
			
 
				+}
			
 
				+getCurrentAuditUser()
			
 
				+const setAuditUserLoading = ref(false)
			
 
				+const setAuditUser = () => {
			
 
				+  setAuditUserLoading.value = true
			
 
				+  userAPI
			
 
				+    .setAuditUser({ check_id: auditUser.value, type: 1 })
			
 
				+    .then((res: any) => {
			
 
				+      console.log(res, 'res')
			
 
				+      if (res.code === 1) {
			
 
				+        ElMessage.success('设置成功')
			
 
				+      }
			
 
				+    })
			
 
				+    .finally(() => (setAuditUserLoading.value = false))
			
 
				+}
			
 
				 </script>
			
 
				 
			
 
				 <style lang="scss" scoped>
			
--- a/src/pages/indent-manage/user/index.vue
+++ b/src/pages/indent-manage/user/index.vue
@@ -2,7 +2,7 @@
 
				   <div
			
 
				     class="page-indent-user-index max-w-[1600px] min-h-[100vh] mx-auto px-4 pt-2"
			
 
				   >
			
 
				-    <div class="text-xl mb-2 text-gray-6">用户管理</div>
			
 
				+    <div class="text-xl mb-2 text-gray-500">用户管理</div>
			
 
				     <div class="flex">
			
 
				       <el-form
			
 
				         v-model="form"
			
--- a/src/pages/so-search/index.vue
+++ b/src/pages/so-search/index.vue
@@ -199,7 +199,7 @@
 
				               width: `${pageWidth}cm`,
			
 
				               height: `${pageHeight}cm`,
			
 
				             }"
			
 
				-            class="pdf-wrap relative border border-solid border-gray-e mb-2 mr-2"
			
 
				+            class="pdf-wrap relative border border-solid border-gray-100 mb-2 mr-2"
			
 
				           >
			
 
				             <div
			
 
				               :id="`pdfItem-${i}`"
			
@@ -238,7 +238,7 @@
 
				               </div>
			
 
				               <div
			
 
				                 v-show="qrcodeVisible"
			
 
				-                class="qrcode absolute bottom-4 right-4 w-[110px] h-[110px] border border-solid border-gray-7"
			
 
				+                class="qrcode absolute bottom-4 right-4 w-[110px] h-[110px] border border-solid border-gray-500"
			
 
				               >
			
 
				                 <img
			
 
				                   v-show="qrcodeURL.length"
			
--- a/src/pages/wecom-approval/index.vue
+++ b/src/pages/wecom-approval/index.vue
@@ -918,6 +918,7 @@ const checkForm = function (formEl: FormInstance | undefined) {
 
				 
			
 
				   formEl.validate((valid, fields) => {
			
 
				     if (valid) {
			
 
				+      form.value.Phone = form.value.Phone.replace(/[^0-9-+]/g, '')
			
 
				       submit()
			
 
				     } else {
			
 
				       ElMessage.error('请检查表单必填项')
			
--- a/src/route.ts
+++ b/src/route.ts
@@ -115,6 +115,11 @@ const router = createRouter({
 
				       path: '/so-search',
			
 
				       component: () => import('@/pages/so-search/index.vue'),
			
 
				     },
			
 
				+    {
			
 
				+      name: 'cargoConsolidationRequest',
			
 
				+      path: '/cargo-consolidation-request',
			
 
				+      component: () => import('@/pages/cargo-consolidation-request/index.vue'),
			
 
				+    },
			
 
				     {
			
 
				       path: '/:pathMatch(.*)*',
			
 
				       name: 'pageNotFound',
			
--- a/tailwind.config.cjs
+++ b/tailwind.config.cjs
@@ -1,32 +1,6 @@
 
				 /** @type {import('tailwindcss').Config} */
			
 
				 module.exports = {
			
 
				   content: ['./index.html', './src/**/*.{vue,js}'],
			
 
				-  theme: {
			
 
				-    extend: {
			
 
				-      colors: {
			
 
				-        gray: {
			
 
				-          0: '#000',
			
 
				-          1: '#111',
			
 
				-          2: '#222',
			
 
				-          3: '#333',
			
 
				-          4: '#444',
			
 
				-          5: '#555',
			
 
				-          6: '#666',
			
 
				-          7: '#777',
			
 
				-          8: '#888',
			
 
				-          9: '#999',
			
 
				-          a: '#aaa',
			
 
				-          b: '#bbb',
			
 
				-          c: '#ccc',
			
 
				-          d: '#ddd',
			
 
				-          e: '#eee',
			
 
				-          f: '#fff',
			
 
				-        },
			
 
				-      },
			
 
				-    },
			
 
				-  },
			
 
				+  theme: {},
			
 
				   plugins: [],
			
 
				-  corePlugins: {
			
 
				-    preflight: false,
			
 
				-  },
			
 
				 }
			
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,6 +1,7 @@
 
				 import { defineConfig } from 'vite'
			
 
				 import vue from '@vitejs/plugin-vue'
			
 
				 import eslintPlugin from '@nabla/vite-plugin-eslint'
			
 
				+import tailwindcss from '@tailwindcss/vite'
			
 
				 
			
 
				 // https://vitejs.dev/config/
			
 
				 export default defineConfig(({ mode }) => {
			
@@ -39,6 +40,7 @@ export default defineConfig(({ mode }) => {
 
				     },
			
 
				     plugins: [
			
 
				       vue({ template: { compilerOptions: { hoistStatic: false } } }),
			
 
				+      tailwindcss(),
			
 
				       eslintPlugin(),
			
 
				     ],
			
 
				     build: {
Autor	SHA1 Wiadomość	Data
peter	d6f6fb7dc7 build: 项目依赖更新. tailwindcss升级至版本4.	2 dni temu
peter	981992b70c feat: indent 登录表单密码输入框监听回车键按钮事件.	3 dni temu
peter	f9037a3cc2 fix: indnet创建报价.sku选择对话框.修复点击分类无响应问题.	2 tygodni temu
peter	21786f5815 style: indent新建报价-选择sku窗口.分类数样式修复.	2 tygodni temu
peter	e06da04070 style: indent样式修复.	2 tygodni temu
peter	00b15759fd change: indent导出计价改用服务器端导出.	2 tygodni temu
peter	8268a0e4c8 change: indent计价pdf底部图片链接不控制换行.	2 tygodni temu
peter	764f176ff8 fix: indent编辑报价. 修复异步表单校验逻辑.	2 tygodni temu
peter	165cfca0a2 change: 部分语句写法标准化.	2 tygodni temu
peter	93b0cdc093 change: cargo consolidation应要求调整业务逻辑.	2 tygodni temu
peter	45ae035ef4 change: indent计价增加US选项.	2 tygodni temu
peter	04d9712ceb Merge branch 'release' into develop	3 tygodni temu
peter	3b8de5e467 change: 企业微信货物直发申请页面. 处理屏蔽电话字段非常见字符输入.	3 tygodni temu
peter	42306b563f feat: indent转单成功后跳转crm so详情页.	3 tygodni temu
peter	c52efdec52 feat: indent sku/供应商增加审核人相关逻辑.	3 tygodni temu
peter	e75cecf83d build: 更新项目依赖.	3 tygodni temu
peter	3a08b71875 change: cargo-consolidation-request应要求调整部分业务逻辑.	3 tygodni temu
peter	ae2bb51b13 feat: cargo consolidation request.初稿	4 tygodni temu