Merge branch 'dev' of http://47.122.114.111:9999/qinjianhui/factory_front into dev

src/views/order/podCN/index.vue

@@ -128,13 +128,19 @@
           </el-select>
         </ElFormItem>
         <ElFormItem label="类型">
-          <el-radio-group v-model="searchForm.customizedQuantity" @click.stop="(e: Event) => handleRadioGroupClick(e)">
+          <el-radio-group
+            v-model="searchForm.customizedQuantity"
+            @click.stop="(e: Event) => handleRadioGroupClick(e)"
+          >
             <el-radio-button value="single">单面</el-radio-button>
             <el-radio-button value="multiple">多面</el-radio-button>
           </el-radio-group>
         </ElFormItem>
         <ElFormItem label="数量">
-          <el-radio-group v-model="searchForm.multi" @click.stop="(e: Event) => handleMultiRadioGroupClick(e)">
+          <el-radio-group
+            v-model="searchForm.multi"
+            @click.stop="(e: Event) => handleMultiRadioGroupClick(e)"
+          >
             <el-radio-button :value="false">单件</el-radio-button>
             <el-radio-button :value="true">多件</el-radio-button>
           </el-radio-group>
@@ -385,31 +391,25 @@
                   :loading="tifDownloadLoading"
                   @click="downloadTif('tiff', 42)"
                   >TIF(40+2cm)
-                </ElDropdownItem
-                >
+                </ElDropdownItem>
                 <ElDropdownItem
                   :loading="tifDownloadLoading"
                   @click="downloadTif('tiff', 60)"
                   >TIF(60cm)
-                </ElDropdownItem
-                >
+                </ElDropdownItem>
                 <ElDropdownItem
                   :loading="pngDownloadLoading"
                   @click="downloadTif('png', 42)"
                   >PNG(40+2cm)
-                </ElDropdownItem
-                >
+                </ElDropdownItem>
                 <ElDropdownItem
                   :loading="pngDownloadLoading"
                   @click="downloadTif('png', 60)"
                   >PNG(60cm)
-                </ElDropdownItem
-                >
+                </ElDropdownItem>
               </ElDropdownMenu>
-            </template
-            >
-          </ElDropdown
-          >
+            </template>
+          </ElDropdown>
         </ElFormItem>
         <ElFormItem>
           <!-- <span
@@ -691,17 +691,8 @@
               刷新商品信息
             </ElButton>
           </span>
-          <span
-            v-if="
-              [
-                'WAIT_SHIPMENT',
-              ].includes(status)
-            "
-            class="item"
-          >
-            <ElButton type="primary" @click="printNormal">
-              普货拣货
-            </ElButton>
+          <span v-if="['WAIT_SHIPMENT'].includes(status)" class="item">
+            <ElButton type="primary" @click="printNormal"> 普货拣货 </ElButton>
           </span>
           <span
             v-if="
@@ -970,7 +961,9 @@
                     style="display: flex; flex-direction: column"
                   >
                     <div
-                      v-for="img in item.productMark!=='normal' ?item.previewImgs:[{url:item.variantImage}]"
+                      v-for="img in item.productMark !== 'normal'
+                        ? item.previewImgs
+                        : [{ url: item.variantImage }]"
                       :key="img"
                       style="text-align: center"
                     >
@@ -1197,7 +1190,10 @@
                         {{ item.replenishmentSumNum || 0 }}
                       </span>
                       <el-button
-                        v-if="status === 'WAIT_SHIPMENT' && item.productMark!=='normal'"
+                        v-if="
+                          status === 'WAIT_SHIPMENT' &&
+                          item.productMark !== 'normal'
+                        "
                         link
                         size="small"
                         type="success"
@@ -1215,7 +1211,10 @@
                         {{ item.weight }}g
                       </span>
                       <el-button
-                        v-if="status === 'WAIT_SHIPMENT' && item.productMark!=='normal'"
+                        v-if="
+                          status === 'WAIT_SHIPMENT' &&
+                          item.productMark !== 'normal'
+                        "
                         link
                         size="small"
                         type="warning"
@@ -1714,8 +1713,7 @@
                         :title="item.name || ''"
                         style="margin-bottom: 2px"
                         >{{ item.name || '' }}
-                      </el-tag
-                      >
+                      </el-tag>
                     </div>
                   </template>
                   <div
@@ -1750,8 +1748,7 @@
                       size="small"
                       type="primary"
                       >+{{ cardItem.customTagList.slice(3).length }}
-                    </el-tag
-                    >
+                    </el-tag>
                   </div>
                 </el-tooltip>
               </template>
@@ -1805,7 +1802,7 @@
               </template>
               <template #images>
                 <div class="flex-between">
-                  <div v-if="cardItem.imageAry " class="images-position">
+                  <div v-if="cardItem.imageAry" class="images-position">
                     <div
                       v-for="(item, index) in JSON.parse(
                         cardItem.imageAry || '',
