修改WMS标签前后端代码

src/api/wms/package/index.ts

@@ -180,3 +180,8 @@ export const getPackageByBarbasic = async (relateNumber) => {
 export const jasperExportAll = async(params: any) => {
   return await request.download({url: `/wms/package/jasperExportAll`, params})
 }
+
+//WMS采购标签和协定品标签  
+export const jasperExportWMS = async(params: any) => {
+  return await request.download({url: `/wms/package/jasperExportWMS`, params})
+}

src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue

@@ -1,7 +1,11 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="Package.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="Package.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
   <!-- 列表头部 -->
@@ -16,7 +20,8 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table
+      v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -33,7 +38,10 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
@@ -52,29 +60,44 @@
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="detailAllSchemas"
+  <Detail
-    :tabs="[{
+    ref="detailRef"
+    :isBasic="true"
+    :allSchemas="detailAllSchemas"
+    :tabs="[
+      {
         label: '包装明细',
         prop: 'PackDetail'
-    },{
+      },
+      {
         label: '明细',
         prop: 'Detail'
-    }]"
+      }
+    ]"
     :isHaveDetailTabs="false"
     @changeTabs="changeTabs"
     :detailDataProps="detailDataProps"
   />
 
-
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/package/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm
+    ref="importFormRef"
+    url="/wms/package/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
 </template>
 
 <script setup lang="ts">
 // 采购件标签
 import download from '@/utils/download'
 import { getAccessToken } from '@/utils/auth'
