Merge branch 'dev' into linjinhong

src/views/order/podUs/index.vue

@@ -247,7 +247,7 @@
         <span v-if="status === 'PICKING'" class="item">
           <ElButton
             :loading="downloadLoading"
-            type="warning"
+            type="primary"
             @click="downloadTif"
           >
             排版
@@ -774,6 +774,9 @@
               </div>
             </div> -->
           </template>
+          <template #exceptionReason="{ row }">
+            <div v-html="row.exceptionReason"></div>
+          </template>
           <template #innerLabel="{ row }">
             <div v-if="row.internalMemoList" class="inner-label-box">
               <div
@@ -1526,6 +1529,7 @@ const tableColumns = computed(() => [
     label: '异常原因',
     width: 300,
     prop: 'exceptionReason',
+    slot: 'exceptionReason',
   },
   {
     label: '操作',
@@ -1551,6 +1555,44 @@ const handleSelectionChange = (val: PodUsOrderListData[]) => {
     stockOutSuccessIds.value = []
   }
 }
+
+const asyncOrderAddress = async () => {
+  if (selection.value.length === 0) {
+    return ElMessage.warning('请选择数据')
+  }
+  try {
+    await showConfirm('确定同步收货地址吗?', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    })
+  } catch {
+    return
+  }
+  const ids = selection.value.map((item) => item.id)
+  const loading = ElLoading.service({
+    fullscreen: true,
+    text: '操作中...',
+    background: 'rgba(0, 0, 0, 0.3)',
+  })
+  try {
+    const res = await syncReceiverAddress(ids)
+    if (res.code !== 200) return
+    await ElMessageBox.alert('同步收货地址成功，请刷新查看。', '提示', {
+      type: 'warning',
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      showCancelButton: true,
+    })
+    search()
+    await loadTabData()
+  } catch (e) {
+    console.error(e)
+  } finally {
+    loading.close()
+  }
+}
+
 const changeTab = (item: Tab) => {
   status.value = item.status || ''
   selection.value = []
@@ -1777,10 +1819,9 @@ const downloadTif = async () => {
   downloadLoading.value = true
   try {
     const res = await composingDesignImages(selection.value.map((el) => el.id))
-    window.open('http://ps.jomalls.com/tiff/' + res.message, '_blank')
+    window.open(filePath + res.message, '_blank')
     downloadLoading.value = false
   } catch (e) {
-    console.log(e)
     downloadLoading.value = false
   }
 }
@@ -2957,6 +2998,13 @@ const handleExceptionCommand = (command: number) => {
     }
   }
 }
+
+.operate-item {
+  .el-button {
+    margin-left: 0 !important;
+    margin-top: 20px !important;
+  }
+}
 </style>
 <style>
 .customize-select-style {