Browse Source

【agv-pc】拆箱合箱

dev_pc_agv
安虹睿 4 months ago
parent
commit
a6d9d30239
  1. 4
      fe/PC/src/filters/status.js
  2. 54
      fe/PC/src/mixins/printMixin.js
  3. 84
      fe/PC/src/utils/detailsTableColumns/index.js
  4. 84
      fe/PC/src/utils/tableColumns/index.js
  5. 85
      fe/PC/src/utils/tabsDesTions/index.js
  6. 206
      fe/PC/src/views/labelManage/integrationPackingNote.vue
  7. 206
      fe/PC/src/views/labelManage/separationPackingNote.vue

4
fe/PC/src/filters/status.js

@ -2130,6 +2130,10 @@ export function SupplierAsnCtypeStaBack(name){
value: 3109, value: 3109,
label: '拆箱' label: '拆箱'
}, },
3110: {
value: 3110,
label: '合箱'
},
3301: { 3301: {
value: 3301, value: 3301,
label: '回收料收货' label: '回收料收货'

54
fe/PC/src/mixins/printMixin.js

@ -138,7 +138,7 @@ export function initPrintPackingCodeTwoData(oldData,newData,options,name,url){
* @param {*} url dataUrl * @param {*} url dataUrl
* @returns * @returns
*/ */
export function initPrintPackingCodeManyData(propsData,options,name,url){ export function initPrintPackingCodeManyData(propsData,options,initTitle,name,url){
if(!propsData || propsData.details.length <= 0)return {} if(!propsData || propsData.details.length <= 0)return {}
let _printData = { let _printData = {
"boxlabel":[] "boxlabel":[]
@ -164,28 +164,38 @@ export function initPrintPackingCodeTwoData(oldData,newData,options,name,url){
_index = Number(_index) + 1 _index = Number(_index) + 1
} }
} }
let _title = propsData ? "FATY 物品发运单" : "" let _title = initTitle || "FATY 物品发运单"
_label['title'+Number(key2 + 1)]=propsData[_options.title] || propsData.title || _title,//title // _label['title'+Number(key2 + 1)]=propsData[_options.title] || propsData.title || _title,//title
_label['contacts'+Number(key2 + 1)]= propsData[_options.contacts] || propsData.contacts,//客户名称 // _label['contacts'+Number(key2 + 1)]= propsData[_options.contacts] || propsData.contacts,//客户名称
_label['customerAddressCode'+Number(key2 + 1)]=propsData[_options.customerAddressCode] || propsData.customerAddressCode,//客户地址 // _label['customerAddressCode'+Number(key2 + 1)]=propsData[_options.customerAddressCode] || propsData.customerAddressCode,//客户地址
_label['supplierCode'+Number(key2 + 1)]= propsData[_options.supplierCode] || propsData.supplierCode,//供应商代码 // _label['supplierCode'+Number(key2 + 1)]= propsData[_options.supplierCode] || propsData.supplierCode,//供应商代码
_label['supplierSimpleName'+Number(key2 + 1)]= propsData[_options.supplierSimpleName] || propsData.supplierSimpleName,//供应商名称(简称) // _label['supplierSimpleName'+Number(key2 + 1)]= propsData[_options.supplierSimpleName] || propsData.supplierSimpleName,//供应商名称(简称)
_label['remark'+Number(key2 + 1)]= propsData[_options.remark] || propsData.remark,//备注 // _label['remark'+Number(key2 + 1)]= propsData[_options.remark] || propsData.remark,//备注
_label['planArriveDate'+Number(key2 + 1)]=propsData[_options.planArriveDate] || propsData.planArriveDate,//要求到货时间 // _label['planArriveDate'+Number(key2 + 1)]=propsData[_options.planArriveDate] || propsData.planArriveDate,//要求到货时间
_label['poNumber'+Number(key2 + 1)]= propsData[_options.poNumber] || propsData.poNumber,//订单号 // _label['poNumber'+Number(key2 + 1)]= propsData[_options.poNumber] || propsData.poNumber,//订单号
_label['asnNumber'+Number(key2 + 1)]= propsData[_options.asnNumber] || propsData.asnNumber,//发货单号 // _label['asnNumber'+Number(key2 + 1)]= propsData[_options.asnNumber] || propsData.asnNumber,//发货单号
_label['supplierItemName'+Number(key2 + 1)] = item[_options.supplierItemName] || item2.supplierItemName;//零件名(供应商零件名) _label['title'+Number(key2 + 1)]=item[_options.title] || item2[_options.title] || item2.title || _title,//title
_label['supplierItemCode'+Number(key2 + 1)] = item[_options.supplierItemCode] || item2.supplierItemCode;//零件号(供应商零件号) _label['contacts'+Number(key2 + 1)]= item[_options.contacts] || item2[_options.contacts] || item2.contacts,//客户名称
_label['specifications'+Number(key2 + 1)] = item[_options.specifications] || item2.specifications;//规格 _label['customerAddressCode'+Number(key2 + 1)]=item[_options.customerAddressCode] || item2[_options.customerAddressCode] || item2.customerAddressCode,//客户地址
_label['produceDate'+Number(key2 + 1)] = item[_options.produceDate] || item2.produceDate;//生产时间 _label['supplierCode'+Number(key2 + 1)]= item[_options.supplierCode] || item2[_options.supplierCode] || item2.supplierCode,//供应商代码
_label['lot'+Number(key2 + 1)] = item[_options.lot] || item2.lot;//生产批次 _label['supplierSimpleName'+Number(key2 + 1)]= item[_options.supplierSimpleName] || item2[_options.supplierSimpleName] || item2.supplierSimpleName;//零件名(供应商零件名),//供应商名称(简称)
_label['locationErpCode'+Number(key2 + 1)] = item[_options.locationErpCode] || item2.locationErpCode;//储位 _label['remark'+Number(key2 + 1)]= item[_options.remark] || item2[_options.remark] || item2.remark,//备注
_label['itemCode'+Number(key2 + 1)] = item[_options.itemCode] || item2.itemCode;//ERP料号 _label['planArriveDate'+Number(key2 + 1)]= item[_options.planArriveDate] || item2[_options.planArriveDate] || item2.planArriveDate,//要求到货时间
_label['stdPackQty'+Number(key2 + 1)] = item[_options.stdPackQty] || item2.stdPackQty;//整包数量 暂未使用 _label['poNumber'+Number(key2 + 1)]= item[_options.poNumber] || item2[_options.poNumber] || item2.poNumber,//订单号
_label['qty'+Number(key2 + 1)] = item[_options.qty] || item2.qty;//要货数量 + 整包数量 _label['asnNumber'+Number(key2 + 1)]= item[_options.asnNumber] || item2[_options.asnNumber] || item2.asnNumber,//发货单号
_label['packingCode'+Number(key2 + 1)] = item[_options.packingCode] || item2.packingCode;//条形码
_label['printIndex'+Number(key2 + 1)] = item[_options.printIndex] || item2.printIndex;//序号 _label['supplierItemName'+Number(key2 + 1)] = item[_options.supplierItemName] || item2[_options.supplierItemName] || item2.supplierItemName;//零件名(供应商零件名)
_label['supplierItemCode'+Number(key2 + 1)] = item[_options.supplierItemCode] || item2[_options.supplierItemCode] || item2.supplierItemCode;//零件号(供应商零件号)
_label['specifications'+Number(key2 + 1)] = item[_options.specifications] || item2[_options.specifications] || item2.specifications;//规格
_label['produceDate'+Number(key2 + 1)] = item[_options.produceDate] || item2[_options.produceDate] || item2.produceDate;//生产时间
_label['lot'+Number(key2 + 1)] = item[_options.lot] || item2[_options.lot] || item2.lot;//生产批次
_label['locationErpCode'+Number(key2 + 1)] = item[_options.locationErpCode] || item2[_options.locationErpCode] || item2.locationErpCode;//储位
_label['itemCode'+Number(key2 + 1)] = item[_options.itemCode] || item2[_options.itemCode] || item2.itemCode;//ERP料号
_label['stdPackQty'+Number(key2 + 1)] = item[_options.stdPackQty] || item2[_options.stdPackQty] || item2.stdPackQty;//整包数量 暂未使用
_label['qty'+Number(key2 + 1)] = item[_options.qty] || item2[_options.qty] || item2.qty;//要货数量 + 整包数量
_label['packingCode'+Number(key2 + 1)] = item[_options.packingCode] || item2[_options.packingCode] || item2.packingCode;//条形码
_label['printIndex'+Number(key2 + 1)] = item[_options.printIndex] || item2[_options.printIndex] || item2.printIndex;//序号
_printData.boxlabel[_index] = _label _printData.boxlabel[_index] = _label
}) })

