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

Merge branch 'dev_web' into dev_web_online

dev_web_online 1.23.0811.1
安虹睿 2 years ago
parent
82f1c38143 98300f03ae
commit
f530f0c0b0
4 changed files with 33 additions and 33 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. 2
      fe/PC/public/version.json
  2. 34
      fe/PC/src/utils/detailsTableColumns/index.js
  3. 18
      fe/PC/src/utils/tableColumns/index.js
  4. 12
      fe/PC/src/utils/tabsDesTions/index.js

2
fe/PC/public/version.json
View File

@ -1,3 +1,3 @@
{
"version": "1.0.65"
"version": "1.0.66"
}

34
fe/PC/src/utils/detailsTableColumns/index.js
View File

@ -34,7 +34,7 @@ export const SupplierAsn = [
{ label: "物品单位", prop: "uom" },
{ label: "生产批次", prop: "lot" },
{ label: "箱码", prop: "packingCode" },
{ label: "ERP库位", prop: "recommendErpCode" },
{ label: "ERP储位", prop: "recommendErpCode" },
{ label: "项目编号", prop: "projectCode" },
{ label: "类型", prop: "ctype", type: "filter", filters: "SupplierAsnCtypeSta" },
{ label: "生产时间", prop: "produceDate", type: "dateTime" },
@ -72,7 +72,7 @@ export const PurchaseOrder = [
{ label: "发货数量", prop: "qty" },
{ label: "物品单位", prop: "uom" },
{ label: "生产批次", prop: "lot" },
{ label: "ERP库位", prop: "locationErpCode" },
{ label: "ERP储位", prop: "locationErpCode" },
{ label: "项目编号", prop: "projectCode" },
{ label: "类型", prop: "ctype", type: "filter", filters: "SupplierAsnCtypeSta" },
{ label: "已发货数量", prop: "shippedQty" },
@ -116,7 +116,7 @@ export const PurchaseReceiptRequest = [
{ label: "物品单位", prop: "uom" },
{ label: "生产批次", prop: "lot" },
{ label: "箱码", prop: "packingCode" },
{ label: "ERP库位", prop: "recommendErpCode" },
{ label: "ERP储位", prop: "recommendErpCode" },
{ label: "生产时间", prop: "produceDate", type: "dateTime" },
{ label: "过期时间", prop: "expireDate", type: "dateTime" },
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
@ -211,7 +211,7 @@ export const InspectRequest = [
{ label: "箱码", prop: "packingCode" },
{ label: "检验状态", prop: "detailInspectStatus", type: "filter", filters: "detailInspectStatus" },
{ label: "库位", prop: 'locationCode' },
{ label: "ERP库位", prop: 'locationErpCode' },
{ label: "ERP储位", prop: 'locationErpCode' },
{ label: "检验单号", prop: "number" },
// -----------------------------------------------------------------------
{ label: "计量单位", prop: 'uom' },
@ -263,7 +263,7 @@ export const InspectNote = [
{ label: "生产批次", prop: "lot" },
{ label: "箱码", prop: "packingCode" },
{ label: "库位", prop: 'locationCode' },
{ label: "ERP库位", prop: 'locationErpCode' },
{ label: "ERP储位", prop: 'locationErpCode' },
{ label: "合格数量", prop: 'goodQty' },
{ label: "不合格数量", prop: 'failedQty' },
{ label: "检验人", prop: 'inspectUser' },
@ -318,7 +318,7 @@ export const unqualifiedToQualifiedNote = [
{ label: "箱码", prop: "toPackingCode" },
{ label: "来源库位", prop: 'fromLocationCode' },
{ label: "目标库位", prop: 'toLocationCode' },
{ label: "ERP库位", prop: 'toLocationErpCode' },
{ label: "ERP储位", prop: 'toLocationErpCode' },
// -----------------------------------------------------------------------
{ label: "转合格单号", prop: "number",width: orderWidth },
{ label: "标包数量", prop: 'stdPackQty' },
@ -772,7 +772,7 @@ export const beforeGroundingReturnNote = [
{ label: "箱码", prop: "packingCode" },
{ label: "库位", prop: 'locationCode' },
{ label: "库区", prop: 'locationArea' },
{ label: "ERP库位", prop: "locationErpCode" },
{ label: "ERP储位", prop: "locationErpCode" },
{ label: "退货原因代码", prop: 'reason' },
{ label: "退货原因说明", prop: 'reason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" },
// -----------------------------------------------------------------------
@ -834,7 +834,7 @@ export const PurchaseReturnRequest = [
{ label: "批次", prop: 'lot' },
{ label: "箱码", prop: "packingCode" },
{ label: "退货库位", prop: "locationCode" },
{ label: "ERP库位", prop: "locationErpCode" },
{ label: "ERP储位", prop: "locationErpCode" },
{ label: "订单号", prop: 'poNumber', width:orderWidth },
// -----------------------------------------------------------------------
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
@ -923,7 +923,7 @@ export const PurchaseReturnNote = [
{ label: "箱码", prop: "packingCode" },
{ label: "库位", prop: 'locationCode' },
{ label: "库区", prop: 'locationArea' },
{ label: "ERP库位", prop: "locationErpCode" },
{ label: "ERP储位", prop: "locationErpCode" },
{ label: "退货原因代码", prop: 'reason' },
{ label: "退货原因说明", prop: 'reason', type: "filter", filters: "getDict" , dictType:"PurReturnReason" },
// -----------------------------------------------------------------------
@ -1206,7 +1206,7 @@ export const ProductReceiptNote = [
{ label: "单位", prop: "uom" },
{ label: "库区", prop:"locationArea" },
{ label: "库位代码", prop: 'locationCode' },
{ label: "ERP库位", prop:"locationErpCode" },
{ label: "ERP储位", prop:"locationErpCode" },
{ label: "生产时间", prop: "produceDate",type:"dateTime" },
// -----------------------------------------------------------------------
{ label: "缴库库位", prop: 'rawLocationCode' },
@ -1270,7 +1270,7 @@ export const ProductReceiptScrapRequest = [
{ label: "单位", prop: "uom" },
{ label: "库区", prop:"locationArea" },
{ label: "库位", prop:"locationCode" },
{ label: "ERP库位", prop: 'locationErpCode' },
{ label: "ERP储位", prop: 'locationErpCode' },
{ label: "库位组", prop: 'locationGroup' },
{ label: "报废原因代码", prop:"reasonCode" },
{ label: "报废原因说明", prop: 'reasonCode', type: "filter", filters: "getDict" , dictType:"Reason" },
@ -2133,7 +2133,7 @@ export const recycledMaterialsReceipt = [
{ label: "批次", prop: 'lot' },
{ label: "箱码", prop: 'packingCode' },
{ label: "库位", prop: 'locationCode' },
{ label: "ERP库位", prop: 'locationErpCode' },
{ label: "ERP储位", prop: 'locationErpCode' },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
// -----------------------------------------------------------------------
{ label: "创建者ID", prop: 'creatorId' },
@ -2230,7 +2230,7 @@ export const materialsAdjustment = [
{ label: "目标库位", prop: "toLocationCode" },
{ label: "来源批次", prop: "fromLot" },
{ label: "目标批次", prop: "toLot" },
{ label: "ERP库位", prop: "locationErpCode" },
{ label: "ERP储位", prop: "locationErpCode" },
{ label: "单位", prop: "uom" },
{ label: "原因", prop: 'reasonCode' },//不是字典，直接显示文本
// -----------------------------------------------------------------------
@ -2671,7 +2671,7 @@ export const lineSideWarehousePaymentNote = [
{ label: "单位", prop: "uom" },
{ label: "库区", prop:"locationArea" },
{ label: "库位代码", prop: 'locationCode' },
{ label: "ERP库位", prop:"locationErpCode" },
{ label: "ERP储位", prop:"locationErpCode" },
{ label: "生产时间", prop: "produceDate",type:"dateTime" },
// -----------------------------------------------------------------------
{ label: "缴库库位", prop: 'rawLocationCode' },
@ -2735,7 +2735,7 @@ export const lineSideWarehouseScrappingRequest = [
{ label: "单位", prop: "uom" },
{ label: "库区", prop:"locationArea" },
{ label: "库位", prop:"locationCode" },
{ label: "ERP库位", prop: 'locationErpCode' },
{ label: "ERP储位", prop: 'locationErpCode' },
{ label: "库位组", prop: 'locationGroup' },
{ label: "报废原因代码", prop:"reasonCode" },
{ label: "报废原因说明", prop: 'reasonCode', type: "filter", filters: "getDict" , dictType:"Reason" },
@ -2907,7 +2907,7 @@ export const InventoryInitialNote = [
{ label: "库位组", prop: "locationGroup" },
{ label: "库区", prop: "locationArea" },
{ label: "库位", prop: "locationCode" },
{ label: "ERP库位", prop: "locationErpCode" },
{ label: "ERP储位", prop: "locationErpCode" },
// -----------------------------------------------------------------------
{ label: "备注", prop: 'remark' },
{ label: "包装数量", prop: "stdPackQty" },
@ -3184,7 +3184,7 @@ export const safetyStockWarning = [
{ label: "仓库代码", prop: "warehouseCode" },
{ label: "库位组", prop: 'locationGroup' },
{ label: "库区", prop: 'locationArea' },
{ label: "ERP库位", prop: 'locationErpCode' },
{ label: "ERP储位", prop: 'locationErpCode' },
{ label: "入库时间", prop: 'putInTime', type:"dateTime" },
{ label: "最后盘点时间", prop: 'lastCountTime', type:"dateTime" },
{ label: "最后盘点计划", prop: 'lastCountPlanNumber' },

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

@ -1190,7 +1190,7 @@ export const qualifiedInfo = [
{ label: "物品单位", prop: "uom" },
{ label: "批次", prop: "lot" },
{ label: "箱码", prop: "packingCode" },
{ label: "ERP库位", prop: "locationErpCode" },
{ label: "ERP储位", prop: "locationErpCode" },
{ label: "到货日期", prop: "arriveDate",type: "dateTime" },
{ label: "过期时间", prop: "expireDate",type: "dateTime" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
@ -1255,7 +1255,7 @@ export const unqualifiedInfo = [
{ label: "数量", prop: "qty" },
{ label: "物品单位", prop: "uom" },
{ label: "箱码", prop: "packingCode" },
{ label: "ERP库位", prop: "locationErpCode" },
{ label: "ERP储位", prop: "locationErpCode" },
{ label: "不合格原因代码", prop: 'failedReason' },
{ label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" },
{ label: "质量缺陷", prop: "massDefect" },
@ -1312,7 +1312,7 @@ export const lackMaterialsInfo = [
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "批次", prop: "lot" },
{ label: "ERP库位", prop: "locationErpCode" },
{ label: "ERP储位", prop: "locationErpCode" },
{ label: "单据号", prop: "number" },
{ label: "状态",prop: "purchaseReceiptInspectStatus", type: "filter", filters: "enumPurchaseReceiptInspectStatus" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
@ -1449,7 +1449,7 @@ export const unqualifiedToQualified = [
{ label: "库位", prop: 'locationCode' },
{ label: "入库时间", prop: 'putInTime',type: "dateTime" },
{ label: "备注", prop: 'remark' },
{ label: "ERP库位", prop: "locationErpCode" },
{ label: "ERP储位", prop: "locationErpCode" },
{ label: "标包数量", prop: "stdPackQty" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "供应商批次", prop: 'supplierBatch' },
@ -2500,7 +2500,7 @@ export const labelsList = [
{ label: "单位", prop: "uom" },
{ label: "批次", prop: "lot" },
{ label: "库位", prop: "recommendLocationCode" },
{ label: "ERP库位", prop: "locationErpCode" },
{ label: "ERP储位", prop: "locationErpCode" },
{ label: "创建时间", prop: "creationTime",type:"dateTime" },
{ label: "类型", prop: "labelType", type: "filter", filters: "labelTypeStatus" },
{ label: "备注", prop: "remark" },
@ -2564,7 +2564,7 @@ export const InventoryBalance = [
{ label: "库位代码", prop: "locationCode" },
{ label: "库存状态", type: "filter", filters: "inventoryStage", prop: "status" },
{ label: "箱码", prop: "packingCode" },
{ label: "ERP库位", prop: "locationErpCode" },
{ label: "ERP储位", prop: "locationErpCode" },
{ label: "是否可用", prop: "isActive", type: "filter", filters: "whetherOrNot" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "生产日期", prop: "produceDate" ,type: "dateTime" },
@ -2606,7 +2606,7 @@ export const InventoryTransaction = [
{ label: "接口对应类型", prop: "interfaceType", width: '360px', showProp: true },
{ label: "事务数量", prop: "qty" },
{ label: "箱码", prop: "packingCode" },
{ label: "ERP库位", prop: "locationErpCode" },
{ label: "ERP储位", prop: "locationErpCode" },
{ label: "库位代码", prop: "locationCode" },
{ label: "批次", prop: "lot" },
{ label: "到货单位", prop: "uom" },
@ -2713,7 +2713,7 @@ export const expectOut = [
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "库区", prop: "locationArea" },
{ label: "库位组", prop: "locationGroup" },
{ label: "ERP库位", prop: "locationErpCode" },
{ label: "ERP储位", prop: "locationErpCode" },
{ label: "批次", prop: "lot" },
{ label: "到货日期", prop: "arriveDate",type:"dateTime" },
{ label: "生产日期", prop: "produceDate",type: "dateTime" },
@ -2749,7 +2749,7 @@ export const expectIn = [
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "库区", prop: "locationArea" },
{ label: "库位组", prop: "locationGroup" },
{ label: "ERP库位", prop: "locationErpCode" },
{ label: "ERP储位", prop: "locationErpCode" },
{ label: "到货日期", prop: "arriveDate",type: "dateTime" },
{ label: "生产日期", prop: "produceDate",type: "dateTime" },
{ label: "过期时间", prop: "expireDate",type:"dateTime" },

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

@ -1709,7 +1709,7 @@ export const labelsList = [
{ label: "单位", prop: "uom" },
{ label: "批次", prop: "lot" },
{ label: "库位", prop: "recommendLocationCode" },
{ label: "ERP库位", prop: "locationErpCode" },
{ label: "ERP储位", prop: "locationErpCode" },
{ label: "类型", prop: "labelType", type: "filter", filters: "labelTypeStatus" },
{ label: "创建时间", prop: "creationTime",type:"dateTime" },
{ label: "创建者ID", prop: "creatorId" },
@ -1770,7 +1770,7 @@ export const InventoryInitialNote = [
{ label: "库位代码", prop: "locationCode" },
{ label: "库存状态", prop: "status",type: "filter", filters: "inventoryStage" },
{ label: "箱码", prop: 'packingCode' },
{ label: "ERP库位", prop: "locationErpCode" },
{ label: "ERP储位", prop: "locationErpCode" },
{ label: "是否可用", prop: "isActive", type: "filter", filters: "whetherOrNot" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "生产日期", prop: "produceDate" ,type: "dateTime" },
@ -1811,7 +1811,7 @@ export const InventoryTransaction = [
{ label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" },
{ label: "数量", prop: "qty" },
{ label: "箱码", prop: "packingCode" },
{ label: "ERP库位", prop: "locationErpCode" },
{ label: "ERP储位", prop: "locationErpCode" },
{ label: "库位代码", prop: "locationCode" },
{ label: "批次", prop: "lot" },
{ label: "库存状态", prop: "status" ,type: "filter", filters: "inventoryStage" },
@ -1859,7 +1859,7 @@ export const InventorySnapshot = [
{ label: "库位代码", prop: "locationCode" },
{ label: "库位组", prop: "locationGroup" },
{ label: "库区", prop: "locationArea" },
{ label: "ERP库位", prop: "locationErpCode" },
{ label: "ERP储位", prop: "locationErpCode" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime"},
@ -1937,7 +1937,7 @@ export const expectIn = [
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "库区", prop: "locationArea" },
{ label: "库位组", prop: "locationGroup" },
{ label: "ERP库位", prop: "locationErpCode" },
{ label: "ERP储位", prop: "locationErpCode" },
{ label: "生产日期", prop: "produceDate",type: "dateTime" },
{ label: "状态", prop: "status", type: "filter", filters: "jobStatus" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
@ -1969,7 +1969,7 @@ export const expectOut = [
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "库区", prop: "locationArea" },
{ label: "库位组", prop: "locationGroup" },
{ label: "ERP库位", prop: "locationErpCode" },
{ label: "ERP储位", prop: "locationErpCode" },
{ label: "生产日期", prop: "produceDate", type: "dateTime" },
{ label: "状态", prop: "status", type: "filter", filters: "jobStatus" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },

Write Preview
Loading…
Cancel
Save