zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev_web' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_web

dev_web_online
陈薪名 2 years ago
parent
1f20ffa03b 3833d1491f
commit
dae9ef1054
3 changed files with 105 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 83
      fe/PC/src/utils/tableColumns/index.js
  2. 50
      fe/PC/src/utils/tabsDesTions/index.js
  3. 10
      fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransferLog-Query.vue

83
fe/PC/src/utils/tableColumns/index.js
View File

@ -2541,7 +2541,7 @@ export const lineSideWarehouseScrappingNote = [
// 标签管理
/**/
// 标签查询 已调整
// 标签查询 20230410
export const labelsList = [
{
label: "箱码",
@ -2551,7 +2551,8 @@ export const labelsList = [
},
{ label: "物品代码", prop: 'itemCode' },
{ label: "物品名称", prop: "itemName" },
{ label: "物品描述", prop: "itemDesc1" },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "批次", prop: "lot" },
@ -2566,7 +2567,24 @@ export const labelsList = [
{ label: "过期时间", prop: "expireDate",type:"dateTime" },
{ label: "采购单号", prop: "asnNumber",width:orderWidth },
{ label: "要货计划单号", prop: "rpNumber",width:orderWidth },
{ label: "创建者ID", prop: "creatorId" },
{ label: "订单号", prop: "poNumber" },
{ label: "供应商代码", prop: 'supplierCode' },
{ label: "供应商名称", prop: 'supplierName' },
{ label: "供应商简称", prop: 'supplierSimpleName' },
{ label: "供应商物品代码", prop: "supplierItemCode" },
{ label: "供应商物品名称", prop: 'supplierItemName' },
{ label: "上次修改时间", prop: "lastModificationTime",type:"dateTime" },
{ label: "完整条码文本", prop: "fullBarcodeString" },
{ label: "供应商批次", prop: 'supplierBatch' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "器具号", prop: 'containerCode' },
{ label: "质量级别", prop: "qLevel" },
{ label: "质检文件", prop: "qualityFile" },
{ label: "生产线", prop: 'prodLine' },
{ label: "班组", prop: 'team' },
{ label: "班次", prop: 'shift' },
{ label: "规格", prop: "specifications" },
{ label: "labelStatus", prop: "labelStatus" },
]
// 库存管理
@ -2626,7 +2644,7 @@ export const InventoryBalance = [
{ label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" },
{ label: "最后事务编号", prop: 'lastTransNumber' },
]
// 库存事务
// 库存事务 20230410
export const InventoryTransaction = [
{
label: "事务编号",
@ -2637,7 +2655,8 @@ export const InventoryTransaction = [
},
{ label: "物品代码", prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
{ label: "物品描述", prop: "itemDesc1" },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "事务分类", prop: "transType",type: "filter", filters: "TransTypeBase" },
{ label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" },
{ label: "事务数量", prop: "qty" },
@ -2645,10 +2664,27 @@ export const InventoryTransaction = [
{ label: "ERP库位", prop: "locationErpCode" },
{ label: "库位代码", prop: "locationCode" },
{ label: "批次", prop: "lot" },
{ label: "到货单位", prop: "uom" },
{ label: "库存状态", prop: "status",type: "filter", filters: "inventoryStage" },
{ label: "任务编号", prop: "jobNumber",width: orderWidth },
{ label: "事务日期", prop: "transTime" ,type: "dateTime" },
{ label: "事务时间", prop: "transTime" ,type: "dateTime" },
{ label: "操作员", prop: "worker" },
// -----------------------------------------------------------------------
{ label: "单据号", prop: "docNumber" },
{ label: "库位组", prop: "locationGroup" },
{ label: "库区", prop: "locationArea" },
{ label: "到货时间", prop: "arriveDate",type: "dateTime" },
{ label: "生产日期", prop: "produceDate",type: "dateTime" },
{ label: "过期时间", prop: "expireDate",type: "dateTime" },
{ label: "标包数量", prop: "stdPackQty" },
{ label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
{ label: "事务替代类型", prop: "transSubType", type: "filter", filters: "TransSubType" },
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "备注", prop: "remark" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "仓库", prop: 'warehouseCode' },
]
// 库存快照
export const InventorySnapshot = [
@ -2661,7 +2697,7 @@ export const InventorySnapshot = [
},
{ label: "备注", prop: 'remark', },
]
// 库存转移日志
// 库存转移日志 20230410
export const InventoryTransferLog = [
{
label: "库存转移编号",
@ -2674,17 +2710,42 @@ export const InventoryTransferLog = [
{ label: "到状态", prop: "toStatus", type: "filter", filters: "requestStatus" },
{ label: "物品代码", prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
{ label: "物品描述", prop: "itemDesc1" },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "到货数量", prop: "qty" },
{ label: "到货单位", prop: "uom" },
{ label: "从库位编号", prop: "fromLocationCode" },
{ label: "到库位编号", prop: "toLocationCode" },
{ label: "箱码", prop: "toPackingCode" },
{ label: "从库位代码", prop: "fromLocationCode" },
{ label: "到库位代码", prop: "toLocationCode" },
{ label: "到箱码", prop: "toPackingCode" },
{ label: "事务类型", prop: "transType", type: "filter", filters: "TransType" },
{ label: "事务替代类型", prop: "transSubType", type: "filter", filters: "TransSubType" },
{ label: "从事务编号", prop: "fromTransNumber", width: orderWidth },
{ label: "到事务编号", prop: "toTransNumber", width: orderWidth },
{ label: "操作员", prop: "worker" },
// -----------------------------------------------------------------------
{ label: "单据号", prop: "docNumber" },
{ label: "任务编号", prop: "jobNumber" },
{ label: "标包数", prop: "stdPackQty" },
{ label: "从排序批次", prop: "fromLot" },
{ label: "到排序批次", prop: 'toLot' },
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "从箱码", prop: "fromPackingCode" },
{ label: "从仓库代码", prop: "fromWarehouseCode" },
{ label: "从库位组", prop: "fromLocationGroup" },
{ label: "到库位组", prop: 'toLocationGroup' },
{ label: "从库区", prop: "fromLocationArea" },
{ label: "到库区", prop: "toLocationArea" },
{ label: "从ERP库位", prop: "fromLocationErpCode" },
{ label: "目标ERP库位", prop: "toLocationErpCode" },
{ label: "备注", prop: "remark" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "生产日期", prop: "produceDate",type: "dateTime" },
{ label: "到达时间", prop: "arriveDate",type:"dateTime" },
{ label: "事务时间", prop: "transferTime",type: "dateTime" },
{ label: "过期时间", prop: "expireDate",type:"dateTime" },
{ label: "到仓库代码", prop: "toWarehouseCode" },
]
// 预计入库存(+自定义tab页)
export const expectOut = [

50
fe/PC/src/utils/tabsDesTions/index.js
View File

@ -1456,9 +1456,9 @@ export const directIssueNote = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
{ label: "生效日期", prop: 'activeDate' },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "车间", prop: 'workshop' },
{ label: "确认时间", prop: 'confirmTime' },
{ label: "确认时间", prop: 'confirmTime', type: "dateTime" },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "ID", prop: 'id' },
{ label: "公司", prop: 'company' },
@ -1868,12 +1868,12 @@ export const productionReturnNote = [
// 标签管理
/**/
// 标签查询 已调整 1
// 标签查询 20230410
export const labelsList = [
{ label: "箱码", prop: "code" },
{ label: "物品代码", prop: 'itemCode' },
{ label: "物品名称", prop: "itemName" },
{ label: "物品描述", prop: "itemDesc1" },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "数量", prop: "qty" },
{ label: "单位", prop: "uom" },
@ -1886,7 +1886,7 @@ export const labelsList = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "备注", prop: "remark" },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "标包计量单位", prop: 'stdPackUom' },
// { label: "标包计量单位", prop: 'stdPackUom' },
{ label: "供应商代码", prop: 'supplierCode' },
{ label: "供应商名称", prop: 'supplierName' },
{ label: "供应商简称", prop: 'supplierSimpleName' },
@ -1909,9 +1909,10 @@ export const labelsList = [
{ label: "事务ID", prop: "tenantId" },
{ label: "质量级别", prop: "qLevel" },
{ label: "质检文件", prop: "qualityFile" },
{ label: "器具号", prop: 'containerCode' },
{ label: "labelStatus", prop: "labelStatus" },
{ label: "ID", prop: "id" },
{ label: "公司", prop: "company" },
// { label: "公司", prop: "company" },
]
// 库存管理
@ -1976,29 +1977,29 @@ export const InventoryInitialNote = [
{ label: "ID", prop: "id" },
// -----------------------------------------------------------------------
]
// 库存事务 1
// 库存事务 20230410
export const InventoryTransaction = [
{ label: "事务编号", prop: "transNumber" },
{ label: "物品代码", prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
{ label: "物品描述", prop: "itemDesc1" },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "事务分类", prop: "transType" ,type: "filter", filters: "TransTypeBase" },
{ label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" },
{ label: "事务数量", prop: "qty" },
{ label: "数量", prop: "qty" },
{ label: "箱码", prop: "packingCode" },
{ label: "ERP库位", prop: "locationErpCode" },
{ label: "库位代码", prop: "locationCode" },
{ label: "批次", prop: "lot" },
{ label: "库存状态", prop: "status" ,type: "filter", filters: "inventoryStage" },
{ label: "任务编号", prop: "jobNumber" },
{ label: "事务日期", prop: "transTime",type: "dateTime" },
{ label: "事务时间", prop: "transTime",type: "dateTime" },
{ label: "操作员", prop: "worker" },
// -----------------------------------------------------------------------
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "备注", prop: 'remark' },
{ label: "单位", prop: "uom" },
{ label: "计量单位", prop: "uom" },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "标包计量单位", prop: 'stdPackUom' },
// { label: "标包计量单位", prop: 'stdPackUom' },
{ label: "供应商批次", prop: 'supplierBatch' },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "创建者ID", prop: "creatorId" },
@ -2006,15 +2007,15 @@ export const InventoryTransaction = [
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "生效日期", prop: "activeDate",type: "dateTime" },
{ label: "生产日期", prop: "produceDate",type: "dateTime" },
{ label: "到达时间", prop: "arriveDate",type:"dateTime" },
{ label: "过期时间", prop: "expireDate",type:"dateTime" },
{ label: "到货日期", prop: "arriveDate",type:"dateTime" },
{ label: "过期日期", prop: "expireDate",type:"dateTime" },
{ label: "单据号", prop: "docNumber" },
{ label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
{ label: "库区", prop: "locationArea" },
{ label: "库位组", prop: "locationGroup" },
{ label: "事务ID", prop: "tenantId" },
{ label: "事务替代类型", prop: "transSubType", type: "filter", filters: "TransSubType" },
{ label: "公司", prop: "company" },
// { label: "公司", prop: "company" },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "ID", prop: "id" },
// -----------------------------------------------------------------------
@ -2054,7 +2055,7 @@ export const InventorySnapshot = [
{ label: "ID", prop: "id" },
// -----------------------------------------------------------------------
]
// 库存转移日志 1
// 库存转移日志 20230410
export const InventoryTransferLog = [
{ label: "库存转移编号", prop: "transferNumber" },
{ label: "生效日期", prop: "activeDate",type: "dateTime" },
@ -2062,12 +2063,13 @@ export const InventoryTransferLog = [
{ label: "到状态", prop: "toStatus", type: "filter", filters: "requestStatus" },
{ label: "物品代码", prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
{ label: "物品描述", prop: "itemDesc1" },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "到货数量", prop: "qty" },
{ label: "到货单位", prop: "uom" },
{ label: "批次", prop: 'toLot' },
{ label: "从批次", prop: "fromBatch", type: "object", showProp: "supplierBatch" },
{ label: "到批次", prop: "toBatch", type: "object", showProp: "supplierBatch" },
// { label: "从批次", prop: "fromBatch", type: "object", showProp: "supplierBatch" },
// { label: "到批次", prop: "toBatch", type: "object", showProp: "supplierBatch" },
{ label: "从库位代码", prop: "fromLocationCode" },
{ label: "到库位代码", prop: "toLocationCode" },
{ label: "箱码", prop: "toPackingCode" },
@ -2078,10 +2080,10 @@ export const InventoryTransferLog = [
{ label: "操作员", prop: "worker" },
{ label: "备注", prop: 'remark' },
// -----------------------------------------------------------------------
{ label: "从事务编号", prop: "fromTransNumber", },
{ label: "任务编号", prop: "jobNumber" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "标包计量单位", prop: 'stdPackUom' },
// { label: "标包计量单位", prop: 'stdPackUom' },
{ label: "供应商批次", prop: 'supplierBatch' },
{ label: "事务ID", prop: "tenantId" },
{ label: "单据号", prop: "docNumber" },
@ -2094,7 +2096,7 @@ export const InventoryTransferLog = [
{ label: "过期时间", prop: "expireDate",type:"dateTime" },
{ label: "从库区", prop: "fromLocationArea" },
{ label: "到库区", prop: "toLocationArea" },
{ label: "从库位组", prop: "fromLocationGroup", },
{ label: "从库位组", prop: "fromLocationGroup" },
{ label: "到库位组", prop: "toLocationGroup", },
{ label: "从ERP库位", prop: "fromLocationErpCode" },
{ label: "到ERP库位", prop: "toLocationErpCode" },
@ -2102,7 +2104,7 @@ export const InventoryTransferLog = [
{ label: "从箱码", prop: "fromPackingCode" },
{ label: "从仓库", prop: "fromWarehouseCode" },
{ label: "到仓库", prop: "toWarehouseCode" },
{ label: "公司", prop: "company" },
// { label: "公司", prop: "company" },
{ label: "ID", prop: 'id' },
// -----------------------------------------------------------------------
]

10
fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransferLog-Query.vue
View File

@ -254,6 +254,7 @@ export default {
}
},
FormClick(val) {
// 取消
if (val[0] == 0) {
this.CreateFormData = {
clearPackCode: null,
@ -269,7 +270,9 @@ export default {
toLocationCode: null,
details:[]
}
} else if (val[0] == 1) {
}
// 查询
else if (val[0] == 1) {
this.editRules.cerateRule.toLocationCode[0].required = false
val[1].validate((valid) => {
if (valid) {
@ -327,7 +330,9 @@ export default {
this.$errorMsg('请检查表单')
}
})
} else {
}
// 提交
else {
this.editRules.cerateRule.toLocationCode[0].required = true
val[1].validate((valid) => {
if (valid) {
@ -404,7 +409,6 @@ export default {
display: flex;
flex-direction: column;
width: 100%;
height: 100%;
.el-form {
flex: 1;
display: flex;

Write Preview
Loading…
Cancel
Save