Merge remote-tracking branch 'origin/lin-task' into dev

src/api/podUsOrder.ts

@@ -574,3 +574,14 @@ export function printPickPdfByBatchNumberApi(params: {
     },
     },
   )
   )
 }
 }
+// 打印生产单item
+export function printProductionPdfByBatchNumberApi(params: {
+  batchArrangeNumber: string
+}) {
+  return axios.get<never, BaseRespData<never>>(
+    `factory/podJomallOrderProductUs/printProductionPdfByBatchNumber`,
+    {
+      params,
+    },
+  )
+}

src/views/order/podUs/index.vue

@@ -262,7 +262,6 @@
             <ElButton type="primary" @click="search">查询</ElButton>
             <ElButton type="primary" @click="search">查询</ElButton>
           </span>
           </span>
         </ElFormItem>
         </ElFormItem>
-
         <ElFormItem
         <ElFormItem
           v-if="
           v-if="
             status === 'PICKING' ||
             status === 'PICKING' ||
@@ -270,6 +269,33 @@
             status === 'IN_PRODUCTION'
             status === 'IN_PRODUCTION'
           "
           "
         >
         >
+          <ElDropdown>
+            <el-button type="primary">
+              DTF排版<el-icon class="el-icon--right"><ArrowDown /></el-icon>
+            </el-button>
+            <template #dropdown>
+              <ElDropdownMenu>
+                <ElDropdownItem
+                  :loading="tifDownloadLoading"
+                  @click="downloadTif('png')"
+                  >TIF排版</ElDropdownItem
+                >
+                <ElDropdownItem
+                  :loading="pngDownloadLoading"
+                  @click="downloadTif('png')"
+                  >PNG排版</ElDropdownItem
+                >
+              </ElDropdownMenu></template
+            ></ElDropdown
+          ></ElFormItem
+        >
+        <!-- <ElFormItem
+          v-if="
+            status === 'PICKING' ||
+            status === 'TO_BE_REPLENISHMENT' ||
+            status === 'IN_PRODUCTION'
+          "
+        >
           <span class="item">
           <span class="item">
             <ElButton
             <ElButton
               :loading="tifDownloadLoading"
               :loading="tifDownloadLoading"
@@ -296,7 +322,7 @@
               PNG排版
               PNG排版
             </ElButton>
             </ElButton>
           </span>
           </span>
-        </ElFormItem>
+        </ElFormItem> -->
         <ElFormItem v-if="status === 'TO_BE_CONFIRMED'">
         <ElFormItem v-if="status === 'TO_BE_CONFIRMED'">
           <span class="item">
           <span class="item">
             <ElButton type="success" @click="confirmProduct">
             <ElButton type="success" @click="confirmProduct">
@@ -1449,7 +1475,7 @@
                 <ElButton
                 <ElButton
                   link
                   link
                   type="primary"
                   type="primary"
-                  @click="printPickingOrderItem(row)"
+                  @click="printPickingOrderItem(row, 1)"
                 >
                 >
                   打印拣货单
                   打印拣货单
                 </ElButton>
                 </ElButton>
@@ -1457,6 +1483,15 @@
               <span class="operate-item">
               <span class="operate-item">
                 <ElButton
                 <ElButton
                   link
                   link
+                  type="primary"
+                  @click="printPickingOrderItem(row, 2)"
+                >
+                  打印生产单
+                </ElButton>
+              </span>
+              <span class="operate-item">
+                <ElButton
+                  link
                   type="warning"
                   type="warning"
                   :loading="reComposingLoadingMap[row.id]"
                   :loading="reComposingLoadingMap[row.id]"
                   @click="handleReComposingDesign(row)"
                   @click="handleReComposingDesign(row)"
@@ -2342,6 +2377,7 @@ import {
   get17TrackInfoApi,
   get17TrackInfoApi,
   getAccountCodeByFactoryIdApi,
   getAccountCodeByFactoryIdApi,
   printPickPdfByBatchNumberApi,
   printPickPdfByBatchNumberApi,
+  printProductionPdfByBatchNumberApi,
 } from '@/api/podUsOrder'
 } from '@/api/podUsOrder'
 import { BaseRespData } from '@/types/api'
 import { BaseRespData } from '@/types/api'
 
 
@@ -2780,12 +2816,12 @@ const tableColumns = computed(() => {
       {
       {
         label: '订单数量',
         label: '订单数量',
         prop: 'productNum',
         prop: 'productNum',
-        width: 100,
+        width: 90,
         align: 'center',
         align: 'center',
       },
       },
       {
       {
         label: '素材数量',
         label: '素材数量',
-        width: 120,
+        width: 90,
         prop: 'materialNum',
         prop: 'materialNum',
         align: 'center',
         align: 'center',
       },
       },
@@ -2797,21 +2833,21 @@ const tableColumns = computed(() => {
       },
       },
       {
       {
         label: '失败原因',
         label: '失败原因',
-        minWidth: 300,
+        minWidth: 250,
         prop: 'failReason',
         prop: 'failReason',
         slot: 'failReason',
         slot: 'failReason',
         align: 'left',
         align: 'left',
       },
       },
       {
       {
         label: '创建时间',
         label: '创建时间',
-        width: 200,
+        width: 180,
         prop: 'createTime',
         prop: 'createTime',
         slot: 'createTime',
         slot: 'createTime',
         align: 'center',
         align: 'center',
       },
       },
       {
       {
         label: '完成时间',
         label: '完成时间',
-        width: 200,
+        width: 180,
         prop: 'finishTime',
         prop: 'finishTime',
         slot: 'finishTime',
         slot: 'finishTime',
         align: 'center',
         align: 'center',
@@ -2826,7 +2862,7 @@ const tableColumns = computed(() => {
       {
       {
         label: '操作',
         label: '操作',
         slot: 'operate',
         slot: 'operate',
-        width: 350,
+        width: 450,
         align: 'center',
         align: 'center',
         fixed: 'right',
         fixed: 'right',
         prop: 'operate',
         prop: 'operate',
@@ -3540,7 +3576,10 @@ const printPickingOrder = async () => {
     loading.close()
     loading.close()
   }
   }
 }
 }
-const printPickingOrderItem = async (row: { batchArrangeNum: string }) => {
+const printPickingOrderItem = async (
+  row: { batchArrangeNum: string },
+  type: number,
+) => {
   console.log(333, row)
   console.log(333, row)
 
 
   const loading = ElLoading.service({
   const loading = ElLoading.service({
@@ -3548,13 +3587,22 @@ const printPickingOrderItem = async (row: { batchArrangeNum: string }) => {
     text: '操作中...',
     text: '操作中...',
     background: 'rgba(0, 0, 0, 0.3)',
     background: 'rgba(0, 0, 0, 0.3)',
   })
   })
+
   try {
   try {
-    const res = await printPickPdfByBatchNumberApi({
-      batchArrangeNumber: row.batchArrangeNum,
-    })
-    if (res.code !== 200) return
+    let res
+    if (type === 1) {
+      res = await printPickPdfByBatchNumberApi({
+        batchArrangeNumber: row.batchArrangeNum,
+      })
+    } else if (type === 2) {
+      res = await printProductionPdfByBatchNumberApi({
+        batchArrangeNumber: row.batchArrangeNum,
+      })
+    }
+
+    if (res?.code !== 200) return
     ElMessage.success('操作成功')
     ElMessage.success('操作成功')
-    window.open(filePath + res.message)
+    window.open(filePath + res?.message)
   } catch (e) {
   } catch (e) {
     console.error(e)
     console.error(e)
   } finally {
   } finally {