-import { Package,PackageRules,PackageInventory,PackageRulesInventor  } from './purchasePackage.data'
+import {
+  Package,
+  PackageRules,
+  PackageInventory,
+  PackageRulesInventor
+} from './purchasePackage.data'
 import * as BarbasicApi from '@/api/wms/barbasic'
 import { PurchasePackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -84,8 +107,8 @@ import * as Itempackaging from '@/api/wms/itempackage'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
-import {getProductionlineitemPage} from "@/api/wms/productionlineitem";
+import { getProductionlineitemPage } from '@/api/wms/productionlineitem'
-import Decimal from "decimal.js"  // 具体文件中引入
+import Decimal from 'decimal.js' // 具体文件中引入
 const { loadStart, loadDone } = usePageLoading()
 // 采购标签
 defineOptions({ name: 'PurchasePackage' })
@@ -99,14 +122,23 @@ routeName.value = route.name
 const tableColumns = ref(Package.allSchemas.tableColumns)
 const detailAllSchemas = ref(PurchasePackaging.allSchemas)
 
-
 /**
  * PurchasePackage type = PurchaseLabel 采购件标签记录页面
  * ManufacturePackage type = MakeLabel  制造件标签记录页面
  * UtensilPackage type = ContainerLabel  器具标签记录页面
  * SupplierPackage type = PurchaseLabel  供应商发货标签记录(用采购标签)
  */
- const type = ref(route.name == 'PurchasePackage'?'PurchaseLabel':route.name == 'ManufacturePackage'?'MakeLabel':route.name == 'UtensilPackage'?'ContainerLabel':route.name == 'SupplierPackage'?'PurchaseLabel':'')
+const type = ref(
+  route.name == 'PurchasePackage'
+    ? 'PurchaseLabel'
+    : route.name == 'ManufacturePackage'
+    ? 'MakeLabel'
+    : route.name == 'UtensilPackage'
+    ? 'ContainerLabel'
+    : route.name == 'SupplierPackage'
+    ? 'PurchaseLabel'
+    : ''
+)
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -134,17 +166,27 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row
 
       await getProductionlineitemPage({
         itemCode: val[0]['code']
-        }).then(res => {
+      }).then((res) => {
         if (res) {
           if (res.list.length > 0) {
             setV['productionLine'] = res.list[0].productionLineCode
           }
         }
       })
-        PackageInventory.allSchemas.formSchema.forEach(item =>{
+      PackageInventory.allSchemas.formSchema.forEach((item) => {
         if (item.value == '') {
-            if(item.field == 'itemName' || item.field == 'itemDesc1' || item.field == 'itemDesc2' || item.field == 'uom' || item.field == 'backNumber'
+          if (
-              || item.field == 'colorCode' || item.field == 'receivedNumber' || item.field == 'status' || item.field == 'packQty' || item.field == 'packUnit'){
+            item.field == 'itemName' ||
+            item.field == 'itemDesc1' ||
+            item.field == 'itemDesc2' ||
+            item.field == 'uom' ||
+            item.field == 'backNumber' ||
+            item.field == 'colorCode' ||
+            item.field == 'receivedNumber' ||
+            item.field == 'status' ||
+            item.field == 'packQty' ||
+            item.field == 'packUnit'
+          ) {
             item.componentProps.placeholder = ''
           }
         }
@@ -160,10 +202,15 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row
       if (val[0]['convertRate'] == 0 || val[0]['convertRate'] == 1) {
         setV['purchaseQty'] = basicFormRef.formModel.qty
       } else {
-        setV['purchaseQty'] = parseFloat(Decimal(basicFormRef.formModel.qty).div(Decimal(parseFloat(val[0]['convertRate']))).toNumber().toFixed(5))
+        setV['purchaseQty'] = parseFloat(
+          Decimal(basicFormRef.formModel.qty)
+            .div(Decimal(parseFloat(val[0]['convertRate'])))
+            .toNumber()
+            .toFixed(5)
+        )
       }
 
-      PackageInventory.allSchemas.formSchema.forEach(item =>{
+      PackageInventory.allSchemas.formSchema.forEach((item) => {
         if (item.value == '') {
           if (item.field == 'purchaseOrderRemarks') {
             item.componentProps.placeholder = ''
@@ -174,7 +221,7 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row
     if (formField == 'toDockCode') {
       setV['receivedLocation'] = val[0]['name']
       setV['defaultReceivingArea'] = val[0]['areaCode']
-      PackageInventory.allSchemas.formSchema.forEach(item =>{
+      PackageInventory.allSchemas.formSchema.forEach((item) => {
         if (item.value == '') {
           if (item.field == 'receivedLocation' || item.field == 'defaultReceivingArea') {
             item.componentProps.placeholder = ''
@@ -191,7 +238,7 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row
     if (formField == 'supplierCode') {
       setV['supplierCode'] = val[0]['supplierCode']
       setV['supplierName'] = val[0]['supplierName']
-      PackageInventory.allSchemas.formSchema.forEach(item =>{
+      PackageInventory.allSchemas.formSchema.forEach((item) => {
         if (item.value == '') {
           if (item.field == 'supplierCode' || item.field == 'supplierName') {
             item.componentProps.placeholder = ''
@@ -217,7 +264,7 @@ const HeadButttondata = [
   defaultButtons.defaultExportBtn(null), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -230,13 +277,17 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
+  } else if (val == 'import') {
+    // 导入
     handleImport()
-  } else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if (val == 'refresh') {
+    // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0) {
       searchFormClick({
         filters: tableObject.params.filters
@@ -244,8 +295,10 @@ const buttonBaseClick = (val, item) => {
     } else {
       getList()
     }
-  } else if (val == 'filtrate') { // 筛选
+  } else if (val == 'filtrate') {
-  } else { // 其他按钮
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
@@ -282,17 +335,27 @@ const butttondata = (row) => {
     // defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑
     // defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除
     defaultButtons.mainListPointBtn(null), // 标签打印
-  defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:barbasic:enable'}), //启用
+    defaultButtons.mainListEnableBtn({
-  defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:barbasic:disable'}), //停用
+      hide: isShowMainButton(row, ['FALSE']),
-]}
+      hasPermi: 'wms:barbasic:enable'
+    }), //启用
+    defaultButtons.mainListDisableBtn({
+      hide: isShowMainButton(row, ['TRUE']),
+      hasPermi: 'wms:barbasic:disable'
+    }) //停用
+  ]
+}
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+  if (val == 'edit') {
+    // 编辑
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
+  } else if (val == 'delete') {
+    // 删除
     handleDelete(row.id)
-  } else if (val == 'point') { // 标签打印
+  } else if (val == 'point') {
+    // 标签打印
     handleDocumentPrint(row)
   } else if (val == 'enable') {
     handleEnable(row.id)
@@ -310,7 +373,6 @@ const handleEnable = async (id: number) => {
   } catch {}
 }
 
-
 const handleDisable = async (id: number) => {
   try {
     await BarbasicApi.disableOption(id)
@@ -320,7 +382,6 @@ const handleDisable = async (id: number) => {
   } catch {}
 }
 
-
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: number) => {
@@ -342,7 +403,7 @@ const openDetail =async (row: any, titleName: any, titleValue: any) => {
   await PackageApi.getPackageByBarbasic(detailData.value.relateNumber).then((res) => {
     detailDataProps.value = res
   })
-  detailRef.value.openDetail(detailDataProps.value, titleName, titleValue,"labelBarbasic")
+  detailRef.value.openDetail(detailDataProps.value, titleName, titleValue, 'labelBarbasic')
 }
 
 /** 删除按钮操作 */
@@ -379,24 +440,55 @@ const handleExport = async () => {
 const BASE_URL = getJmreportBaseUrl()
 const documentSrc = ref(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken())
 const handleDocumentPrint = async (row) => {
+  //  if (row.itemType == 'TOOL') {
+  //      documentSrc.value =BASE_URL + '/jmreport/view/1028102732077142016?token=' + getAccessToken()//采购标签协定品模板
+  //   } else {
+  //     documentSrc.value = BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()//采购标签模板
+  // }
+  // window.open(documentSrc.value + '&id=' + row.id)
+  let id
   if (row.itemType == 'TOOL') {
-       documentSrc.value =BASE_URL + '/jmreport/view/1028102732077142016?token=' + getAccessToken()//采购标签协定品模板
+    //协定品标签
+    id = row.id
+    doHandlePrintAllExport(id, 'xdp')
   } else {
-      documentSrc.value = BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()//采购标签模板
+    //采购标签
+    id = row.id
+    doHandlePrintAllExport(id, 'cg')
   }
-  window.open(documentSrc.value + '&id=' + row.id)
 }
 
+/** 导出明细按钮操作 */
+const printAllLoading = ref(false) // 导出的加载中
+const doHandlePrintAllExport = async (id, lbType) => {
+  try {
+    // 发起导出导出明细
+    printAllLoading.value = true
+    let params = {
+      pageNo: 1,
+      id: id,
+      pageSize: 99999999,
+      lbType
+    }
+    const excelTitle = ref(route.meta.title)
+    const data = await PackageApi.jasperExportAll(params)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.pdf`)
+  } catch {
+  } finally {
+    printAllLoading.value = false
+  }
+}
 
 const labelType = ref('') // 标签类别 采购还是制造等
 const handlePoint = async (row) => {
-  PackageApi.getBalanceToPackage(row.relateNumber).then(res => {
+  PackageApi.getBalanceToPackage(row.relateNumber)
+    .then((res) => {
       if (res.productionLineCode != null) {
         labelType.value = 'zz'
       } else {
         labelType.value = 'cg'
       }
-    PackageApi.batchPrintingLable((res.number)).then((resLable) =>{
+      PackageApi.batchPrintingLable(res.number).then((resLable) => {
         // 判断是采购还是制造
         if (labelType.value == 'cg') {
           const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
@@ -406,7 +498,8 @@ const handlePoint = async (row) => {
           window.open(src.value + '&asn_number=' + resLable)
         }
       })
-  }).catch(err => {
+    })
+    .catch((err) => {
       console.log(err)
     })
 }
@@ -478,10 +571,18 @@ const changeTabs = async (item) => {
 }
 const onChange = (field, cur) => {
   if (field == 'qty') {
-    if (basicFormRef.value.formRef.formModel.convertRate==0 || basicFormRef.value.formRef.formModel.convertRate == 1) {
+    if (
+      basicFormRef.value.formRef.formModel.convertRate == 0 ||
+      basicFormRef.value.formRef.formModel.convertRate == 1
+    ) {
       basicFormRef.value.formRef.formModel['purchaseQty'] = basicFormRef.value.formRef.formModel.qty
     } else {
-      basicFormRef.value.formRef.formModel['purchaseQty'] = parseFloat(Decimal(basicFormRef.value.formRef.formModel.qty).div(Decimal(parseFloat(basicFormRef.value.formRef.formModel.convertRate))).toNumber().toFixed(5))
+      basicFormRef.value.formRef.formModel['purchaseQty'] = parseFloat(
+        Decimal(basicFormRef.value.formRef.formModel.qty)
+          .div(Decimal(parseFloat(basicFormRef.value.formRef.formModel.convertRate)))
+          .toNumber()
+          .toFixed(5)
+      )
     }
   }
 }