库存余额，打印标签功能修改 YT-459

src/api/wms/package/index.ts

@@ -132,9 +132,10 @@ export const getBalanceToPackage = async (packingNumber: String) => {
 }
 
 // 根据库存余额获取包装信息进行打印标签(英泰)
-export const getBalanceToPackageByIntex = async (itemCode: String) => {
+export const getBalanceToPackageByIntex = async (itemCode: String,batch: String) => {
   const data = {
-    itemCode: itemCode
+    itemCode: itemCode,
+    batch: batch
   }
   return await request.put({ url: `/wms/package/getBalanceToPackageByIntex`, data: data})
 }

src/views/wms/inventoryManage/balance/index.vue

@@ -16,7 +16,9 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table ref="tableRef" v-clientTable
+    <Table
+      ref="tableRef"
+      v-clientTable
       :selection="true"
       :columns="tableColumns"
       :data="tableObject.tableList"
@@ -29,13 +31,17 @@
       v-model:sort="tableObject.sort"
       @getSelectionRows="getSelectionRows"
     >
-      <template #itemCode="{row}">
+      <template #itemCode="{ row }">
-        <el-button :type="row.frozen=='TRUE'||row.expireDate<dayjs().valueOf()?'danger':'primary'" link @click="openDetail(row, '物料代码', row.itemCode)">
+        <el-button
-          <span >{{ row.itemCode }}</span>
+          :type="row.frozen == 'TRUE' || row.expireDate < dayjs().valueOf() ? 'danger' : 'primary'"
+          link
+          @click="openDetail(row, '物料代码', row.itemCode)"
+        >
+          <span>{{ row.itemCode }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -59,16 +65,26 @@
     :detailAllSchemas="TransactionTab.allSchemas"
     :apiPage="apiPage"
     :tabsExtend="tabsExtend"
-    :tabs="[{
+    :tabs="[
+      {
         label: '库存事务',
         prop: 'Transaction'
-    }]"
+      }
+    ]"
     @changeTabs="changeTabs"
     :tableObjectExtend="tableObjectExtend"
   />
 
+  <!-- 标签打印 -->
+  <SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccessLabel" />
+
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/balance/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm
+    ref="importFormRef"
+    url="/wms/balance/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
 </template>
 
 <script setup lang="ts">
@@ -77,7 +93,7 @@ import download from '@/utils/download'
 import * as BalanceApi from '@/api/wms/balance'
 import * as PackageApi from '@/api/wms/package'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import { Balance,TransactionTab, BalanceRules } from './balance.data'
+import { Balance, TransactionTab, BalanceRules } from './balance.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
@@ -86,6 +102,9 @@ import { getAccessToken } from '@/utils/auth'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import {
+  SupplierdeliverRequestPackage
+} from '@/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data'
 const { loadStart, loadDone } = usePageLoading()
 // 库存余额
 defineOptions({ name: 'Balance' })
@@ -117,11 +136,11 @@ const { getList, setSearchParams } = tableMethods
 const HeadButttondata = [
   // defaultButtons.defaultAddBtn({hasPermi:'wms:balance:create'}), // 新增
   // defaultButtons.defaultImportBtn({hasPermi:'wms:balance:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:balance:export'}), // 导出
+  defaultButtons.defaultExportBtn({ hasPermi: 'wms:balance:export' }), // 导出
   defaultButtons.mainLisSelectiontPointBtn(null), // 批量标签打印
-  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFreshBtn(null), //刷新
   defaultButtons.defaultFilterBtn(null), //筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -134,40 +153,49 @@ 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') {
+    // 刷新
     selectionRows.value = []
-    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+    if (tableObject.params.filters && tableObject.params.filters.length > 0) {
       searchFormClick({
         filters: tableObject.params.filters
       })
     } else {
       getList()
     }
-  } else if (val == 'filtrate') { // 筛选
+  } else if (val == 'filtrate') {
-  } else if (val=='selection_point'){// 批量打印
+    // 筛选
+  } else if (val == 'selection_point') {
+    // 批量打印
     handleSelectionPoint()
-  } else { // 其他按钮 
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
-const searchList = (model)=>{
+const searchList = (model) => {
   selectionRows.value = []
   setSearchParams(model)
 }
 watch(
   () => tableObject.tableList,
   () => {
-    const currentRows = selectionRows.value.find(item=>item.currentPage==tableObject.currentPage)
+    const currentRows = selectionRows.value.find(
-    if(currentRows){
+      (item) => item.currentPage == tableObject.currentPage
+    )
+    if (currentRows) {
       nextTick(() => {
-        currentRows.selectionRows.forEach(item=>{
+        currentRows.selectionRows.forEach((item) => {
-          tableRef.value.toggleRowSelection(item,true)
+          tableRef.value.toggleRowSelection(item, true)
         })
       })
     }
@@ -175,45 +203,46 @@ watch(
 )
 const selectionRows = ref<any>([])
 const tableRef = ref()
-const getSelectionRows = (currentPage,currentPageSelectionRows) => {
+const getSelectionRows = (currentPage, currentPageSelectionRows) => {
-  console.log("getSelectionRows",currentPage,currentPageSelectionRows)
+  console.log('getSelectionRows', currentPage, currentPageSelectionRows)
-  const currentRows = selectionRows.value.find(item=>item.currentPage==currentPage)
+  const currentRows = selectionRows.value.find((item) => item.currentPage == currentPage)
-  if(currentRows){
+  if (currentRows) {
     currentRows.selectionRows = currentPageSelectionRows
-  }else{
+  } else {
     selectionRows.value.push({
       currentPage,
-      selectionRows:currentPageSelectionRows
+      selectionRows: currentPageSelectionRows
     })
   }
 }
 
-const handleSelectionPoint = async ()=>{
+const handleSelectionPoint = async () => {
-  let rows:any = []
+  let rows: any = []
-  selectionRows.value.forEach(item=>{
+  selectionRows.value.forEach((item) => {
-    rows = [...rows,...item.selectionRows.map(item1=>item1.packingNumber)]
+    rows = [...rows, ...item.selectionRows.map((item1) => item1.packingNumber)]
   })
-  console.log('批量打印',rows.join(','))
+  console.log('批量打印', rows.join(','))
   let getLoading = ElLoading.service({
     lock: true,
     text: 'loading...',
     background: 'rgba(0, 0, 0, 0.7)'
   })
-  PackageApi.getBalanceToPackageSelection(rows).then(res => {
+  PackageApi.getBalanceToPackageSelection(rows)
-    console.log('res',res);
+    .then((res) => {
+      console.log('res', res)
       getLoading?.close()
-    if(res.zzLabel){
+      if (res.zzLabel) {
         //制造标签
         const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
-      window.open(src.value+'&asn_number='+res.zzLabel)
+        window.open(src.value + '&asn_number=' + res.zzLabel)
       }
       if (res.cgLabel) {
         //采购标签
         const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
-      window.open(src.value+'&asn_number='+res.cgLabel)
+        window.open(src.value + '&asn_number=' + res.cgLabel)
       }
-    
+    })
-  }).catch(err => {
+    .catch((err) => {
       console.log(err)
       getLoading?.close()
     })
@@ -229,10 +258,10 @@ const butttondata = [
     icon: '',
     color: '',
     link: true,
-    float:'right',
+    float: 'right',
     hasPermi: ''
   },
-  defaultButtons.mainListPointBtn(null), // 标签打印
+  defaultButtons.mainListPointBtn(null) // 标签打印
   // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑
   // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除
 ]
@@ -240,9 +269,20 @@ const butttondata = [
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'bqxx') {
-    let aaa = 'HPQ;V1.0;I'+row.itemCode+';P'+row.packingNumber+';B'+row.batch+';Q'+row.qty+';U'+row.uom
+    let aaa =
+      'HPQ;V1.0;I' +
+      row.itemCode +
+      ';P' +
+      row.packingNumber +
+      ';B' +
+      row.batch +
+      ';Q' +
+      row.qty +
+      ';U' +
+      row.uom
     alert(aaa)
-  }else if (val == 'point') { // 标签打印
+  } else if (val == 'point') {
+    // 标签打印
     handlePoint(row)
   }
   // if (val == 'edit') { // 编辑
@@ -264,35 +304,68 @@ const detailRef = ref()
 const chooseRow = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
   chooseRow.value = row
-  detailRef.value.openDetail(row, titleName, titleValue,'transactionBalance')
+  detailRef.value.openDetail(row, titleName, titleValue, 'transactionBalance')
 }
 
 const BASE_URL = getJmreportBaseUrl()
 const labelType = ref('') // 标签类别 采购还是制造等
-// 标签打印
+
 const handlePoint = async (row) => {
-  const itemCode = row.itemCode
+  console.log(2333)
-  PackageApi.getBalanceToPackageByIntex(itemCode).then(res => {
+  tableObject.loading = true
-    console.log(777,res);
+  //获取类型
-      if (res.productionLineCode != null) {
+  // await getLabelType(row,false)
-        labelType.value = 'zz'
+  await getLabelDetailPage(row, false)
-      } else {
+}
-        labelType.value = 'cg'
+
-      }
+const searchTableRef = ref()
-      PackageApi.batchPrintingLable((res.number)).then((resLable) =>{
+
-        console.log(159,resLable )
+const getLabelDetailPage = async (row, useToPackingNumber) => {
- // 判断是采购还是制造
+  ////英泰项目没有包装号 所以只能通过物料号，批次，到库位代码去查询对应的包装
- if (labelType.value == 'cg') {
+  let defaultParams = {
-    const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+    moduleName: 'move',
-    console.log(159,resLable )
+    recordNumber: '',
-    window.open(src.value+'&asn_number='+resLable)
+    itemCode: row.itemCode,
-  } else {
+    batch: row.batch
-    const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
-    window.open(src.value+'&asn_number='+resLable)
   }
+  const { tableObject: tableObjectPrint, tableMethods } = useTable({
+    defaultParams,
+    getListApi: PackageApi.getLabelDetailPage // 分页接口
+  })
+  // 获得表格的各种操作
+  const { getList: getListPrint } = tableMethods
+  await getListPrint()
+  console.log('tableObjectPrint', tableObjectPrint)
+  tableObject.loading = false
+  const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
+  tableColumns.forEach((item) => {
+    item.width = item.table?.width || 150
   })
+  searchTableRef.value.openData('标签信息', tableObjectPrint, { tableColumns }, true)
+}
+
+// 批量打印--预生产收货
+const searchTableSuccessLabel = async (formField, searchField, val, formRef, type, row) => {
+  console.log('批量打印',val)
+
+  if(val.length == 0){
+    message.warning("请先选择要打印的数据!")
+    return
+  }
+  await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
+      console.log(res)
+      // if (labelType.value == 'cg') {
+      //   const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+      //   window.open(src.value+'&asn_number='+res)
+      // } else {
+      //   const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+      //   window.open(src.value+'&asn_number='+res)
+      // }
+      const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+        window.open(src.value+'&asn_number='+res)
   }).catch(err => {
     console.log(err)
+    message.error('创建标签失败')
   })
 }
 
@@ -305,7 +378,7 @@ const handleDelete = async (id: number) => {
     await BalanceApi.deleteBalance(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    buttonBaseClick('refresh',null)
+    buttonBaseClick('refresh', null)
   } catch {}
 }
 
@@ -352,13 +425,15 @@ const changeTabs = (item) => {
   if (item.prop == 'Transaction') {
     tabsExtend.value = true
     // 当前物料代码作为条件
-    tableObjectExtend.value = [{
+    tableObjectExtend.value = [
+      {
         key: 'masterId',
         value: chooseRow.value.id
-    }]
+      }
+    ]
     apiPage.value = BalanceApi.getTransactionBalancePage
 
-    console.log(988,tableObjectExtend.value)
+    console.log(988, tableObjectExtend.value)
   } else {
     tableObjectExtend.value = []
     tabsExtend.value = false
@@ -366,7 +441,7 @@ const changeTabs = (item) => {
   }
 }
 /** 初始化 **/
-onMounted(async() => {
+onMounted(async () => {
   getList()
   // importTemplateData.templateUrl = await BalanceApi.importTemplate()
 })

src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue

@@ -181,7 +181,6 @@ const openForm =async (type: string, row?: number) => {
   formRef.value.open(type, row)
 }
 
-// 列表-操作按钮
 // 列表-操作按钮
 const butttondata = (row,$index) => {
   // const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1