84
fe/PC/src/utils/detailsTableColumns/index.js

@ -3451,4 +3451,88 @@ export const isPadForTransferLibJob = [
{ label: "生产线", prop: 'prodLine' }, { label: "生产线", prop: 'prodLine' },
{ label: "任务状态", prop: "jobStatus",type: "filter", filters: "jobStatus" }, { label: "任务状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
{ label: "推荐类型", prop: 'recommendType' }, { label: "推荐类型", prop: 'recommendType' },
]
// 合箱记录
export const integrationPackingNote = [
{ label: "单据号", prop: "number", fixed: "left" },
{ label: "箱码", prop: "packingCode" },
{ label: _Names.itemCode, prop: 'itemCode' },
{ label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: _Names.configuration, prop: "configuration" },
{ label: "库位代码", prop: "locationCode" },
{ label: "推荐库位", prop: "recommendLocationCode" },
{ label: "批次", prop: "lot" },
{ label: "来源库存状态", prop: 'inventoryStatuses', type: "filterList", filters: "inventoryStage" },
{ label: "标包数量", prop: "stdPackQty" ,isNumber:true},
{ label: "单位", prop: "uom" },
{ label: "数量", prop: "qty",isNumber:true },
{ label: "要货计划单号", prop: 'rpNumber' },
{ label: "供应商发货单", prop: "purchaseInfo_AsnNumber" },
{ label: "到货通知单", prop: "arrivalNoticNumber" },
{ label: "收货记录单", prop: "receiptRecNumber" },
{ label: "采购订单", prop: "purchaseInfo_PoNumber" },
{ label: "上架单", prop: "putOnShelfNumber" },
{ label: "任务单", prop: 'taskOrderNumber' },
{ label: "类型", prop: "labelType", type: "filter", filters: "labelTypeStatus" },
{ label: "完整条码文本", prop: "fullBarcodeString" },
{ label: "生产日期", prop: "produceDate",type: "dateTime" },
{ label: "要求到货日期", prop: "planArriveDate", type: "dateTime" },
{ label: "到货日期", prop: "arriveDate",type: "dateTime" },
{ label: "过期时间", prop: "expireDate",type: "dateTime" },
{ label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: _Names.supplierCode, prop: 'supplierCode' },
{ label: _Names.supplierName, prop: 'supplierName' },
{ label: "供应商简称", prop: 'supplierSimpleName' },
{ label: "供应商物品代码", prop: "supplierItemCode" },
{ label: "供应商物品名称", prop: "supplierItemName" },
{ label: "生效日期", prop: "activeDate",type: "dateTime" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "备注", prop: 'remark' },
{ label: "操作员", prop: "worker" },
]
// 拆箱记录
export const separationPackingNote = [
{ label: "单据号", prop: "number", fixed: "left" },
{ label: "箱码", prop: "packingCode" },
{ label: _Names.itemCode, prop: 'itemCode' },
{ label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: _Names.configuration, prop: "configuration" },
{ label: "库位代码", prop: "locationCode" },
{ label: "推荐库位", prop: "recommendLocationCode" },
{ label: "批次", prop: "lot" },
{ label: "来源库存状态", prop: 'inventoryStatuses', type: "filterList", filters: "inventoryStage" },
{ label: "标包数量", prop: "stdPackQty" ,isNumber:true},
{ label: "单位", prop: "uom" },
{ label: "数量", prop: "qty",isNumber:true },
{ label: "要货计划单号", prop: 'rpNumber' },
{ label: "供应商发货单", prop: "purchaseInfo_AsnNumber" },
{ label: "到货通知单", prop: "arrivalNoticNumber" },
{ label: "收货记录单", prop: "receiptRecNumber" },
{ label: "采购订单", prop: "purchaseInfo_PoNumber" },
{ label: "上架单", prop: "putOnShelfNumber" },
{ label: "任务单", prop: 'taskOrderNumber' },
{ label: "类型", prop: "labelType", type: "filter", filters: "labelTypeStatus" },
{ label: "完整条码文本", prop: "fullBarcodeString" },
{ label: "生产日期", prop: "produceDate",type: "dateTime" },
{ label: "要求到货日期", prop: "planArriveDate", type: "dateTime" },
{ label: "到货日期", prop: "arriveDate",type: "dateTime" },
{ label: "过期时间", prop: "expireDate",type: "dateTime" },
{ label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: _Names.supplierCode, prop: 'supplierCode' },
{ label: _Names.supplierName, prop: 'supplierName' },
{ label: "供应商简称", prop: 'supplierSimpleName' },
{ label: "供应商物品代码", prop: "supplierItemCode" },
{ label: "供应商物品名称", prop: "supplierItemName" },
{ label: "生效日期", prop: "activeDate",type: "dateTime" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "备注", prop: 'remark' },
{ label: "操作员", prop: "worker" },
] ]

