Browse Source

修改WMS标签前后端代码

intex_online20250609
叶佳兴 2 weeks ago
parent
commit
573374e1d6
  1. 5
      src/api/wms/package/index.ts
  2. 381
      src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue

5
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})
}

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

@ -1,22 +1,27 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="Package.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search
:schema="Package.allSchemas.searchSchema"
@search="setSearchParams"
@reset="setSearchParams"
/>
</ContentWrap>
<!-- 列表头部 -->
<TableHead
:HeadButttondata="HeadButttondata"
@button-base-click="buttonBaseClick"
:routeName="routeName"
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="Package.allSchemas"
/>
<!-- 列表头部 -->
<TableHead
:HeadButttondata="HeadButttondata"
@button-base-click="buttonBaseClick"
:routeName="routeName"
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="Package.allSchemas"
/>
<!-- 列表 -->
<ContentWrap>
<Table v-clientTable
<Table
v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"
@ -27,13 +32,16 @@
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
<template #number="{row}">
<template #number="{ row }">
<el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
<span>{{ row.number }}</span>
</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,31 +60,46 @@
/>
<!-- 详情 -->
<Detail ref="detailRef" :isBasic="true" :allSchemas="detailAllSchemas"
:tabs="[{
label: '包装明细',
prop: 'PackDetail'
},{
label: '明细',
prop: 'Detail'
}]"
<Detail
ref="detailRef"
:isBasic="true"
:allSchemas="detailAllSchemas"
:tabs="[
{
label: '包装明细',
prop: 'PackDetail'
},
{
label: '明细',
prop: 'Detail'
}
]"
:isHaveDetailTabs="false"
@changeTabs="changeTabs"
:detailDataProps=" detailDataProps"
: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 { PurchasePackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import * as PackageApi from '@/api/wms/package'
import { formatTime } from '@/utils/index'
@ -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 Decimal from "decimal.js" //
import { getProductionlineitemPage } from '@/api/wms/productionlineitem'
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) => {
@ -114,42 +146,52 @@ const updataTableColumns = (val) => {
}
//
const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row ) => {
const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row) => {
nextTick(async () => {
const setV = {}
setV[formField] = val[0][searchField]
if (formField == 'itemCode') {
setV['itemCode'] = val[0]['code']
setV['itemName'] = val[0]['name']
setV['itemDesc1'] = val[0]['desc1']
setV['itemDesc2'] = val[0]['desc2']
setV['itemType'] = val[0]['type']
setV['uom'] = val[0]['uom']
setV['backNumber'] = val[0]['backNumber']
setV['colorCode'] = val[0]['colorCode']
setV['receivedNumber'] = val[0]['receivedNumber']
setV['status'] = val[0]['status']
setV['packQty'] = val[0]['defaultPackQty']
setV['packUnit'] = val[0]['defaultPackUnit']
await getProductionlineitemPage({
itemCode: val[0]['code']
}).then(res => {
if (res) {
if (res.list.length > 0) {
setV['productionLine'] = res.list[0].productionLineCode
}
const setV = {}
setV[formField] = val[0][searchField]
if (formField == 'itemCode') {
setV['itemCode'] = val[0]['code']
setV['itemName'] = val[0]['name']
setV['itemDesc1'] = val[0]['desc1']
setV['itemDesc2'] = val[0]['desc2']
setV['itemType'] = val[0]['type']
setV['uom'] = val[0]['uom']
setV['backNumber'] = val[0]['backNumber']
setV['colorCode'] = val[0]['colorCode']
setV['receivedNumber'] = val[0]['receivedNumber']
setV['status'] = val[0]['status']
setV['packQty'] = val[0]['defaultPackQty']
setV['packUnit'] = val[0]['defaultPackUnit']
await getProductionlineitemPage({
itemCode: val[0]['code']
}).then((res) => {
if (res) {
if (res.list.length > 0) {
setV['productionLine'] = res.list[0].productionLineCode
}
})
PackageInventory.allSchemas.formSchema.forEach(item =>{
if(item.value == ''){
if(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 = ''
}
}
})
PackageInventory.allSchemas.formSchema.forEach((item) => {
if (item.value == '') {
if (
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 = ''
}
})
}
}
})
}
if (formField == 'asnNumber') {
setV['purchaseOrderRemarks'] = val[0]['remark']
setV['poNumber'] = val[0]['poNumber']
@ -157,15 +199,20 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row
setV['purchaseStdQty'] = val[0]['supplierQty']
setV['purchaseUom'] = val[0]['supplierUom']
setV['convertRate'] = val[0]['convertRate']
if (val[0]['convertRate']==0 || val[0]['convertRate'] == 1) {
setV['purchaseQty'] =basicFormRef.formModel.qty
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 =>{
if(item.value == ''){
if(item.field == 'purchaseOrderRemarks'){
PackageInventory.allSchemas.formSchema.forEach((item) => {
if (item.value == '') {
if (item.field == 'purchaseOrderRemarks') {
item.componentProps.placeholder = ''
}
}
@ -174,9 +221,9 @@ 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 =>{
if(item.value == ''){
if(item.field == 'receivedLocation' || item.field == 'defaultReceivingArea'){
PackageInventory.allSchemas.formSchema.forEach((item) => {
if (item.value == '') {
if (item.field == 'receivedLocation' || item.field == 'defaultReceivingArea') {
item.componentProps.placeholder = ''
}
}
@ -191,15 +238,15 @@ 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 =>{
if(item.value == ''){
if(item.field == 'supplierCode' || item.field == 'supplierName'){
PackageInventory.allSchemas.formSchema.forEach((item) => {
if (item.value == '') {
if (item.field == 'supplierCode' || item.field == 'supplierName') {
item.componentProps.placeholder = ''
}
}
})
}
basicFormRef.setValues(setV)
basicFormRef.setValues(setV)
})
}
@ -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,22 +277,28 @@ 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') { //
if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
} else if (val == 'refresh') {
//
if (tableObject.params.filters && tableObject.params.filters.length > 0) {
searchFormClick({
filters: tableObject.params.filters
})
} else {
getList()
}
} else if (val == 'filtrate') { //
} else { //
} else if (val == 'filtrate') {
//
} else {
//
console.log('其他按钮', item)
}
}
@ -278,21 +331,31 @@ const isShowMainButton = (row, val) => {
// -
const butttondata = (row) => {
return[
// 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.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:barbasic:disable'}), //
]}
return [
// 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.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) => {
@ -336,13 +397,13 @@ const openForm = (type: string, row?: number) => {
/** 详情操作 */
const detailRef = ref()
const detailData = ref()
const openDetail =async (row: any, titleName: any, titleValue: any) => {
const openDetail = async (row: any, titleName: any, titleValue: any) => {
detailData.value = row
//
await PackageApi.getPackageByBarbasic(detailData.value.relateNumber).then((res) => {
detailDataProps.value = res
})
detailRef.value.openDetail(detailDataProps.value, titleName, titleValue,"labelBarbasic")
detailDataProps.value = res
})
detailRef.value.openDetail(detailDataProps.value, titleName, titleValue, 'labelBarbasic')
}
/** 删除按钮操作 */
@ -356,7 +417,7 @@ const handleDelete = async (id: number) => {
tableObject.loading = false
message.success(t('common.delSuccess'))
//
buttonBaseClick('refresh',null)
buttonBaseClick('refresh', null)
} catch {}
}
@ -379,40 +440,72 @@ 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)
// 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') {
//
id = row.id
doHandlePrintAllExport(id, 'xdp')
} else {
//
id = row.id
doHandlePrintAllExport(id, 'cg')
}
}
/** 导出明细按钮操作 */
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 => {
if (res.productionLineCode != null) {
labelType.value = 'zz'
} else {
labelType.value = 'cg'
}
PackageApi.batchPrintingLable((res.number)).then((resLable) =>{
//
if (labelType.value == 'cg') {
const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
window.open(src.value+'&asn_number='+resLable)
PackageApi.getBalanceToPackage(row.relateNumber)
.then((res) => {
if (res.productionLineCode != null) {
labelType.value = 'zz'
} else {
const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
window.open(src.value+'&asn_number='+resLable)
labelType.value = 'cg'
}
PackageApi.batchPrintingLable(res.number).then((resLable) => {
//
if (labelType.value == 'cg') {
const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
window.open(src.value + '&asn_number=' + resLable)
} else {
const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
window.open(src.value + '&asn_number=' + resLable)
}
})
})
.catch((err) => {
console.log(err)
})
}).catch(err => {
console.log(err)
})
}
// form
const formsSuccess = async (formType,data) => {
const formsSuccess = async (formType, data) => {
basicFormRef.value.formLoading = true
try {
if (formType === 'create') {
@ -425,12 +518,12 @@ const formsSuccess = async (formType,data) => {
} finally {
basicFormRef.value.formLoading = false
}
basicFormRef.value.dialogVisible = false
if (formType === 'create') {
getList()
}else{
buttonBaseClick('refresh',null)
} else {
buttonBaseClick('refresh', null)
}
}
@ -456,7 +549,7 @@ const searchFormClick = (searchData) => {
tableObject.params = {
isSearch: true,
filters: searchData.filters,
type:type.value
type: type.value
}
getList() //
}
@ -464,24 +557,32 @@ const detailDataProps = ref({})
const changeTabs = async (item) => {
if (item.prop == 'PackDetail') {
nextTick(async () => {
detailAllSchemas.value = PurchasePackaging.allSchemas
await PackageApi.getPackageByBarbasic(detailData.value.relateNumber).then((res) => {
detailDataProps.value = res
detailAllSchemas.value = PurchasePackaging.allSchemas
await PackageApi.getPackageByBarbasic(detailData.value.relateNumber).then((res) => {
detailDataProps.value = res
})
})
})
} else if(item.prop == 'Detail'){
nextTick(async()=>{
detailAllSchemas.value = Package.allSchemas
detailDataProps.value = detailData.value
} else if (item.prop == 'Detail') {
nextTick(async () => {
detailAllSchemas.value = Package.allSchemas
detailDataProps.value = detailData.value
})
}
}
const onChange = (field, cur) => {
if (field == 'qty') {
if (basicFormRef.value.formRef.formModel.convertRate==0 || basicFormRef.value.formRef.formModel.convertRate == 1) {
basicFormRef.value.formRef.formModel['purchaseQty'] =basicFormRef.value.formRef.formModel.qty
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)
)
}
}
}

Loading…
Cancel
Save