diff --git a/fe/PC/public/config.js b/fe/PC/public/config.js index e992019fe..c01ed3996 100644 --- a/fe/PC/public/config.js +++ b/fe/PC/public/config.js @@ -1,24 +1,24 @@ // dev_linux -window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:21093' -window.SITE_CONFIG['user'] = 'http://dev.ccwin-in.com:21093/api/auth' -// window.SITE_CONFIG['print'] = 'print' -window.SITE_CONFIG['print'] = 'http://dev.ccwin-in.com:60074' -window.SITE_CONFIG['largeScreen'] = 'http://dev.ccwin-in.com:60073' -window.SITE_CONFIG['warehouseCode'] = 'T8' -window.SITE_CONFIG['company'] = 'DongYang' -window.SITE_CONFIG['client_secret'] = '1q2w3E*' -window.SITE_CONFIG['reportsUrl'] = 'http://10.164.0.227:21093/#/reports/' - -// dev_win -// window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:60099' -// window.SITE_CONFIG['user'] = 'http://dev.ccwin-in.com:60099/api/auth' -// // window.SITE_CONFIG['print'] = 'print'21384 +// window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:21093' +// window.SITE_CONFIG['user'] = 'http://dev.ccwin-in.com:21093/api/auth' +// // window.SITE_CONFIG['print'] = 'print' // window.SITE_CONFIG['print'] = 'http://dev.ccwin-in.com:60074' // window.SITE_CONFIG['largeScreen'] = 'http://dev.ccwin-in.com:60073' // window.SITE_CONFIG['warehouseCode'] = 'T8' // window.SITE_CONFIG['company'] = 'DongYang' // window.SITE_CONFIG['client_secret'] = '1q2w3E*' -// window.SITE_CONFIG['reportsUrl'] = 'http://10.164.0.227:60099/#/reports/' +// window.SITE_CONFIG['reportsUrl'] = 'http://10.164.0.227:21093/#/reports/' + +// dev_win +window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:60099' +window.SITE_CONFIG['user'] = 'http://dev.ccwin-in.com:60099/api/auth' +// window.SITE_CONFIG['print'] = 'print'21384 +window.SITE_CONFIG['print'] = 'http://dev.ccwin-in.com:60074' +window.SITE_CONFIG['largeScreen'] = 'http://dev.ccwin-in.com:60073' +window.SITE_CONFIG['warehouseCode'] = 'T8' +window.SITE_CONFIG['company'] = 'DongYang' +window.SITE_CONFIG['client_secret'] = '1q2w3E*' +window.SITE_CONFIG['reportsUrl'] = 'http://10.164.0.227:60099/#/reports/' // mock // window.SITE_CONFIG['apifoxToken'] = 'NXHNi5mp0dnUHGt0wkCrjvfcidsFKV33' diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index d69cedac3..d4d062d3d 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -269,14 +269,13 @@ export const CustomerItem = [ ] // 客户地址信息 20230328 export const CustomerAddress = [ - { - label: "客户地址代码", - prop: "code", + { label: "客户代码", + prop: "customerCode", fixed: "left", type: "name" }, { label: "客户地址名称", prop: "name" }, - { label: "客户代码", prop: "customerCode" }, + { label: "客户地址代码", prop: "code" }, { label: "仓库代码", prop: "warehouseCode" }, { label: "库位代码", prop: "locationCode" }, { label: "城市", prop: "city" },