84
fe/PC/src/utils/tableColumns/index.js

@ -1857,6 +1857,7 @@ export const FISDeliverRequest = [
}, },
{ label: "客户代码", prop: "customerCode" }, { label: "客户代码", prop: "customerCode" },
{ label: "客户地址", prop: 'customerAddressCode' }, { label: "客户地址", prop: 'customerAddressCode' },
{ label: "器具编号", prop: 'mesDeliveryContainer' },
{ label: "车牌号", prop: 'mesTruckNumber' }, { label: "车牌号", prop: 'mesTruckNumber' },
{ label: "操作员", prop: 'worker' }, { label: "操作员", prop: 'worker' },
{ label: "发货类型", prop: "deliverRequestType", type: "filter", filters: "deliverRequestType",showProp:true }, { label: "发货类型", prop: "deliverRequestType", type: "filter", filters: "deliverRequestType",showProp:true },
@ -3880,6 +3881,89 @@ export const locationDelivery = [
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
] ]
// 合箱记录
export const integrationPackingNote = [
{ label: "单据号", prop: "number", fixed: "left", type: "name" },
{ label: "箱码", prop: "packingCode" },
{ label: _Names.itemCode, prop: 'itemCode' },
{ label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: _Names.configuration, prop: "configuration" },
{ label: "库位代码", prop: "locationCode" },
{ label: "推荐库位", prop: "recommendLocationCode" },
{ label: "批次", prop: "lot" },
{ label: "来源库存状态", prop: 'inventoryStatuses', type: "filterList", filters: "inventoryStage" },
{ label: "标包数量", prop: "stdPackQty" ,isNumber:true},
{ label: "单位", prop: "uom" },
{ label: "数量", prop: "qty",isNumber:true },
{ label: "要货计划单号", prop: 'rpNumber' },
{ label: "供应商发货单", prop: "purchaseInfo_AsnNumber" },
{ label: "到货通知单", prop: "arrivalNoticNumber" },
{ label: "收货记录单", prop: "receiptRecNumber" },
{ label: "采购订单", prop: "purchaseInfo_PoNumber" },
{ label: "上架单", prop: "putOnShelfNumber" },
{ label: "任务单", prop: 'taskOrderNumber' },
{ label: "类型", prop: "labelType", type: "filter", filters: "labelTypeStatus" },
{ label: "完整条码文本", prop: "fullBarcodeString" },
{ label: "生产日期", prop: "produceDate",type: "dateTime" },
{ label: "要求到货日期", prop: "planArriveDate", type: "dateTime" },
{ label: "到货日期", prop: "arriveDate",type: "dateTime" },
{ label: "过期时间", prop: "expireDate",type: "dateTime" },
{ label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: _Names.supplierCode, prop: 'supplierCode' },
{ label: _Names.supplierName, prop: 'supplierName' },
{ label: "供应商简称", prop: 'supplierSimpleName' },
{ label: "供应商物品代码", prop: "supplierItemCode" },
{ label: "供应商物品名称", prop: "supplierItemName" },
{ label: "生效日期", prop: "activeDate",type: "dateTime" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "备注", prop: 'remark' },
{ label: "操作员", prop: "worker" },
]
// 拆箱记录
export const separationPackingNote = [
{ label: "单据号", prop: "number", fixed: "left", type: "name" },
{ label: "箱码", prop: "packingCode" },
{ label: _Names.itemCode, prop: 'itemCode' },
{ label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: _Names.configuration, prop: "configuration" },
{ label: "库位代码", prop: "locationCode" },
{ label: "推荐库位", prop: "recommendLocationCode" },
{ label: "批次", prop: "lot" },
{ label: "来源库存状态", prop: 'inventoryStatuses', type: "filterList", filters: "inventoryStage" },
{ label: "标包数量", prop: "stdPackQty" ,isNumber:true},
{ label: "单位", prop: "uom" },
{ label: "数量", prop: "qty",isNumber:true },
{ label: "要货计划单号", prop: 'rpNumber' },
{ label: "供应商发货单", prop: "purchaseInfo_AsnNumber" },
{ label: "到货通知单", prop: "arrivalNoticNumber" },
{ label: "收货记录单", prop: "receiptRecNumber" },
{ label: "采购订单", prop: "purchaseInfo_PoNumber" },
{ label: "上架单", prop: "putOnShelfNumber" },
{ label: "任务单", prop: 'taskOrderNumber' },
{ label: "类型", prop: "labelType", type: "filter", filters: "labelTypeStatus" },
{ label: "完整条码文本", prop: "fullBarcodeString" },
{ label: "生产日期", prop: "produceDate",type: "dateTime" },
{ label: "要求到货日期", prop: "planArriveDate", type: "dateTime" },
{ label: "到货日期", prop: "arriveDate",type: "dateTime" },
{ label: "过期时间", prop: "expireDate",type: "dateTime" },
{ label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: _Names.supplierCode, prop: 'supplierCode' },
{ label: _Names.supplierName, prop: 'supplierName' },
{ label: "供应商简称", prop: 'supplierSimpleName' },
{ label: "供应商物品代码", prop: "supplierItemCode" },
{ label: "供应商物品名称", prop: "supplierItemName" },
{ label: "生效日期", prop: "activeDate",type: "dateTime" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "备注", prop: 'remark' },
{ label: "操作员", prop: "worker" },
]
// 字段说明 // 字段说明
// showProp: true //隐藏该字段的高级筛选+列表排序 // showProp: true //隐藏该字段的高级筛选+列表排序

