From c74ccd721620b6ec7aab3cf7c0f02df667322de8 Mon Sep 17 00:00:00 2001 From: "SERVERM-0FVHDNN\\Administrator" <942005050@qq.com> Date: Tue, 28 Mar 2023 11:14:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/views/systemManage/roleManage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fe/PC/src/views/systemManage/roleManage.vue b/fe/PC/src/views/systemManage/roleManage.vue index d5fcc9849..a9b6eb2e6 100644 --- a/fe/PC/src/views/systemManage/roleManage.vue +++ b/fe/PC/src/views/systemManage/roleManage.vue @@ -553,7 +553,7 @@ export default { }) putpermissionsRoles( - "/api/permission-management/permissions?providerName=R&providerKey=" + + "/permission-management/permissions?providerName=R&providerKey=" + this.multipleSelection[0].name, params ).then((response) => { From b2ebfe10028ef9ce8e1e18fc89b24e794c252a83 Mon Sep 17 00:00:00 2001 From: "SERVERM-0FVHDNN\\Administrator" <942005050@qq.com> Date: Tue, 28 Mar 2023 13:28:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/utils/tableColumns/index.js | 94 ++++++++++++++++++++++++--- fe/PC/src/utils/tabsDesTions/index.js | 84 ++++++++++++++---------- 2 files changed, 135 insertions(+), 43 deletions(-) diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 9a3fceebe..78540fd63 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -176,7 +176,7 @@ export const BomInner = [ // fixed: "right" // }, ] -// 客户信息 +// 客户信息 20230328 export const Customer = [ { label: "客户名称", @@ -190,6 +190,18 @@ export const Customer = [ { label: "电话", prop: "phone" }, { label: "传真", prop: "fax" }, { label: "邮编", prop: "postID" }, + + // ------------------------------------- + { label: "创建时间", prop: "creationTime", type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, + { label: "备注", prop: "remark" }, + { label: "客户简称", prop: "shortName" }, + { label: "地址", prop: "address" }, + { label: "国家", prop: "country" }, + { label: "城市", prop: "city" }, + { label: "货币", prop: "currency" }, + { label: "type", prop: "type" }, + // { // label: "操作", // type:"buttonOperation", @@ -221,7 +233,7 @@ export const CustomerItem = [ // fixed: "right" // }, ] -// 客户地址信息 +// 客户地址信息 20230328 export const CustomerAddress = [ { label: "客户地址代码", @@ -236,6 +248,12 @@ export const CustomerAddress = [ { label: "城市", prop: "city" }, { label: "地址", prop: "address" }, { label: "联系人", prop: "contact" }, + // ------------------------------------------- + { label: "创建时间", prop: "creationTime", type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime" }, + { label: "备注", prop: "remark" }, + { label: "描述", prop: "desc" }, + // { // label: "操作", // type:"buttonOperation", @@ -244,7 +262,7 @@ export const CustomerAddress = [ // fixed: "right" // }, ] -// 客户项目信息 +// 客户项目信息 20230328 export const Project = [ { label: "项目代码", @@ -257,6 +275,11 @@ export const Project = [ { label: "开始时间", prop: "beginTime", type: "dateTime", showProp: true }, { label: "结束时间", prop: "endTime", type: "dateTime", showProp: true }, { label: "描述", prop: "description" }, + // -------------------------------------- + { label: "创建时间", prop: "creationTime", type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, + { label: "备注", prop: "remark" }, + // { // label: "操作", // type:"buttonOperation", @@ -265,7 +288,7 @@ export const Project = [ // fixed: "right" // }, ] -// 供应商信息 +// 供应商信息 20230328 export const Supplier = [ { label: "供应商代码", @@ -282,6 +305,15 @@ export const Supplier = [ { label: "电话", prop: "phone" }, { label: "传真", prop: 'fax' }, { label: "邮编", prop: 'postID' }, + // ------------------------------------- + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "备注", prop: 'remark' }, + { label: "地址", prop: 'address' }, + { label: "国家", prop: 'country' }, + { label: "城市", prop: 'city' }, + { label: "银行", prop: 'bank' }, + { label: "货币", prop: 'currency' }, + // { // label: "操作", // type:"buttonOperation", @@ -290,7 +322,7 @@ export const Supplier = [ // fixed: "right" // }, ] -// 供应商物品信息 +// 供应商物品信息 20230328 export const SupplierItem = [ { label: "供应商代码", @@ -303,6 +335,13 @@ export const SupplierItem = [ { label: "供应商物料名称", prop: "itemName" }, { label: "供应商简称", prop: "supplierSimpleName" }, { label: "版本", prop: "version" }, + // ----------------------------------------------- + { label: "创建时间", prop: "creationTime", type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, + { label: "备注", prop: "remark" }, + { label: "供应商包装计量单位", prop: "supplierPackUom" }, + { label: "供应商包装数量", prop: "supplierPackQty" }, + // { // label: "操作", // type:"buttonOperation", @@ -330,7 +369,7 @@ export const SupplierTime = [ // fixed: "right" // }, ] -// 收货口信息 +// 收货口信息 20230328 export const Dock = [ { label: "仓库代码", @@ -342,6 +381,11 @@ export const Dock = [ { label: "收货口代码", prop: "code" }, { label: "收货口名称", prop: 'name' }, { label: "描述", prop: "description" }, + // -------------------------------------------- + { label: "创建时间", prop: "creationTime", type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, + { label: "备注", prop: "remark" }, + // { // label: "操作", // type:"buttonOperation", @@ -350,7 +394,7 @@ export const Dock = [ // fixed: "right" // }, ] -// 区域信息 +// 区域信息 20230328 export const Area = [ { label: "区域代码", @@ -362,6 +406,11 @@ export const Area = [ { label: "是否功能区", prop: "isFunctional", type: "filter", filters: "whetherOrNot" }, { label: "类型", prop: "areaType", type: "filter", filters: "areaType", showProp: true }, { label: "描述", prop: "description" }, + // ---------------------------------------- + { label: "创建时间", prop: "creationTime", type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, + { label: "备注", prop: "remark" }, + // { // label: "操作", // type:"buttonOperation", @@ -370,7 +419,7 @@ export const Area = [ // fixed: "right" // }, ] -// 库位组信息 +// 库位组信息 20230328 export const LocationGroup = [ { label: "库位组代码", @@ -385,6 +434,28 @@ export const LocationGroup = [ { label: "状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage" }, { label: "拣料优先级", prop: "pickPriority" }, { label: "描述", prop: "description" }, + // ------------------------------------------ + { label: "溢流库位组", prop: "overflowLocationGroup" }, + { label: "可以混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" }, + { label: "可以混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" }, + { label: "可以混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" }, + { label: "可以负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" }, + { label: "可以保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" }, + { label: "可以机会盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" }, + { label: "可以领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" }, + { label: "可以过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" }, + { label: "可以整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" }, + { label: "可以散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" }, + { label: "可以发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" }, + { label: "可以接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" }, + { label: "可以退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" }, + { label: "可以接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" }, + { label: "是否可以拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" }, + { label: "是否可以拆托", prop: "enableSplitPallet", type: "filter", filters: "whetherOrNot" }, + { label: "创建时间", prop: "creationTime", type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, + { label: "备注", prop: "remark" }, + // { // label: "操作", // type:"buttonOperation", @@ -393,7 +464,7 @@ export const LocationGroup = [ // fixed: "right" // }, ] -// 工作组信息 +// 工作组信息 20230328 export const WorkGroup = [ { label: "工作组代码", @@ -404,6 +475,11 @@ export const WorkGroup = [ { label: "工作组名称", prop: 'name' }, { label: "仓库代码", prop: "warehouseCode" }, { label: "描述", prop: "description" }, + // ----------------------------------------- + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, + { label: "创建时间", prop: "creationTime", type: "dateTime" }, + { label: "备注", prop: "remark" }, + // { // label: "操作", // type:"buttonOperation", diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index 4b7f4f56b..ecde079cf 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -140,7 +140,7 @@ export const Bom = [ { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] -// 客户信息 20221212 +// 客户信息 20230328 export const Customer = [ { label: "客户代码", prop: "code" }, { label: "客户名称", prop: 'name' }, @@ -163,7 +163,7 @@ export const Customer = [ { label: "上次修改者Id", prop: "lastModifierId" }, { label: "type", prop: 'type' }, { label: "id", prop: 'id' }, - { label: "公司", prop: 'company' }, + // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] // 客户物品信息 20221212 @@ -187,7 +187,7 @@ export const CustomerItem = [ { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] -// 客户地址信息 20221212 +// 客户地址信息 20230328 export const CustomerAddress = [ { label: "客户地址编号", prop: "code" }, { label: "客户地址名称", prop: 'name' }, @@ -206,10 +206,10 @@ export const CustomerAddress = [ { label: "上次修改者Id", prop: "lastModifierId" }, { label: "仓库", prop: "warehouseCode", }, { label: "id", prop: 'id' }, - { label: "公司", prop: 'company' }, + // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] -// 客户项目信息 20221212 +// 客户项目信息 20230328 export const Project = [ { label: "客户代码", prop: "customerCode" }, { label: "项目代码", prop: "code" }, @@ -225,10 +225,10 @@ export const Project = [ { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, { label: "上次修改者Id", prop: "lastModifierId" }, { label: "id", prop: 'id' }, - { label: "公司", prop: 'company' }, + // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] -// 供应商信息 20221212 +// 供应商信息 20230328 export const Supplier = [ { label: "供应商代码", prop: "code" }, { label: "供应商名称", prop: "name" }, @@ -253,10 +253,10 @@ export const Supplier = [ { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, { label: "上次修改者Id", prop: "lastModifierId" }, { label: "id", prop: 'id' }, - { label: "公司", prop: 'company' }, + // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] -// 供应商物品信息 20221212 +// 供应商物品信息 20230328 export const SupplierItem = [ { label: "物料代码", prop: "itemCode" }, { label: "物料名称", prop: "itemName" }, @@ -275,7 +275,7 @@ export const SupplierItem = [ { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, { label: "上次修改者Id", prop: "lastModifierId" }, { label: "id", prop: 'id' }, - { label: "公司", prop: 'company' }, + // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] // 供应商时间窗口 20221212 @@ -295,7 +295,7 @@ export const SupplierTime = [ { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] -// 收货口信息 20221212 +// 收货口信息 20230328 export const Dock = [ { label: "默认库位编号", prop: "defaultLocationCode" }, { label: "收货口编号", prop: "code" }, @@ -310,10 +310,10 @@ export const Dock = [ { label: "上次修改者Id", prop: "lastModifierId" }, { label: "仓库", prop: 'warehouseCode' }, { label: "id", prop: 'id' }, - { label: "公司", prop: 'company' }, + // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] -// 区域信息 20221212 +// 区域信息 20230328 export const Area = [ { label: "区域代码", prop: "code" }, { label: "区域名称", prop: 'name' }, @@ -329,10 +329,10 @@ export const Area = [ { label: "上次修改者Id", prop: "lastModifierId" }, { label: "仓库", prop: 'warehouseCode' }, { label: "id", prop: 'id' }, - { label: "公司", prop: 'company' }, + // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] -// 库位组信息 20221212 +// 库位组信息 20230328 export const LocationGroup = [ { label: "区域代码", prop: "areaCode" }, { label: "类型", prop: "groupType", type: "filter", filters: "locationType" }, @@ -342,20 +342,20 @@ export const LocationGroup = [ { label: "名称", prop: 'name' }, { label: "描述", prop: "description" }, { label: "溢流库位组", prop: "overflowLocationGroup" }, - { label: "是否混物品", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableMixItem" }, - { label: "是否混批次", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableMixLot" }, - { label: "是否混状态", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableMixStatus" }, - { label: "是否负库存", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableNegative" }, - { label: "是否保留零库存", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableKeepZero" }, - { label: "是否机会盘点", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableOpportunityCount" }, - { label: "是否领料", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enablePick" }, - { label: "是否过量领料", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableOverPick" }, - { label: "是否整包存储", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableWholeStore" }, - { label: "是否散件存储", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableBreakStore" }, - { label: "是否发出", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableShip" }, - { label: "是否接收", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableReceive" }, - { label: "是否退货给供应商", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableReturnToSupplier" }, - { label: "是否接收客户退货", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableReturnFromCustomer" }, + // { label: "是否混物品", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableMixItem" }, + // { label: "是否混批次", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableMixLot" }, + // { label: "是否混状态", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableMixStatus" }, + // { label: "是否负库存", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableNegative" }, + // { label: "是否保留零库存", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableKeepZero" }, + // { label: "是否机会盘点", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableOpportunityCount" }, + // { label: "是否领料", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enablePick" }, + // { label: "是否过量领料", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableOverPick" }, + // { label: "是否整包存储", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableWholeStore" }, + // { label: "是否散件存储", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableBreakStore" }, + // { label: "是否发出", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableShip" }, + // { label: "是否接收", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableReceive" }, + // { label: "是否退货给供应商", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableReturnToSupplier" }, + // { label: "是否接收客户退货", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableReturnFromCustomer" }, { label: "备注", prop: 'remark' }, // ----------------------------------------------------------------------- { label: "是否拆箱", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableSplitBox" }, @@ -366,10 +366,26 @@ export const LocationGroup = [ { label: "上次修改者Id", prop: "lastModifierId" }, { label: "仓库", prop: 'warehouseCode' }, { label: "id", prop: 'id' }, - { label: "公司", prop: 'company' }, - // ----------------------------------------------------------------------- -] -// 工作组信息 20221212 + { label: "可以混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" }, + { label: "可以混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" }, + { label: "可以混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" }, + { label: "可以负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" }, + { label: "可以保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" }, + { label: "可以机会盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" }, + { label: "可以领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" }, + { label: "可以过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" }, + { label: "可以整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" }, + { label: "可以散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" }, + { label: "可以发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" }, + { label: "可以接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" }, + { label: "可以退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" }, + { label: "可以接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" }, + { label: "是否可以拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" }, + { label: "是否可以拆托", prop: "enableSplitPallet", type: "filter", filters: "whetherOrNot" }, + // { label: "公司", prop: 'company' }, + // ----------------------------------------------------------------------- +] +// 工作组信息 20230328 export const WorkGroup = [ { label: "工作组代码", prop: "code" }, { label: "工作组名称", prop: 'name' }, @@ -383,7 +399,7 @@ export const WorkGroup = [ { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, { label: "上次修改者Id", prop: "lastModifierId" }, { label: "id", prop: 'id' }, - { label: "公司", prop: 'company' }, + // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] // 库位信息 20221212