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

src/views/order/podUs/index.vue

@@ -131,7 +131,7 @@
           </el-radio-group>
           </el-radio-group>
         </ElFormItem>
         </ElFormItem>
         <ElFormItem label="数量">
         <ElFormItem label="数量">
-          <el-radio-group 
+          <el-radio-group
             v-model="searchForm.multi"
             v-model="searchForm.multi"
             @click.stop="(e: Event) => handleMultiRadioGroupClick(e)"
             @click.stop="(e: Event) => handleMultiRadioGroupClick(e)"
           >
           >
@@ -4103,8 +4103,10 @@ const downloadSingleType = async (
     const res = await composingDesignImages([id], type, templateWidth)
     const res = await composingDesignImages([id], type, templateWidth)
     const isTiff = type === 'tiff'
     const isTiff = type === 'tiff'
     const url = isTiff
     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) {
     if (isTiff) {
       // 对于tiff类型，直接在新窗口打开
       // 对于tiff类型，直接在新窗口打开
@@ -4151,9 +4153,11 @@ const downloadFile = async (url: string, message: string) => {
 const handleRadioGroupClick = (event: Event) => {
 const handleRadioGroupClick = (event: Event) => {
   const target = event.target as HTMLElement
   const target = event.target as HTMLElement
   const radioButton = target.closest('.el-radio-button')
   const radioButton = target.closest('.el-radio-button')
-  
+
   if (radioButton) {
   if (radioButton) {
-    const input = radioButton.querySelector('input[type="radio"]') as HTMLInputElement
+    const input = radioButton.querySelector(
+      'input[type="radio"]',
+    ) as HTMLInputElement
     if (input) {
     if (input) {
       const value = input.value
       const value = input.value
       if (searchForm.value.customizedQuantity === value) {
       if (searchForm.value.customizedQuantity === value) {
@@ -4168,9 +4172,11 @@ const handleRadioGroupClick = (event: Event) => {
 const handleMultiRadioGroupClick = (event: Event) => {
 const handleMultiRadioGroupClick = (event: Event) => {
   const target = event.target as HTMLElement
   const target = event.target as HTMLElement
   const radioButton = target.closest('.el-radio-button')
   const radioButton = target.closest('.el-radio-button')
-  
+
   if (radioButton) {
   if (radioButton) {
-    const input = radioButton.querySelector('input[type="radio"]') as HTMLInputElement
+    const input = radioButton.querySelector(
+      'input[type="radio"]',
+    ) as HTMLInputElement
     if (input) {
     if (input) {
       const value = input.value === 'true' ? true : false
       const value = input.value === 'true' ? true : false
       if (searchForm.value.multi === value) {
       if (searchForm.value.multi === value) {