@@ -2436,8 +2433,7 @@
           }
         "
         >取消
-      </el-button
-      >
+      </el-button>
       <el-button type="primary" @click="submitTypesetting">确认</el-button>
     </template>
   </ElDialog>
@@ -2503,7 +2499,8 @@ import {
   printPickPdfByBatchNumberApi,
   printProductionPdfByBatchNumberApi,
   batchDownloadRecomposingApi,
-  getCustomTagListCnApi, printNormalPdf,
+  getCustomTagListCnApi,
+  printNormalPdf,
 } from '@/api/podCnOrder'
 
 import { BaseRespData } from '@/types/api'
@@ -2557,7 +2554,7 @@ import {
 declare global {
   interface Window {
     ActiveXObject: {
-      new(type: string): XMLHttpRequest
+      new (type: string): XMLHttpRequest
     }
     VBS_BinaryToArray: {
       (data: unknown): { toArray(): number[] }
@@ -2679,13 +2676,16 @@ const productMarkList = [
   {
     label: '普通商品',
     value: 'normal',
-  }, {
+  },
+  {
     label: 'pod商品',
     value: 'pod',
-  }, {
+  },
+  {
     label: '一件定制局部印',
     value: 'custom_part',
-  }, {
+  },
+  {
     label: '一件定制满印',
     value: 'custom_full',
   },
@@ -2886,8 +2886,9 @@ const printNormal = async () => {
   if (!selection.value.length) {
     return ElMessage.warning('请选择订单')
   }
-  selection.value.forEach(s => {
-    const f = s.productList && s.productList.find(p => p.productMark === 'normal')
+  selection.value.forEach((s) => {
+    const f =
+      s.productList && s.productList.find((p) => p.productMark === 'normal')
     if (f) arr.push(s.id)
   })
   if (!arr.length) {
@@ -3883,8 +3884,10 @@ const downloadSingleType = async (
     const res = await composingDesignImages([id], type, templateWidth)
     const isTiff = type === 'tiff'
     const url = isTiff
-      ? `https://ps.jomalls.com/tiff/${res.message}`
-      : `${filePath}${res.message}`
+      ? res.message?.startsWith('/temp')
+        ? `https://factory.jomalls.com/upload/factory` + res.message
+        : `https://ps.jomalls.com/tiff/` + res.message
+      : filePath + res.message
 
     if (isTiff) {
       // 对于tiff类型，直接在新窗口打开
@@ -3903,7 +3906,9 @@ const handleRadioGroupClick = (event: Event) => {
   const radioButton = target.closest('.el-radio-button')
 
   if (radioButton) {
-    const input = radioButton.querySelector('input[type="radio"]') as HTMLInputElement
+    const input = radioButton.querySelector(
+      'input[type="radio"]',
+    ) as HTMLInputElement
     if (input) {
       const value = input.value
       if (searchForm.value.customizedQuantity === value) {
@@ -3920,7 +3925,9 @@ const handleMultiRadioGroupClick = (event: Event) => {
   const radioButton = target.closest('.el-radio-button')
 
   if (radioButton) {
-    const input = radioButton.querySelector('input[type="radio"]') as HTMLInputElement
+    const input = radioButton.querySelector(
+      'input[type="radio"]',
+    ) as HTMLInputElement
     if (input) {
       const value = input.value === 'true' ? true : false
       if (searchForm.value.multi === value) {

src/views/order/podUs/index.vue

@@ -4103,8 +4103,10 @@ const downloadSingleType = async (
     const res = await composingDesignImages([id], type, templateWidth)
     const isTiff = type === 'tiff'
     const url = isTiff
-      ? `https://ps.jomalls.com/tiff/${res.message}`
-      : `${filePath}${res.message}`
+      ? res.message?.startsWith('/temp')
+        ? `https://factory.jomalls.com/upload/factory` + res.message
+        : `https://ps.jomalls.com/tiff/` + res.message
+      : filePath + res.message
 
     if (isTiff) {
       // 对于tiff类型，直接在新窗口打开
@@ -4153,7 +4155,9 @@ const handleRadioGroupClick = (event: Event) => {
   const radioButton = target.closest('.el-radio-button')
 
   if (radioButton) {
-    const input = radioButton.querySelector('input[type="radio"]') as HTMLInputElement
+    const input = radioButton.querySelector(
+      'input[type="radio"]',
+    ) as HTMLInputElement
     if (input) {
       const value = input.value
       if (searchForm.value.customizedQuantity === value) {
@@ -4170,7 +4174,9 @@ const handleMultiRadioGroupClick = (event: Event) => {
   const radioButton = target.closest('.el-radio-button')
 
   if (radioButton) {
-    const input = radioButton.querySelector('input[type="radio"]') as HTMLInputElement
+    const input = radioButton.querySelector(
+      'input[type="radio"]',
+    ) as HTMLInputElement
     if (input) {
       const value = input.value === 'true' ? true : false
       if (searchForm.value.multi === value) {