85
fe/PC/src/utils/tabsDesTions/index.js

@ -1197,6 +1197,7 @@ export const FISDeliverRequest = [
{ label: "发货申请单号", prop: "number" }, { label: "发货申请单号", prop: "number" },
{ label: "客户代码", prop: "customerCode" }, { label: "客户代码", prop: "customerCode" },
{ label: "客户地址", prop: 'customerAddressCode' }, { label: "客户地址", prop: 'customerAddressCode' },
{ label: "器具编号", prop: 'mesDeliveryContainer' },
{ label: "车牌号", prop: 'mesTruckNumber' }, { label: "车牌号", prop: 'mesTruckNumber' },
{ label: "操作员", prop: 'worker' }, { label: "操作员", prop: 'worker' },
{ label: "发货类型", prop: "deliverRequestType", type: "filter", filters: "deliverRequestType",showProp:true }, { label: "发货类型", prop: "deliverRequestType", type: "filter", filters: "deliverRequestType",showProp:true },
@ -2630,4 +2631,88 @@ export const locationDelivery = [
{ label: "备注", prop: 'remark'}, { label: "备注", prop: 'remark'},
{ label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 合箱记录
export const integrationPackingNote = [
{ label: "单据号", prop: "number", fixed: "left" },
{ label: "箱码", prop: "packingCode" },
{ label: _Names.itemCode, prop: 'itemCode' },
{ label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: _Names.configuration, prop: "configuration" },
{ label: "库位代码", prop: "locationCode" },
{ label: "推荐库位", prop: "recommendLocationCode" },
{ label: "批次", prop: "lot" },
{ label: "来源库存状态", prop: 'inventoryStatuses', type: "filterList", filters: "inventoryStage" },
{ label: "标包数量", prop: "stdPackQty" ,isNumber:true},
{ label: "单位", prop: "uom" },
{ label: "数量", prop: "qty",isNumber:true },
{ label: "要货计划单号", prop: 'rpNumber' },
{ label: "供应商发货单", prop: "purchaseInfo_AsnNumber" },
{ label: "到货通知单", prop: "arrivalNoticNumber" },
{ label: "收货记录单", prop: "receiptRecNumber" },
{ label: "采购订单", prop: "purchaseInfo_PoNumber" },
{ label: "上架单", prop: "putOnShelfNumber" },
{ label: "任务单", prop: 'taskOrderNumber' },
{ label: "类型", prop: "labelType", type: "filter", filters: "labelTypeStatus" },
{ label: "完整条码文本", prop: "fullBarcodeString" },
{ label: "生产日期", prop: "produceDate",type: "dateTime" },
{ label: "要求到货日期", prop: "planArriveDate", type: "dateTime" },
{ label: "到货日期", prop: "arriveDate",type: "dateTime" },
{ label: "过期时间", prop: "expireDate",type: "dateTime" },
{ label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: _Names.supplierCode, prop: 'supplierCode' },
{ label: _Names.supplierName, prop: 'supplierName' },
{ label: "供应商简称", prop: 'supplierSimpleName' },
{ label: "供应商物品代码", prop: "supplierItemCode" },
{ label: "供应商物品名称", prop: "supplierItemName" },
{ label: "生效日期", prop: "activeDate",type: "dateTime" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "备注", prop: 'remark' },
{ label: "操作员", prop: "worker" },
]
// 拆箱记录
export const separationPackingNote = [
{ label: "单据号", prop: "number", fixed: "left" },
{ label: "箱码", prop: "packingCode" },
{ label: _Names.itemCode, prop: 'itemCode' },
{ label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: _Names.configuration, prop: "configuration" },
{ label: "库位代码", prop: "locationCode" },
{ label: "推荐库位", prop: "recommendLocationCode" },
{ label: "批次", prop: "lot" },
{ label: "来源库存状态", prop: 'inventoryStatuses', type: "filterList", filters: "inventoryStage" },
{ label: "标包数量", prop: "stdPackQty" ,isNumber:true},
{ label: "单位", prop: "uom" },
{ label: "数量", prop: "qty",isNumber:true },
{ label: "要货计划单号", prop: 'rpNumber' },
{ label: "供应商发货单", prop: "purchaseInfo_AsnNumber" },
{ label: "到货通知单", prop: "arrivalNoticNumber" },
{ label: "收货记录单", prop: "receiptRecNumber" },
{ label: "采购订单", prop: "purchaseInfo_PoNumber" },
{ label: "上架单", prop: "putOnShelfNumber" },
{ label: "任务单", prop: 'taskOrderNumber' },
{ label: "类型", prop: "labelType", type: "filter", filters: "labelTypeStatus" },
{ label: "完整条码文本", prop: "fullBarcodeString" },
{ label: "生产日期", prop: "produceDate",type: "dateTime" },
{ label: "要求到货日期", prop: "planArriveDate", type: "dateTime" },
{ label: "到货日期", prop: "arriveDate",type: "dateTime" },
{ label: "过期时间", prop: "expireDate",type: "dateTime" },
{ label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: _Names.supplierCode, prop: 'supplierCode' },
{ label: _Names.supplierName, prop: 'supplierName' },
{ label: "供应商简称", prop: 'supplierSimpleName' },
{ label: "供应商物品代码", prop: "supplierItemCode" },
{ label: "供应商物品名称", prop: "supplierItemName" },
{ label: "生效日期", prop: "activeDate",type: "dateTime" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "备注", prop: 'remark' },
{ label: "操作员", prop: "worker" },
] ]

206
fe/PC/src/views/labelManage/integrationPackingNote.vue

@ -0,0 +1,206 @@
<template>
<!-- 合箱记录 -->
<div class="page-box" v-loading="Loading.appMainLoading">
<tablePagination
:currenButtonData="currenButtonData"
:tableData="tableData"
:tableLoading="Loading.tableLoading"
:tableColumns="tableColumns"
@rowDrop="rowDrop"
:totalCount="totalCount"
:multipleSelection="multipleSelection"
:MaxResultCount="PageListParams.MaxResultCount"
@topbutton="topbutton"
@inlineDialog="inlineDialog"
@sortChange="sortChange"
@alertoldSkipCount="alertoldSkipCount"
@alterResultCount="alterResultCount"
@handleSelectionChange="handleSelectionChange"
:currentPageProps="oldSkipCount"
:quicklySearchOption="quicklySearchOption"
@quicklySearchClick="quicklySearchClick"
@quicklySearchClear="quicklySearchClear"
:primarySearchOption="primarySearchOption"
@overallSearchFormClick="overallSearchFormClick"
:httpOverallSearchData="httpOverallSearchData"
>
</tablePagination>
<!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
<!-- methodValue 导入方式默认选项 是否局部导入 默认选项 -->
<importFile
:loading="Loading.importLoading"
:show="displayDialog.importDialog"
:URL="URL"
:disabledMethod = {method1:false,method2:false,method3:false}
:disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
isAllowPartImportValue="1"
@importClick="postImportMergeClick(arguments)"
@postImportDown="importDown"
></importFile>
<!--抽屉-->
<curren-Drawer
:title="tableColumns"
:DrawerLoading="Loading.DrawerLoading"
:drawer="displayDialog.detailsDialog"
:propsData="propsData"
:tabsDesTions="tabsDesTions"
:Butttondata="DrawerButtonData"
@drawerShut="(val) => (displayDialog.detailsDialog = val)"
@handleCommand="drawerHandle"
@drawerbutton="drawerbuttonHandle"
@close-value="closeValue"
:tableColumns="detailsTableColumns"
:totalCount="totalCountDetails"
:MaxResultCount="MaxResultCountDetails"
@alterResultCountDetails="alterResultCountDetails"
@alertoldSkipCountDetails="alertoldSkipCountDetails"
@currenTabsChange="currenTabsChange"
:selectionTable="true"
@handleSelectionChange="handleSelectionChangeDrawer"
>
<template>
<el-table-column
fixed="right"
label="操作"
align="center"
width="120"
>
<template slot-scope="scope">
<span class="drawerRowButtton" @click="buttonClick(scope.row)">打印</span>
</template>
</el-table-column>
</template>
</curren-Drawer>
</div>
</template>
<script>
import { tableMixins } from "@/mixins/TableMixins";
import { LoadingMixins } from "@/mixins/LoadingMixins";
import { drawerMixins } from "@/mixins/drawerMixins";
import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
import { mixins } from "@/mixins/mixins";
import { initPrintPackingCodeData,initPrintPackingCodeManyData } from "@/mixins/printMixin"
export default {
name: "integrationPackingNote",
mixins: [
tableMixins,
LoadingMixins,
drawerMixins,
TableHeaderMixins,
mixins,
],
computed: {
hideButton: function () {
return function (val) {
console.log(this.currentTagName)
return this.currentTagName != 'mx'
}
},
},
data() {
return {
URL: "wms/store/integration-packing-note",
// tab
currentTagName:'xq',
//
currenButtonData: [
// this.defaultImportBtn(),//
this.defaultExportBtn(),//
this.defaultFieldSettingBtn(),//
this.defaultFreshBtn(),//
this.defaultFilterBtn(),//
],
DrawerButtonData: [
{
type: 'success',
icon: 'el-icon-printer',
label: '打印新箱码',
hide: false,
name: "print_new",
size: 'mini'
},
{
type: 'warning',
icon: 'el-icon-finished',
label: '批量打印',
hide: () => { return this.hideButton() },
name: "print_many",
size: 'mini'
},
],
//
selectedForMx:[],
};
},
mounted() {
this.paging();
},
methods:{
currenTabsChange(row){
this.currentTagName = row.name
},
//
async drawerbuttonHandle(val) {
//
if (val == 'print_new') {
let _option = {
specifications:"configuration",
poNumber:"purchaseInfo_PoNumber",
asnNumber:"purchaseInfo_AsnNumber",
}
let _propsData = JSON.parse(JSON.stringify(this.propsData))
delete _propsData.details
_propsData.details = [JSON.stringify(_propsData)]
// _propsData.title = ""
let data = await initPrintPackingCodeData(_propsData,_option);
this.Print(data)
}
//
else if(val == 'print_many'){
if(!this.selectedForMx || this.selectedForMx.length <= 0){
return this.$warningMsg("请先选择要打印的明细")
}
let _propsData = {details:[]}
_propsData.details = JSON.parse(JSON.stringify(this.selectedForMx))
let _option = {
specifications:"configuration",
poNumber:"purchaseInfo_PoNumber",
asnNumber:"purchaseInfo_AsnNumber",
}
let _data = await initPrintPackingCodeManyData(_propsData,_option);
this.Print(_data)
}
},
//
async buttonClick(row){
let _propsData = JSON.parse(JSON.stringify(row))
_propsData.details = []
_propsData.details.push(row)
let _option = {
specifications:"configuration",
poNumber:"purchaseInfo_PoNumber",
asnNumber:"purchaseInfo_AsnNumber",
}
let data = await initPrintPackingCodeData(_propsData,_option);
this.Print(data)
},
//
handleSelectionChangeDrawer(data){
console.log(data)
this.selectedForMx = data
}
}
};
</script>
<style lang="scss" scoped>
@import "../../styles/mainbasicData.scss";
.drawerRowButtton{
color:#409eff;
cursor: pointer;
&:hover{
color:#a0cfff
}
}
</style>

206
fe/PC/src/views/labelManage/separationPackingNote.vue

@ -0,0 +1,206 @@
<template>
<!-- 拆箱记录 -->
<div class="page-box" v-loading="Loading.appMainLoading">
<tablePagination
:currenButtonData="currenButtonData"
:tableData="tableData"
:tableLoading="Loading.tableLoading"
:tableColumns="tableColumns"
@rowDrop="rowDrop"
:totalCount="totalCount"
:multipleSelection="multipleSelection"
:MaxResultCount="PageListParams.MaxResultCount"
@topbutton="topbutton"
@inlineDialog="inlineDialog"
@sortChange="sortChange"
@alertoldSkipCount="alertoldSkipCount"
@alterResultCount="alterResultCount"
@handleSelectionChange="handleSelectionChange"
:currentPageProps="oldSkipCount"
:quicklySearchOption="quicklySearchOption"
@quicklySearchClick="quicklySearchClick"
@quicklySearchClear="quicklySearchClear"
:primarySearchOption="primarySearchOption"
@overallSearchFormClick="overallSearchFormClick"
:httpOverallSearchData="httpOverallSearchData"
>
</tablePagination>
<!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
<!-- methodValue 导入方式默认选项 是否局部导入 默认选项 -->
<importFile
:loading="Loading.importLoading"
:show="displayDialog.importDialog"
:URL="URL"
:disabledMethod = {method1:false,method2:false,method3:false}
:disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
isAllowPartImportValue="1"
@importClick="postImportMergeClick(arguments)"
@postImportDown="importDown"
></importFile>
<!--抽屉-->
<curren-Drawer
:title="tableColumns"
:DrawerLoading="Loading.DrawerLoading"
:drawer="displayDialog.detailsDialog"
:propsData="propsData"
:tabsDesTions="tabsDesTions"
:Butttondata="DrawerButtonData"
@drawerShut="(val) => (displayDialog.detailsDialog = val)"
@handleCommand="drawerHandle"
@drawerbutton="drawerbuttonHandle"
@close-value="closeValue"
:tableColumns="detailsTableColumns"
:totalCount="totalCountDetails"
:MaxResultCount="MaxResultCountDetails"
@alterResultCountDetails="alterResultCountDetails"
@alertoldSkipCountDetails="alertoldSkipCountDetails"
@currenTabsChange="currenTabsChange"
:selectionTable="true"
@handleSelectionChange="handleSelectionChangeDrawer"
>
<template>
<el-table-column
fixed="right"
label="操作"
align="center"
width="120"
>
<template slot-scope="scope">
<span class="drawerRowButtton" @click="buttonClick(scope.row)">打印</span>
</template>
</el-table-column>
</template>
</curren-Drawer>
</div>
</template>
<script>
import { tableMixins } from "@/mixins/TableMixins";
import { LoadingMixins } from "@/mixins/LoadingMixins";
import { drawerMixins } from "@/mixins/drawerMixins";
import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
import { mixins } from "@/mixins/mixins";
import { initPrintPackingCodeData,initPrintPackingCodeManyData } from "@/mixins/printMixin"
export default {
name: "separationPackingNote",
mixins: [
tableMixins,
LoadingMixins,
drawerMixins,
TableHeaderMixins,
mixins,
],
computed: {
hideButton: function () {
return function (val) {
console.log(this.currentTagName)
return this.currentTagName != 'mx'
}
},
},
data() {
return {
URL: "wms/store/separation-packing-note",
// tab
currentTagName:'xq',
//
currenButtonData: [
// this.defaultImportBtn(),//
this.defaultExportBtn(),//
this.defaultFieldSettingBtn(),//
this.defaultFreshBtn(),//
this.defaultFilterBtn(),//
],
DrawerButtonData: [
{
type: 'success',
icon: 'el-icon-printer',
label: '打印原箱码',
hide: false,
name: "print_old",
size: 'mini'
},
{
type: 'warning',
icon: 'el-icon-finished',
label: '批量打印',
hide: () => { return this.hideButton() },
name: "print_many",
size: 'mini'
},
],
//
selectedForMx:[],
};
},
mounted() {
this.paging();
},
methods:{
currenTabsChange(row){
this.currentTagName = row.name
},
//
async drawerbuttonHandle(val) {
//
if (val == 'print_old') {
let _option = {
specifications:"configuration",
poNumber:"purchaseInfo_PoNumber",
asnNumber:"purchaseInfo_AsnNumber",
}
let _propsData = JSON.parse(JSON.stringify(this.propsData))
delete _propsData.details
_propsData.details = [JSON.stringify(_propsData)]
// _propsData.title = ""
let data = await initPrintPackingCodeData(_propsData,_option);
this.Print(data)
}
//
else if(val == 'print_many'){
if(!this.selectedForMx || this.selectedForMx.length <= 0){
return this.$warningMsg("请先选择要打印的明细")
}
let _propsData = {details:[]}
_propsData.details = JSON.parse(JSON.stringify(this.selectedForMx))
let _option = {
specifications:"configuration",
poNumber:"purchaseInfo_PoNumber",
asnNumber:"purchaseInfo_AsnNumber",
}
let _data = await initPrintPackingCodeManyData(_propsData,_option);
this.Print(_data)
}
},
//
async buttonClick(row){
let _propsData = JSON.parse(JSON.stringify(row))
_propsData.details = []
_propsData.details.push(row)
let _option = {
specifications:"configuration",
poNumber:"purchaseInfo_PoNumber",
asnNumber:"purchaseInfo_AsnNumber",
}
let data = await initPrintPackingCodeData(_propsData,_option);
this.Print(data)
},
//
handleSelectionChangeDrawer(data){
console.log(data)
this.selectedForMx = data
}
}
};
</script>
<style lang="scss" scoped>
@import "../../styles/mainbasicData.scss";
.drawerRowButtton{
color:#409eff;
cursor: pointer;
&:hover{
color:#a0cfff
}
}
</style>
Loading…
Cancel
Save