Skip to content

J
jinfa-platform
Commit b2b17833 authored by XieZhiXiong's avatar XieZhiXiong
Browse files
Options

调整路由完毕

parent 4dc43321
Hide whitespace changes
Inline Side-by-side
Showing with 274 additions and 155 deletions
config/routes/authConfigRoute.ts
View file @ b2b17833
/*
* @Author: Xujiamin
* @Date: 2020-08-26 21:02:23
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-10-14 14:34:28
* @Description: 系统能力路由相关
*/
import { RouterChild } from '../utils';
const AuthConfigRoute = {
const AuthConfigRoute: RouterChild = {
path: '/memberCenter/systemSetting',
name: 'systemSetting',
key: 'systemSetting',
icon: 'smile',
routes: [
// 权限管理
{
path: '/memberCenter/systemSetting/authConfig',
key: 'authConfig',
name: 'authConfig',
routes: [
// 组织机构
{
path: '/memberCenter/systemSetting/authConfig/organ',
name: 'organ',
component: '@/pages/authConfig/organ',
},
// 角色管理
{
path: '/memberCenter/systemSetting/authConfig/memberSystem',
name: 'memberSystem',
component: '@/pages/authConfig/memberSystem',
},
// 角色管理-新增
{
path: '/memberCenter/systemSetting/authConfig/memberSystem/memberDetail',
name: 'memberDetail',
path: '/memberCenter/systemSetting/authConfig/memberSystem/add',
name: 'addMemberRole',
component: '@/pages/authConfig/memberSystem/memberDetail',
hideInMenu: true,
hidePageHeader: true
},
},
// 角色管理-编辑
{
path: '/memberCenter/systemSetting/authConfig/memberSystem/edit',
name: 'editMemberRole',
component: '@/pages/authConfig/memberSystem/memberDetail',
hideInMenu: true,
},
// 角色管理-详情
{
path: '/memberCenter/systemSetting/authConfig/memberSystem/detail',
name: 'memberRoleDetail',
component: '@/pages/authConfig/memberSystem/memberDetail',
hideInMenu: true,
},
// 用户管理
{
path: '/memberCenter/systemSetting/authConfig/userSystem',
name: 'userSystem',
component: '@/pages/authConfig/userSystem',
},
// 用户管理-新增
{
path: '/memberCenter/systemSetting/authConfig/userSystem/add',
name: 'addUser',
component: '@/pages/authConfig/userSystem/userDetail',
hideInMenu: true,
},
// 用户管理-编辑
{
path: '/memberCenter/systemSetting/authConfig/userSystem/userDetail',
name: 'userSystem',
path: '/memberCenter/systemSetting/authConfig/userSystem/edit',
name: 'editUser',
component: '@/pages/authConfig/userSystem/userDetail',
hideInMenu: true,
},
// 用户管理-详情
{
path: '/memberCenter/systemSetting/authConfig/userSystem/detail',
name: 'userDetail',
component: '@/pages/authConfig/userSystem/userDetail',
hideInMenu: true,
hidePageHeader: true
},
]
},
},
// 收藏管理
{
path: '/memberCenter/systemSetting/collection',
name: 'collection',
......@@ -51,13 +90,13 @@ const AuthConfigRoute = {
path: '/memberCenter/systemSetting/accountSetting',
name: 'accountSetting',
component: '@/pages/accountSetting'
},
},
// 账户安全设置-修改登录密码
{
path: '/memberCenter/systemSetting/editAccount',
path: '/memberCenter/systemSetting/accountSetting/edit',
name: 'editAccount',
component: '@/pages/accountSetting/editAccount',
hideInMenu: true,
hidePageHeader: true
}
],
......
config/routes/channelRoute.ts
View file @ b2b17833
......@@ -6,32 +6,29 @@
* @Last Modified time: 2020-09-29 14:35:34
* @Description: 渠道能力路由相关
*/
import { RouterChild } from '../utils';
const ShopRoute = {
const ShopRoute: RouterChild = {
path: '/memberCenter/channelAbility',
name: 'channelAbility',
key: 'channelAbility',
icon: 'smile',
routes: [
// 创建渠道信息
{
path: '/memberCenter/channelAbility/infoManage',
name: 'shopInfoManage',
key: 'shopInfoManage',
component: '@/pages/channel/channelInfo',
},
// 渠道模板列表
{
path: '/memberCenter/channelAbility/template',
name: 'shopTemplate',
key: 'shopTemplate',
component: '@/pages/channel/channelTemplate',
},
// 渠道模板详情
{
path: '/memberCenter/channelAbility/template/detail',
name: 'shopTemplate',
key: 'shopTemplate',
hideInMenu: true,
component: '@/pages/channel/templateDetail',
}
......
config/routes/logisticsRoutes.ts
View file @ b2b17833
/*
* @Author: LeeJiancong
* @Date: 2020-07-13 14:36:02
* @LastEditors: LeeJiancong
* @LastEditors: XieZhiXiong
* @Copyright: 1549414730@qq.com
* @LastEditTime: 2020-08-24 16:50:42
* @LastEditTime: 2020-10-14 14:13:35
* @Description: 物流能力路由相关
*/
const LogisticsRoute = {
import { RouterChild } from '../utils';
const LogisticsRoute: RouterChild = {
path: '/memberCenter/logisticsAbility',
name: 'logisticsAbility',
key: 'logisticsAbility',
icon: 'smile',
routes: [
{
/**
* @description: 物流管理模块
* @param {type}
* @return:
*/
// 物流管理模块
path: '/memberCenter/logisticsAbility/logistics',
name: 'logistics',
key: 'logistics',
routes: [
// 物流公司管理
{
path: '/memberCenter/logisticsAbility/logistics/company',
name: 'company',
component: '@/pages/logistics/list/company'
},
// 物流公司管理-新增
{
path: '/memberCenter/logisticsAbility/logistics/addCompany',
path: '/memberCenter/logisticsAbility/logistics/company/add',
name: 'addCompany',
component: '@/pages/logistics/list/addCompany',
hideInMenu: true
},
//送货地址
// 物流公司管理-编辑
{
path: '/memberCenter/logisticsAbility/logistics/company/edit',
name: 'editCompany',
component: '@/pages/logistics/list/addCompany',
hideInMenu: true
},
// 物流公司管理-详情
{
path: '/memberCenter/logisticsAbility/logistics/company/detail',
name: 'companyDetail',
component: '@/pages/logistics/list/addCompany',
hideInMenu: true
},
// 发货地址
{
path: '/memberCenter/logisticsAbility/logistics/deliveryAddress',
name: 'deliveryAddress',
component: '@/pages/logistics/list/deliveryAddress'
},
},
// 发货地址-新增
{
path: '/memberCenter/logisticsAbility/logistics/addressForm',
name: 'addressForm',
path: '/memberCenter/logisticsAbility/logistics/deliveryAddress/add',
name: 'addDeliveryAddress',
component: '@/pages/logistics/list/components/addressForm',
hideInMenu: true
},
},
// 发货地址-编辑
{
path: '/memberCenter/logisticsAbility/logistics/deliveryAddress/edit',
name: 'editDeliveryAddress',
component: '@/pages/logistics/list/components/addressForm',
hideInMenu: true
},
// 收货地址
{
path: '/memberCenter/logisticsAbility/logistics/receivingAddress',
name: 'receivingAddress',
component: '@/pages/logistics/list/receivingAddress'
},
},
// 收货地址-新增
{
path: '/memberCenter/logisticsAbility/logistics/receivingAddress/add',
name: 'addReceivingAddress',
component: '@/pages/logistics/list/components/addressForm',
hideInMenu: true
},
// 收货地址-编辑
{
path: '/memberCenter/logisticsAbility/logistics/receivingAddress/edit',
name: 'editReceivingAddress',
component: '@/pages/logistics/list/components/addressForm',
hideInMenu: true
},
// 运费模板
{
path: '/memberCenter/logisticsAbility/logistics/template',
name: 'template',
component: '@/pages/logistics/list/template'
},
},
// 运费模板-新增
{
path: '/memberCenter/logisticsAbility/logistics/templateForm',
name: 'templateForm',
component: '@/pages/logistics/list/components/templateForm',
hideInMenu: true
}
},
// 运费模板-新增
{
path: '/memberCenter/logisticsAbility/logistics/template/add',
name: 'addTemplate',
component: '@/pages/logistics/list/components/templateForm',
hideInMenu: true
},
// 运费模板-编辑
{
path: '/memberCenter/logisticsAbility/logistics/template/edit',
name: 'editTemplate',
component: '@/pages/logistics/list/components/templateForm',
hideInMenu: true
},
// 运费模板-详情
{
path: '/memberCenter/logisticsAbility/logistics/template/detail',
name: 'templateDetail',
component: '@/pages/logistics/list/components/templateForm',
hideInMenu: true
},
]
},
/**
* @description: 物流单提交管理模块
* @param {type}
* @return:
*/
// 物流单提交
{
path: '/memberCenter/logisticsAbility/logisticsSubmit',
name: 'logisticsSubmit',
key: 'logisticsSubmit',
routes: [
// 快递单查询
{
path: '/memberCenter/logisticsAbility/logisticsSubmit/orderSubmitSearchList',
name: 'orderSubmitSearchList',
component: '@/pages/logistics/logisticsSubmit/orderSearchList',
},
//物流详情页 查看的
// 快递单查询-详情
{
path: '/memberCenter/logisticsAbility/logisticsSubmit/orderSubmitDeatil',
path: '/memberCenter/logisticsAbility/logisticsSubmit/orderSubmitSearchList/detail',
name: 'orderSubmitDeatil',
component: '@/pages/logistics/components/orderSearchDetail',
hideInMenu: true
},
},
// 待提交物流单
{
path: '/memberCenter/logisticsAbility/logisticsSubmit/toOrderSumitList',
name: 'toOrderSumitList',
component: '@/pages/logistics/logisticsSubmit/toOrderSumitList',
},
//待提交详情页 新增和修改的
// 待提交物流单-新增
{
path: '/memberCenter/logisticsAbility/logisticsSubmit/toOrderSubmitDetail',
name: 'toOrderSubmitDetail',
path: '/memberCenter/logisticsAbility/logisticsSubmit/toOrderSumitList/add',
name: 'addToOrderSubmit',
component: '@/pages/logistics/logisticsSubmit/toOrderSubmitDetail',
hideInMenu: true
}
},
// 待提交物流单-编辑
{
path: '/memberCenter/logisticsAbility/logisticsSubmit/toOrderSumitList/edit',
name: 'editToOrderSubmit',
component: '@/pages/logistics/logisticsSubmit/toOrderSubmitDetail',
hideInMenu: true
},
]
},
/**
* @description: 物流单处理管理模块
* @param {type}
* @return:
*/
// 物流单处理
{
path: '/memberCenter/logisticsAbility/logisticsResult',
name: 'logisticsResult',
key: 'logisticsResult',
routes: [
// 快递单查询
{
path: '/memberCenter/logisticsAbility/logisticsResult/orderResultSearchList',
name: 'orderResultSearchList',
component: '@/pages/logistics/logisticsResult/orderSearchList',
},
{//物流结果详情处理
path: '/memberCenter/logisticsAbility/logisticsResult/orderResultDeatil',
// 快递单查询-详情
{
path: '/memberCenter/logisticsAbility/logisticsResult/orderResultSearchList/detail',
name: 'orderResultDeatil',
component: '@/pages/logistics/components/orderSearchDetail',
hideInMenu: true
},
// 待确认物流单
{
path: '/memberCenter/logisticsAbility/logisticsResult/toOrderComfirmList',
name: 'toOrderComfirmList',
component: '@/pages/logistics/logisticsResult/toOrderComfirmList',
},
{//待确认详情处理
path: '/memberCenter/logisticsAbility/logisticsResult/toOrderComfirmDeatil',
// 待确认物流单-详情
{
path: '/memberCenter/logisticsAbility/logisticsResult/toOrderComfirmList/detail',
name: 'orderResultDeatil',
component: '@/pages/logistics/components/orderSearchDetail',
hideInMenu: true
},
]
}
]
}
export default LogisticsRoute
\ No newline at end of file
config/routes/memberRoute.ts
View file @ b2b17833
......@@ -6,18 +6,17 @@
* @Last Modified time: 2020-07-10 16:15:28
* @Description: 会员能力路由相关
*/
import { RouterChild } from '../utils';
const MemberRoute = {
const MemberRoute: RouterChild = {
path: '/memberCenter/memberAbility',
name: 'memberAbility',
key: 'memberAbility',
icon: 'smile',
routes: [
// 会员管理
{
path: '/memberCenter/memberAbility/manage',
name: 'memberManage',
key: 'memberManage',
routes: [
// 会员导入
{
......@@ -186,7 +185,6 @@ const MemberRoute = {
{
path: '/memberCenter/memberAbility/query/detail/basicInfo',
name: 'basicInfo',
key: 'basicInfo',
component: '@/pages/member/memberQuery/detailed/basicInfo',
hideInMenu: true,
},
......@@ -194,7 +192,6 @@ const MemberRoute = {
{
path: '/memberCenter/memberAbility/query/detail/levelInfo',
name: 'levelInfo',
key: 'levelInfo',
component: '@/pages/member/memberQuery/detailed/levelInfo',
hideInMenu: true,
},
......@@ -202,7 +199,6 @@ const MemberRoute = {
{
path: '/memberCenter/memberAbility/query/detail/equityInfo',
name: 'equityInfo',
key: 'equityInfo',
component: '@/pages/member/memberQuery/detailed/equityInfo',
hideInMenu: true,
},
......@@ -210,7 +206,6 @@ const MemberRoute = {
{
path: '/memberCenter/memberAbility/query/detail/sincerityInfo',
name: 'sincerityInfo',
key: 'sincerityInfo',
component: '@/pages/member/memberQuery/detailed/sincerityInfo',
hideInMenu: true,
},
......
config/routes/payandSettle.ts
View file @ b2b17833
......@@ -3,23 +3,25 @@
* @Date: 2020-08-19 15:33:27
* @LastEditors: XieZhiXiong
* @Copyright: 1549414730@qq.com
* @LastEditTime: 2020-09-29 20:46:13
* @LastEditTime: 2020-10-14 10:48:18
* @Description: 支付能力路由相关
*/
const payandSettleRoute = {
path:'/memberCenter/payandSettle',
name:'payandSettle',
key: 'payandSettle',
icon:'smile',
routes:[
import { RouterChild } from '../utils';
const payandSettleRoute: RouterChild = {
path: '/memberCenter/payandSettle',
name: 'payandSettle',
icon: 'smile',
routes: [
// 支付方式管理
{
path:'/memberCenter/payandSettle/paySetting',
name:'paySetting',
key:'paySetting',
routes:[
path: '/memberCenter/payandSettle/paySetting',
name: 'paySetting',
routes: [
// 会员支付参数配置
{
path:'/memberCenter/payandSettle/paySetting/payParamsSetting',
name:'payParamsSetting',
key:'payParamsSetting',
component:'@/pages/payandSettle/paySetting'
}
]
......@@ -72,16 +74,18 @@ const payandSettleRoute = {
},
// 资金账户
{
path:'/memberCenter/payandSettle/capitalAccounts',
name:'capitalAccounts',
path: '/memberCenter/payandSettle/capitalAccounts',
name: 'capitalAccounts',
routes: [
// 账户管理
{
path: '/memberCenter/payandSettle/capitalAccounts/accountLists',
name: 'accountLists',
component: '@/pages/payandSettle/capitalAccounts/accountLists',
},
// 账户管理-详情
{
path: '/memberCenter/payandSettle/capitalAccounts/accountLists/accountDetail',
path: '/memberCenter/payandSettle/capitalAccounts/accountLists/detail',
name: 'accountDetail',
component: '@/pages/payandSettle/capitalAccounts/accountLists/accountDetail',
hideInMenu: true,
......
config/routes/shopRoute.ts
View file @ b2b17833
......@@ -6,32 +6,29 @@
* @Last Modified time: 2020-09-29 14:36:01
* @Description: 店铺能力路由相关
*/
import { RouterChild } from '../utils';
const ShopRoute = {
const ShopRoute: RouterChild = {
path: '/memberCenter/shopAbility',
name: 'shopAbility',
key: 'shopAbility',
icon: 'smile',
routes: [
// 创建店铺信息
{
path: '/memberCenter/shopAbility/infoManage',
name: 'shopInfoManage',
key: 'shopInfoManage',
component: '@/pages/shop/shopInfo',
},
// 店铺模板列表
{
path: '/memberCenter/shopAbility/template',
name: 'shopTemplate',
key: 'shopTemplate',
component: '@/pages/shop/shopTemplate',
},
// 店铺模板详情
{
path: '/memberCenter/shopAbility/template/detail',
name: 'shopTemplate',
key: 'shopTemplate',
hideInMenu: true,
component: '@/pages/shop/templateDetail',
}
......
src/locales/zh-CN/menu.ts
View file @ b2b17833
......@@ -81,7 +81,7 @@ export default {
'menu.memberAbility': '会员',
'menu.memberAbility.memberManage': '会员管理',
'menu.memberAbility.memberManage.memberImport': '会员导入',
'menu.memberAbility.memberManage.addMember': '新增会员',
'menu.memberAbility.memberManage.addMember': '新建会员',
'menu.memberAbility.memberManage.editMember': '编辑会员',
'menu.memberAbility.memberManage.memberImportDetail': '会员导入详情',
'menu.memberAbility.memberManage.memberMaintain': '会员维护',
......@@ -110,7 +110,7 @@ export default {
'menu.memberAbility.memberQueryDetail.equityInfo': '权益信息',
'menu.memberAbility.memberQueryDetail.sincerityInfo': '诚信信息',
'menu.memberAbility.memberUpdate': '变更会员信息',
'menu.memberAbility.addSubRole': '新增会员角色',
'menu.memberAbility.addSubRole': '新建会员角色',
// 店铺能力
'menu.shopAbility': '店铺',
......@@ -139,7 +139,7 @@ export default {
// 商品询价
'menu.tranactionAbility.goodsOffer': '商品询价',
'menu.tranactionAbility.goodsOffer.enquiryOrder': '询价单查询',
'menu.tranactionAbility.goodsOffer.addEnquiryOrder': '待新增询价单',
'menu.tranactionAbility.goodsOffer.addEnquiryOrder': '待新建询价单',
'menu.tranactionAbility.goodsOffer.add': '新建询价单',
'menu.tranactionAbility.goodsOffer.edit': '编辑询价单',
'menu.tranactionAbility.goodsOffer.detail': '查看询价单',
......@@ -151,26 +151,26 @@ export default {
// 进销存
'menu.tranactionAbility.stockSellStorage': '进销存',
'menu.tranactionAbility.stockSellStorage.warehouse': '仓库',
'menu.tranactionAbility.stockSellStorage.addWarehouse': '新增仓库',
'menu.tranactionAbility.stockSellStorage.addWarehouse': '新建仓库',
'menu.tranactionAbility.stockSellStorage.editWarehouse': '编辑仓库',
'menu.tranactionAbility.stockSellStorage.warehouseDetail': '查看仓库',
'menu.tranactionAbility.stockSellStorage.billsType': '单据类型',
'menu.tranactionAbility.stockSellStorage.addBillsType': '新增单据类型',
'menu.tranactionAbility.stockSellStorage.addBillsType': '新建单据类型',
'menu.tranactionAbility.stockSellStorage.editBillsType': '编辑单据类型',
'menu.tranactionAbility.stockSellStorage.billsTypeDetail': '查看单据类型',
'menu.tranactionAbility.stockSellStorage.bills': '单据',
'menu.tranactionAbility.stockSellStorage.addBills': '新增单据',
'menu.tranactionAbility.stockSellStorage.addBills': '新建单据',
'menu.tranactionAbility.stockSellStorage.editBills': '编辑单据',
'menu.tranactionAbility.stockSellStorage.billsDetail': '查看单据',
'menu.tranactionAbility.stockSellStorage.inventory': '库存',
'menu.tranactionAbility.transactionRules': '交易规则',
'menu.tranactionAbility.addRule': '新增交易规则',
'menu.tranactionAbility.addRule': '新建交易规则',
// 需求发布
'menu.tranactionAbility.enquirySubmit': '需求发布',
'menu.tranactionAbility.enquirySubmit.enquirySearch': '需求单查询',
'menu.tranactionAbility.enquirySubmit.toAddSubmitList': '待新增需求单',
'menu.tranactionAbility.enquirySubmit.addEnquiry': '新增需求单',
'menu.tranactionAbility.enquirySubmit.toAddSubmitList': '待新建需求单',
'menu.tranactionAbility.enquirySubmit.addEnquiry': '新建需求单',
'menu.tranactionAbility.enquirySubmit.editEnquiry': '编辑需求单',
'menu.tranactionAbility.enquirySubmit.viewEnquiryDetail': '需求单详情',
'menu.tranactionAbility.enquirySubmit.enquiryOne': '待审核需求单（一级）',
......@@ -183,9 +183,9 @@ export default {
// 采购订单
'menu.tranactionAbility.purchaseOrder': '采购订单',
'menu.tranactionAbility.purchaseOrder.purchaseOrderSearch': '订单查询',
'menu.tranactionAbility.purchaseOrder.addReadyAddOrder': '新增订单',
'menu.tranactionAbility.purchaseOrder.addReadyAddOrder': '新建订单',
'menu.tranactionAbility.purchaseOrder.editReadyAddOrder': '编辑订单',
'menu.tranactionAbility.purchaseOrder.readyAddOrder': '待新增订单',
'menu.tranactionAbility.purchaseOrder.readyAddOrder': '待新建订单',
'menu.tranactionAbility.purchaseOrder.orderDetail': '订单详情',
'menu.tranactionAbility.purchaseOrder.orderPreview': '查看订单',
'menu.tranactionAbility.purchaseOrder.firstApprovedOrder': '待审核订单（一级）',
......@@ -198,7 +198,7 @@ export default {
'menu.tranactionAbility.purchaseOrder.readyConfirmContractDetail': '待确认电子合同详情',
'menu.tranactionAbility.purchaseOrder.readyPayOrder': '待支付订单',
'menu.tranactionAbility.purchaseOrder.readyPayOrderDetail': '待支付订单详情',
'menu.tranactionAbility.purchaseOrder.addPurchaseWarehouseOrder': '待新增入库单',
'menu.tranactionAbility.purchaseOrder.addPurchaseWarehouseOrder': '待新建入库单',
'menu.tranactionAbility.purchaseOrder.readyReceiveOrder': '待收货订单',
'menu.tranactionAbility.purchaseOrder.readyReceiveOrderDetail': '待收货订单详情',
'menu.tranactionAbility.purchaseOrder.readyFileOrder': '待归档订单',
......@@ -218,9 +218,9 @@ export default {
'menu.tranactionAbility.saleOrder.readyConfirmOrderDetail': '待确认订单详情',
'menu.tranactionAbility.saleOrder.readyPayResult': '待确认支付结果',
'menu.tranactionAbility.saleOrder.readyPayResultDetail': '待确认支付结果详情',
'menu.tranactionAbility.saleOrder.addSaleDelevedOrder': '待新增销售发货单',
'menu.tranactionAbility.saleOrder.addSaleDelevedOrderDetail': '新增销售发货单',
'menu.tranactionAbility.saleOrder.readyAddLogisticsOrder': '待新增物流单',
'menu.tranactionAbility.saleOrder.addSaleDelevedOrder': '待新建销售发货单',
'menu.tranactionAbility.saleOrder.addSaleDelevedOrderDetail': '新建销售发货单',
'menu.tranactionAbility.saleOrder.readyAddLogisticsOrder': '待新建物流单',
'menu.tranactionAbility.saleOrder.readyConfirmDelevedOrder': '待确认发货订单',
'menu.tranactionAbility.saleOrder.readyConfirmDelevedOrderDetail': '待确认发货订单详情',
'menu.tranactionAbility.saleOrder.readyConfirmReturnOrder': '待确认回单',
......@@ -232,8 +232,8 @@ export default {
'menu.tranactionAbility.enquiryOffer': '需求报价',
'menu.tranactionAbility.enquiryOffer.enquirySearch': '需求单查询',
'menu.tranactionAbility.enquiryOffer.enquiryOfferSearch': '报价单查询',
'menu.tranactionAbility.enquiryOffer.toAddSubmitList': '待新增报价单',
'menu.tranactionAbility.enquiryOffer.addEnquiry': '新增报价单',
'menu.tranactionAbility.enquiryOffer.toAddSubmitList': '待新建报价单',
'menu.tranactionAbility.enquiryOffer.addEnquiry': '新建报价单',
'menu.tranactionAbility.enquiryOffer.editEnquiry': '编辑报价单',
'menu.tranactionAbility.enquiryOffer.viewEnquiryDetail': '报价单详情',
'menu.tranactionAbility.enquiryOffer.enquiryOne': '待审核报价单（一级）',
......@@ -277,17 +277,26 @@ export default {
'menu.logisticsAbility.logistics': '物流管理',
'menu.logisticsAbility.logistics.company': '物流公司管理',
'menu.logisticsAbility.logistics.addCompany': '新建物流公司',
'menu.logisticsAbility.logistics.editCompany': '编辑物流公司',
'menu.logisticsAbility.logistics.companyDetail': '查看物流公司',
'menu.logisticsAbility.logistics.deliveryAddress': '发货地址管理',
'menu.logisticsAbility.logistics.addDeliveryAddress': '新建发货地址',
'menu.logisticsAbility.logistics.editDeliveryAddress': '编辑发货地址',
'menu.logisticsAbility.logistics.addressForm': '新建发货地址',
'menu.logisticsAbility.logistics.receivingAddress': '收货地址管理',
'menu.logisticsAbility.logistics.addReceivingAddress': '新建收货地址',
'menu.logisticsAbility.logistics.editReceivingAddress': '编辑收货地址',
'menu.logisticsAbility.logistics.template': '运费模板管理',
'menu.logisticsAbility.logistics.templateForm': '新建运费模板',
'menu.logisticsAbility.logistics.addTemplate': '新建运费模板',
'menu.logisticsAbility.logistics.editTemplate': '编辑运费模板',
'menu.logisticsAbility.logistics.templateDetail': '查看运费模板',
'menu.logisticsAbility.logisticsSubmit': '物流单提交',
'menu.logisticsAbility.logisticsSubmit.orderSubmitSearchList': '物流单查询',
'menu.logisticsAbility.logisticsSubmit.orderSubmitDeatil': '物流单详情',
'menu.logisticsAbility.logisticsSubmit.toOrderSumitList': '待提交物流单',
'menu.logisticsAbility.logisticsSubmit.toOrderSubmitDetail': '新建物流单',
'menu.logisticsAbility.logisticsSubmit.addToOrderSubmit': '新增待提交物流单',
'menu.logisticsAbility.logisticsSubmit.editToOrderSubmit': '编辑待提交物流单',
'menu.logisticsAbility.logisticsResult': '物流单处理',
'menu.logisticsAbility.logisticsResult.orderResultSearchList': '物流单查询',
......@@ -314,9 +323,13 @@ export default {
'menu.systemSetting.authConfig': '权限管理',
'menu.systemSetting.authConfig.organ': '组织机构',
'menu.systemSetting.authConfig.memberSystem': '角色管理',
'menu.systemSetting.authConfig.memberDetail': '角色详情',
'menu.systemSetting.authConfig.addMemberRole': '新建角色',
'menu.systemSetting.authConfig.editMemberRole': '编辑角色',
'menu.systemSetting.authConfig.memberRoleDetail': '查看角色',
'menu.systemSetting.authConfig.userSystem': '用户管理',
'menu.systemSetting.authConfig.userDetail': '用户详情',
'menu.systemSetting.authConfig.addUser': '新增用户',
'menu.systemSetting.authConfig.editUser': '编辑用户',
'menu.systemSetting.authConfig.userDetail': '查看用户',
'menu.systemSetting.collection': '收藏管理',
'menu.systemSetting.accountSetting': '账号安全设置',
......
src/pages/accountSetting/components/TypeVerify/index.tsx
View file @ b2b17833
......@@ -50,7 +50,7 @@ const TypeVerify: React.FC<IProps> = (props) => {
} else if(type == 'paycode' && paycode == 0) {
return <a>设置支付密码</a>
}
return <Link to={`/memberCenter/systemSetting/editAccount?type=${type}`}>修改</Link>
return <Link to={`/memberCenter/systemSetting/accountSetting/edit?type=${type}`}>修改</Link>
}
return (
......
src/pages/authConfig/memberSystem/index.tsx
View file @ b2b17833
......@@ -34,7 +34,7 @@ const MemberSystem: React.FC<{}> = () => {
}
const updateItem = (record) => {
history.push(`/memberCenter/systemSetting/authConfig/memberSystem/memberDetail?id=${record.id}&preview=0`)
history.push(`/memberCenter/systemSetting/authConfig/memberSystem/edit?id=${record.id}&preview=0`)
}
const handleStatus = async (record) => {
......@@ -59,7 +59,7 @@ const MemberSystem: React.FC<{}> = () => {
align: 'center',
key: 'roleName',
className: 'commonPickColor',
render: (text, record) => <EyePreview url={`/memberCenter/systemSetting/authConfig/memberSystem/memberDetail?id=${record.id}&preview=1`}>{text}</EyePreview>
render: (text, record) => <EyePreview url={`/memberCenter/systemSetting/authConfig/memberSystem/detail?id=${record.id}&preview=1`}>{text}</EyePreview>
},
{
title: '描述',
......@@ -111,7 +111,7 @@ const MemberSystem: React.FC<{}> = () => {
layouts: {
order: 2
},
children: <Button style={{width: 140}} icon={<PlusOutlined/>} onClick={() => history.push('/memberCenter/systemSetting/authConfig/memberSystem/memberDetail')} type='primary'>新建</Button>
children: <Button style={{width: 140}} icon={<PlusOutlined/>} onClick={() => history.push('/memberCenter/systemSetting/authConfig/memberSystem/add')} type='primary'>新建</Button>
}}
formilyProps={{
layouts: {
......
src/pages/authConfig/userSystem/index.tsx
View file @ b2b17833
......@@ -27,7 +27,7 @@ const UserSystem: React.FC<{}> = () => {
const ref = useRef<any>({})
const addItem = () => {
history.push('/memberCenter/systemSetting/authConfig/userSystem/userDetail')
history.push('/memberCenter/systemSetting/authConfig/userSystem/add')
}
const deleteItem = (record) => {
// 删除该项
......@@ -39,7 +39,7 @@ const UserSystem: React.FC<{}> = () => {
}
const updateItem = (record) => {
history.push(`/memberCenter/systemSetting/authConfig/userSystem/userDetail?id=${record.userId}&preview=0`)
history.push(`/memberCenter/systemSetting/authConfig/userSystem/edit?id=${record.userId}&preview=0`)
}
const handleStatus = (record) => {
......@@ -57,7 +57,7 @@ const UserSystem: React.FC<{}> = () => {
align: 'center',
key: 'account',
className: 'commonPickColor',
render: (text, record) => <EyePreview url={`/memberCenter/systemSetting/authConfig/userSystem/userDetail?id=${record.userId}&preview=1`}>{text}</EyePreview>
render: (text, record) => <EyePreview url={`/memberCenter/systemSetting/authConfig/userSystem/detail?id=${record.userId}&preview=1`}>{text}</EyePreview>
},
{
title: '用户姓名',
......
src/pages/logistics/components/orderSearchDetail.tsx
View file @ b2b17833
......@@ -223,7 +223,7 @@ const detailInfo: React.FC<{}> = () => {
setid(id)
//待新增
if (pathname === '/memberCenter/logisticsAbility/logisticsSubmit/orderSubmitDeatil') {
if (pathname === '/memberCenter/logisticsAbility/logisticsSubmit/orderSubmitSearchList/detail') {
PublicApi.getLogisticsOrderSubmitGet({ id: id }).then(res => {
setdataInfo(res.data)
let current = 0
......@@ -237,7 +237,7 @@ const detailInfo: React.FC<{}> = () => {
}
//物流单处理 物流单查询
if (pathname === '/memberCenter/logisticsAbility/logisticsResult/orderResultDeatil') {
if (pathname === '/memberCenter/logisticsAbility/logisticsResult/orderResultSearchList/detail') {
PublicApi.getLogisticsOrderConfirmGet({ id: id }).then(res => {
setdataInfo(res.data)
let current = 0
......@@ -251,7 +251,7 @@ const detailInfo: React.FC<{}> = () => {
}
//待确认物流单
if (pathname === '/memberCenter/logisticsAbility/logisticsResult/toOrderComfirmDeatil') {
if (pathname === '/memberCenter/logisticsAbility/logisticsResult/toOrderComfirmList/detail') {
PublicApi.getLogisticsOrderWaitConfirmGet({ id: id }).then(res => {
setdataInfo(res.data)
......
src/pages/logistics/components/orderSearchList.tsx
View file @ b2b17833
......@@ -149,11 +149,11 @@ const orderSearchList: React.FC<listProps> = (props) => {
const handleSee = (id: number) => {
if (props.type === '1') {
history.push(`/memberCenter/logisticsAbility/logisticsSubmit/orderSubmitDeatil?id=${id}`)
history.push(`/memberCenter/logisticsAbility/logisticsSubmit/orderSubmitSearchList/detail?id=${id}`)
} else if (props.type === '2') {
history.push(`/memberCenter/logisticsAbility/logisticsResult/orderResultDeatil?id=${id}`)
history.push(`/memberCenter/logisticsAbility/logisticsResult/orderResultSearchList/detail?id=${id}`)
} else {
history.push(`/memberCenter/logisticsAbility/logisticsResult/toOrderComfirmDeatil?id=${id}`)
history.push(`/memberCenter/logisticsAbility/logisticsResult/toOrderComfirmList/detail?id=${id}`)
}
}
const columns: ColumnType<any>[] = [
......
src/pages/logistics/components/pageOrderLog.tsx
View file @ b2b17833
......@@ -87,7 +87,7 @@ const Log: React.FC<Params> = (props) => {
});
}
//物流单提交-物流单查询
else if(props.pathName == '/memberCenter/logisticsAbility/logisticsSubmit/orderSubmitDeatil'){
else if(props.pathName == '/memberCenter/logisticsAbility/logisticsSubmit/orderSubmitSearchList/detail'){
return new Promise((resolve, reject) => {
PublicApi.getLogisticsOrderSubmitPageOrderLog({...params,orderId:props.id}).then(res => {
if(res.code === 1000){
......@@ -97,7 +97,7 @@ const Log: React.FC<Params> = (props) => {
});
}
//物流单处理-物流单查询
else if(props.pathName == '/memberCenter/logisticsAbility/logisticsSubmit/orderSubmitDeatil'){
else if(props.pathName == '/memberCenter/logisticsAbility/logisticsSubmit/orderSubmitSearchList/detail'){
return new Promise((resolve, reject) => {
PublicApi.getLogisticsOrderConfirmPageOrderLog({...params,orderId:props.id}).then(res => {
if(res.code === 1000){
......@@ -107,7 +107,7 @@ const Log: React.FC<Params> = (props) => {
});
}
//物流单处理-待确认物流单
else if(props.pathName == '/memberCenter/logisticsAbility/logisticsResult/toOrderComfirmDeatil'){
else if(props.pathName == '/memberCenter/logisticsAbility/logisticsResult/toOrderComfirmList/detail'){
return new Promise((resolve, reject) => {
PublicApi.getLogisticsOrderWaitConfirmPageOrderLog({...params,orderId:props.id}).then(res => {
if(res.code === 1000){
......
src/pages/logistics/list/company.tsx
View file @ b2b17833
......@@ -82,7 +82,7 @@ const Company: React.FC<{}> = () => {
align: 'left',
key: 'name',
render: (text: any, record: any) => (
<EyePreview url={`/memberCenter/logisticsAbility/logistics/addCompany?id=${record.id}&preview=1`}>{text}</EyePreview>
<EyePreview url={`/memberCenter/logisticsAbility/logistics/company/detail?id=${record.id}&preview=1`}>{text}</EyePreview>
)
},
{
......@@ -115,7 +115,7 @@ const Company: React.FC<{}> = () => {
<>
{ record.status === 0 ?
<>
<Button type='link' onClick={() => history.push(`/memberCenter/logisticsAbility/logistics/addCompany?id=${record.id}`)}>编辑</Button>
<Button type='link' onClick={() => history.push(`/memberCenter/logisticsAbility/logistics/company/edit?id=${record.id}`)}>编辑</Button>
<Popconfirm title="确定要删除吗？" okText="是" cancelText="否" onConfirm={() => handleDelete(record.id)}>
<Button type='link'>
删除
......@@ -145,7 +145,7 @@ const Company: React.FC<{}> = () => {
text: '新建',
icon: <PlusOutlined />,
handler: () => {
history.push('/memberCenter/logisticsAbility/logistics/addCompany')
history.push('/memberCenter/logisticsAbility/logistics/company/add')
}
}
]
......@@ -163,7 +163,7 @@ const Company: React.FC<{}> = () => {
}
const handleSee = (id: number) => {
history.push(`/memberCenter/logisticsAbility/logistics/addCompany?id=${id}&isSee=true`)
history.push(`/memberCenter/logisticsAbility/logistics/company/detail?id=${id}&isSee=true`)
}
const confirm = () => {
......@@ -190,7 +190,7 @@ const Company: React.FC<{}> = () => {
formilyChilds={{
children: (
<>
<Button type="primary" onClick={() => history.push('/memberCenter/logisticsAbility/logistics/addCompany')}>
<Button type="primary" onClick={() => history.push('/memberCenter/logisticsAbility/logistics/company/add')}>
新建 <PlusOutlined />
</Button>
</>
......
src/pages/logistics/list/components/addressList.tsx
View file @ b2b17833
......@@ -122,7 +122,14 @@ const AddressList: React.FC<ListProps> = (props) => {
const [table, setTable] = useState([])
const [editingKey, setEditingKey] = useState('');
const toEdit = (id: number) => {
history.push(`/memberCenter/logisticsAbility/logistics/addressForm?page_type=${props.type}&id=${id}`)
// 发货地址管理列表，否则是收件地址管理列表
if (props.type == '1') {
// history.push(`/memberCenter/logisticsAbility/logistics/addressForm?page_type=${props.type}&id=${id}`)
history.push(`/memberCenter/logisticsAbility/logistics/deliveryAddress/edit?page_type=${props.type}&id=${id}`)
} else {
// history.push(`/memberCenter/logisticsAbility/logistics/addressForm?page_type=${props.type}&id=${id}`)
history.push(`/memberCenter/logisticsAbility/logistics/receivingAddress/edit?page_type=${props.type}&id=${id}`)
}
};
const columns: ColumnType<any>[] = [
{
......@@ -280,7 +287,22 @@ const AddressList: React.FC<ListProps> = (props) => {
formilyChilds={{
children: (
<>
<Button type="primary" icon={<PlusOutlined />} onClick={() => history.push(`/memberCenter/logisticsAbility/logistics/addressForm?page_type=${props.type}&id=0`)}>新建</Button>
<Button
type="primary"
icon={<PlusOutlined />}
onClick={() => {
// 发货地址管理列表，否则是收件地址管理列表
if (props.type == '1') {
// history.push(`/memberCenter/logisticsAbility/logistics/addressForm?page_type=${props.type}&id=0`)
history.push(`/memberCenter/logisticsAbility/logistics/deliveryAddress/add?page_type=${props.type}&id=0`)
} else {
// history.push(`/memberCenter/logisticsAbility/logistics/addressForm?page_type=${props.type}&id=0`)
history.push(`/memberCenter/logisticsAbility/logistics/receivingAddress/add?page_type=${props.type}&id=0`)
}
}}
>
新建
</Button>
</>
)
}}
......
src/pages/logistics/list/template.tsx
View file @ b2b17833
......@@ -129,7 +129,7 @@ const Template: React.FC<ListProps> = (props) => {
align: 'left',
key: 'name',
render: (text:any,record:any) => (
<EyePreview url={`/memberCenter/logisticsAbility/logistics/templateForm?id=${record.id}&isSee=${true}`}>{text}</EyePreview>
<EyePreview url={`/memberCenter/logisticsAbility/logistics/template/detail?id=${record.id}&isSee=${true}`}>{text}</EyePreview>
)
},
{
......@@ -179,7 +179,7 @@ const Template: React.FC<ListProps> = (props) => {
{
record.status === 0 ?
<>
<Button type='link' onClick={() => history.push(`/memberCenter/logisticsAbility/logistics/templateForm?id=${record.id}`)}>编辑</Button>
<Button type='link' onClick={() => history.push(`/memberCenter/logisticsAbility/logistics/template/edit?id=${record.id}`)}>编辑</Button>
<Popconfirm title="确定要删除吗？" okText="是" cancelText="否" onConfirm={() =>handleDelete(record.id)}>
<Button type='link'>
删除
......@@ -231,7 +231,7 @@ const Template: React.FC<ListProps> = (props) => {
}
]
const handleSee = (id: number) => {
history.push(`/memberCenter/logisticsAbility/logistics/templateForm?id=${id}&isSee=${true}`)
history.push(`/memberCenter/logisticsAbility/logistics/template/detail?id=${id}&isSee=${true}`)
}
const confirm = () => {
......@@ -258,7 +258,7 @@ const Template: React.FC<ListProps> = (props) => {
formilyChilds={{
children: (
<>
<Button type="primary" icon={<PlusOutlined />} onClick={() => history.push(`/memberCenter/logisticsAbility/logistics/templateForm?id=0`)}>
<Button type="primary" icon={<PlusOutlined />} onClick={() => history.push(`/memberCenter/logisticsAbility/logistics/template/add?id=0`)}>
新建
</Button>
</>
......
src/pages/logistics/logisticsResult/toOrderComfirmList.tsx
View file @ b2b17833
......@@ -266,7 +266,7 @@ const OrderList: React.FC<ListProps> = (props) => {
console.log('delete')
}
const handleSee = (id: any) => {
history.push(`/memberCenter/logisticsAbility/logisticsResult/toOrderComfirmDeatil?id=${id}`)
history.push(`/memberCenter/logisticsAbility/logisticsResult/toOrderComfirmList/detail?id=${id}`)
}
const confirm = () => {
......
src/pages/logistics/logisticsSubmit/toOrderSumitList.tsx
View file @ b2b17833
......@@ -262,7 +262,7 @@ const OrderList: React.FC<ListProps> = (props) => {
})
}
const handleSee = (id: number) => {
history.push(`/memberCenter/logisticsAbility/logisticsSubmit/orderSubmitDeatil?id=${id}`)
history.push(`/memberCenter/logisticsAbility/logisticsSubmit/orderSubmitSearchList/detail?id=${id}`)
}
const confirm = () => {
......@@ -273,7 +273,7 @@ const OrderList: React.FC<ListProps> = (props) => {
console.log('cancel')
}
const toEdit = (id: number) => {
history.push(`/memberCenter/logisticsAbility/logisticsSubmit/toOrderSubmitDetail?id=${id}`)
history.push(`/memberCenter/logisticsAbility/logisticsSubmit/toOrderSumitList/edit?id=${id}`)
}
const rowSelection: TableRowSelection<any> = {
......@@ -332,7 +332,7 @@ const OrderList: React.FC<ListProps> = (props) => {
<Button
type="primary"
onClick={() =>
history.push('/memberCenter/logisticsAbility/logisticsSubmit/toOrderSubmitDetail')
history.push('/memberCenter/logisticsAbility/logisticsSubmit/toOrderSumitList/add')
}
>
<PlusOutlined />
......
src/pages/payandSettle/capitalAccounts/accountLists/index.tsx
View file @ b2b17833
......@@ -24,7 +24,7 @@ const AccountLists: React.FC<{}> = () => {
key: 'name',
className: 'commonPickColor',
render: (text, record) => <EyePreview
url={`/memberCenter/payandSettle/capitalAccounts/accountLists/accountDetail?id=${record.id}`}
url={`/memberCenter/payandSettle/capitalAccounts/accountLists/detail?id=${record.id}`}
>
{text}
</EyePreview>
......
src/pages/transaction/saleOrder/readyAddLogisticsOrder/model/useSelfTable.tsx
View file @ b2b17833
......@@ -105,12 +105,12 @@ export const useSelfTable = () => {
invoicesNo: record.orderNo,
invoicesId: record.id
}
history.push(`/memberCenter/logisticsAbility/logisticsSubmit/toOrderSubmitDetail?${qs.stringify(params)}`)
history.push(`/memberCenter/logisticsAbility/logisticsSubmit/toOrderSumitList/add?${qs.stringify(params)}`)
}
const handlePreview = async (record) => {
const logisticsId = record.logisticsId
history.push(`/memberCenter/logisticsAbility/logisticsSubmit/orderSubmitDeatil?id=${logisticsId}&invoicesTypeId=2`)
history.push(`/memberCenter/logisticsAbility/logisticsSubmit/orderSubmitSearchList/detail?id=${logisticsId}&invoicesTypeId=2`)
}
return {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment