diff --git a/src/api/factory/snm/orderLog.js b/src/api/factory/snm/orderLog.js new file mode 100644 index 0000000..9e13674 --- /dev/null +++ b/src/api/factory/snm/orderLog.js @@ -0,0 +1,50 @@ +import request from '@/router/axios'; + +export const getList = (current, size, params) => { + return request({ + url: '/api/logpm-factory/snm/orderLog/list', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + +export const getDetail = (id) => { + return request({ + url: '/api/logpm-factory/snm/orderLog/detail', + method: 'get', + params: { + id + } + }) +} + +export const remove = (ids) => { + return request({ + url: '/api/logpm-factory/snm/orderLog/remove', + method: 'post', + params: { + ids, + } + }) +} + +export const add = (row) => { + return request({ + url: '/api/logpm-factory/snm/orderLog/submit', + method: 'post', + data: row + }) +} + +export const update = (row) => { + return request({ + url: '/api/logpm-factory/snm/orderLog/submit', + method: 'post', + data: row + }) +} + diff --git a/src/api/factory/snm/staorderPackages.js b/src/api/factory/snm/staorderPackages.js new file mode 100644 index 0000000..f915cea --- /dev/null +++ b/src/api/factory/snm/staorderPackages.js @@ -0,0 +1,50 @@ +import request from '@/router/axios'; + +export const getList = (current, size, params) => { + return request({ + url: '/api/logpm-factory/snm/staorderPackages/list', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + +export const getDetail = (id) => { + return request({ + url: '/api/logpm-factory/snm/staorderPackages/detail', + method: 'get', + params: { + id + } + }) +} + +export const remove = (ids) => { + return request({ + url: '/api/logpm-factory/snm/staorderPackages/remove', + method: 'post', + params: { + ids, + } + }) +} + +export const add = (row) => { + return request({ + url: '/api/logpm-factory/snm/staorderPackages/submit', + method: 'post', + data: row + }) +} + +export const update = (row) => { + return request({ + url: '/api/logpm-factory/snm/staorderPackages/submit', + method: 'post', + data: row + }) +} + diff --git a/src/api/factory/snm/stationOrder.js b/src/api/factory/snm/stationOrder.js new file mode 100644 index 0000000..f3080c6 --- /dev/null +++ b/src/api/factory/snm/stationOrder.js @@ -0,0 +1,50 @@ +import request from '@/router/axios'; + +export const getList = (current, size, params) => { + return request({ + url: '/api/logpm-factory/snm/stationOrder/list', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + +export const getDetail = (id) => { + return request({ + url: '/api/logpm-factory/snm/stationOrder/detail', + method: 'get', + params: { + id + } + }) +} + +export const remove = (ids) => { + return request({ + url: '/api/logpm-factory/snm/stationOrder/remove', + method: 'post', + params: { + ids, + } + }) +} + +export const add = (row) => { + return request({ + url: '/api/logpm-factory/snm/stationOrder/submit', + method: 'post', + data: row + }) +} + +export const update = (row) => { + return request({ + url: '/api/logpm-factory/snm/stationOrder/submit', + method: 'post', + data: row + }) +} + diff --git a/src/api/factory/snm/stationlinenum.js b/src/api/factory/snm/stationlinenum.js new file mode 100644 index 0000000..c303e21 --- /dev/null +++ b/src/api/factory/snm/stationlinenum.js @@ -0,0 +1,50 @@ +import request from '@/router/axios'; + +export const getList = (current, size, params) => { + return request({ + url: '/api/logpm-factory/snm/stationlinenum/list', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + +export const getDetail = (id) => { + return request({ + url: '/api/logpm-factory/snm/stationlinenum/detail', + method: 'get', + params: { + id + } + }) +} + +export const remove = (ids) => { + return request({ + url: '/api/logpm-factory/snm/stationlinenum/remove', + method: 'post', + params: { + ids, + } + }) +} + +export const add = (row) => { + return request({ + url: '/api/logpm-factory/snm/stationlinenum/submit', + method: 'post', + data: row + }) +} + +export const update = (row) => { + return request({ + url: '/api/logpm-factory/snm/stationlinenum/submit', + method: 'post', + data: row + }) +} + diff --git a/src/config/website.js b/src/config/website.js index 7563ced..33ad207 100644 --- a/src/config/website.js +++ b/src/config/website.js @@ -2,10 +2,10 @@ * 全局配置文件 */ export default { - title: "saber", + title: "", logo: "S", key: 'saber',//配置主键,目前用于存储 - indexTitle: 'Saber Admin', + indexTitle: '货无忧', clientId: 'saber', // 客户端id clientSecret: 'saber_secret', // 客户端密钥 tenantMode: true, // 是否开启租户模式 @@ -45,7 +45,7 @@ export default { // 报表设计器地址(cloud端口为8108,boot端口为80) reportUrl: 'http://localhost:8108/ureport', // 单点登录系统认证(blade-auth服务的地) - ssoUrl: 'http://localhost:8100/oauth/authorize?client_id=saber&response_type=code&redirect_uri=', + ssoUrl: 'http://192.168.1.101:8100/oauth/authorize?client_id=saber&response_type=code&redirect_uri=', // 单点登录回调地址(Saber服务的地址) redirectUri: 'http://localhost:1888', } diff --git a/src/const/factory/snm/orderLog.js b/src/const/factory/snm/orderLog.js new file mode 100644 index 0000000..cf28878 --- /dev/null +++ b/src/const/factory/snm/orderLog.js @@ -0,0 +1,64 @@ +export default { + height:'auto', + calcHeight: 30, + tip: false, + searchShow: true, + searchMenuSpan: 6, + border: true, + index: true, + viewBtn: true, + selection: true, + dialogClickModal: false, + column: [ + { + label: "主键", + prop: "id", + type: "input", + }, + { + label: "请求参数", + prop: "reqArgs", + type: "input", + }, + { + label: "相应内容", + prop: "resBody", + type: "input", + }, + { + label: "创建人", + prop: "createdUser", + type: "input", + }, + { + label: "创建时间", + prop: "createdTime", + type: "input", + }, + { + label: "更新人", + prop: "updatedUser", + type: "input", + }, + { + label: "更新时间", + prop: "updatedTime", + type: "input", + }, + { + label: "状态", + prop: "status", + type: "input", + }, + { + label: "是否已删除", + prop: "isDeleted", + type: "input", + }, + { + label: "创建部门", + prop: "createdDept", + type: "input", + }, + ] +} diff --git a/src/const/factory/snm/staorderPackages.js b/src/const/factory/snm/staorderPackages.js new file mode 100644 index 0000000..0a4f206 --- /dev/null +++ b/src/const/factory/snm/staorderPackages.js @@ -0,0 +1,89 @@ +export default { + height:'auto', + calcHeight: 30, + tip: false, + searchShow: true, + searchMenuSpan: 6, + border: true, + index: true, + viewBtn: true, + selection: true, + menuWidth: 300, + column: [ + { + label: "主键", + prop: "id", + type: "input", + }, + { + label: "订单id", + prop: "orderId", + type: "input", + }, + { + label: "包件号", + prop: "packagenum", + type: "input", + }, + { + label: "包件类型", + prop: "lx", + type: "input", + }, + { + label: "派车单号", + prop: "tcWlb001", + type: "input", + }, + { + label: "分包标识", + prop: "tcWld011", + type: "input", + }, + { + label: "客户订单号", + prop: "tcPoa014", + type: "input", + }, + { + label: "客户订单号?", + prop: "tcPoa046", + type: "input", + }, + { + label: "创建人", + prop: "createdUser", + type: "input", + }, + { + label: "创建时间", + prop: "createdTime", + type: "input", + }, + { + label: "更新人", + prop: "updatedUser", + type: "input", + }, + { + label: "更新时间", + prop: "updatedTime", + type: "input", + }, + { + label: "状态", + prop: "status", + type: "input", + }, + { + label: "创建部门", + prop: "createdDept", + type: "input", + }, + { + label: "是否已删除", + prop: "isDeleted", + type: "input", + }, + ] +} diff --git a/src/const/factory/snm/stationOrder.js b/src/const/factory/snm/stationOrder.js new file mode 100644 index 0000000..0d9b773 --- /dev/null +++ b/src/const/factory/snm/stationOrder.js @@ -0,0 +1,170 @@ +export default { + height:'auto', + calcHeight: 30, + tip: false, + searchShow: true, + searchMenuSpan: 6, + border: true, + index: true, + viewBtn: true, + selection: true, + menuWidth: 300, + column: [ + { + label: "主键", + prop: "id", + type: "input", + search: true, + }, + { + label: "派车单", + prop: "tcWla001", + type: "input", + }, + { + label: "产地", + prop: "tcPoa061", + type: "input", + }, + { + label: "线路编码", + prop: "tcWla005", + type: "input", + }, + { + label: "线路名称", + prop: "tcCmb003", + type: "input", + }, + { + label: "物流公司编码", + prop: "tcWlb006", + type: "input", + }, + { + label: "物流公司名称", + prop: "tcBmb003", + type: "input", + }, + { + label: "货运站编码", + prop: "tcWlb005", + type: "input", + }, + { + label: "货运站编码名称", + prop: "tcDmb003", + type: "input", + }, + { + label: "派车时间", + prop: "tcWla002", + type: "input", + }, + { + label: "客户单号", + prop: "tcWlb008", + type: "input", + }, + { + label: "系统单号", + prop: "tcWlb007", + type: "input", + }, + { + label: "出货总包数", + prop: "tcWlb009", + type: "input", + }, + { + label: "柜体包数", + prop: "tcWlb019", + type: "input", + }, + { + label: "五金包数", + prop: "tcWlb020", + type: "input", + }, + { + label: "背板包数", + prop: "tcWlb021", + type: "input", + }, + { + label: "背板2包数", + prop: "tcWlb035", + type: "input", + }, + { + label: "门包数", + prop: "tcWlb022", + type: "input", + }, + { + label: "特排包数", + prop: "tcWlb033", + type: "input", + }, + { + label: "标抽包数", + prop: "tcWlb034", + type: "input", + }, + { + label: "分批出货类别", + prop: "tcWlb037", + type: "input", + }, + { + label: "门店名称", + prop: "occ02", + type: "input", + }, + { + label: "收货人", + prop: "tcWlb010", + type: "input", + }, + { + label: "收货人手机号", + prop: "tcWlb011", + type: "input", + }, + { + label: "状态", + prop: "status", + type: "input", + }, + { + label: "是否已删除", + prop: "isDeleted", + type: "input", + }, + { + label: "创建部门", + prop: "createdDept", + type: "input", + }, + { + label: "更新时间", + prop: "updatedTime", + type: "input", + }, + { + label: "更新人", + prop: "updatedUser", + type: "input", + }, + { + label: "创建时间", + prop: "createdTime", + type: "input", + }, + { + label: "创建人", + prop: "createdUser", + type: "input", + }, + ] +} diff --git a/src/const/factory/snm/stationlinenum.js b/src/const/factory/snm/stationlinenum.js new file mode 100644 index 0000000..310908c --- /dev/null +++ b/src/const/factory/snm/stationlinenum.js @@ -0,0 +1,76 @@ + +export default { + height:'auto', + calcHeight: 30, + tip: false, + searchShow: true, + searchMenuSpan: 6, + border: true, + index: true, + viewBtn: true, + selection: true, + dialogClickModal: false, + column: [ + { + label: "主键", + prop: "id", + type: "input", + addDisplay:false,//表单编辑是否可见 + + }, + { + label: "线路编号", + prop: "logisticsLineNumber", + type: "input", + search: true, + }, + { + label: "线路名称", + prop: "logisticsLineName", + type: "input", + search: true, + }, + { + label: "创建人", + prop: "createdUser", + type: "input", + addDisplay:false,//表单编辑是否可见 + }, + { + label: "创建时间", + prop: "createdTime", + type: "input", + addDisplay:false,//表单编辑是否可见 + }, + { + label: "更新人", + prop: "updatedUser", + type: "input", + addDisplay:false,//表单编辑是否可见 + }, + { + label: "更新时间", + prop: "updatedTime", + type: "input", + addDisplay:false,//表单编辑是否可见 + }, + { + label: "状态", + prop: "status", + type: "input", + addDisplay:false,//表单编辑是否可见 + }, + { + label: "是否已删除", + prop: "isDeleted", + type: "input", + addDisplay:false,//表单编辑是否可见 + }, + { + label: "创建部门", + prop: "createdDept", + type: "input", + addDisplay:false,//表单编辑是否可见 + }, + ] +} diff --git a/src/lang/zh.js b/src/lang/zh.js index 306ed2c..35bb18f 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -78,7 +78,7 @@ export default { }, login: { title: '登录 ', - info: 'BladeX 企业级开发平台', + info: '货无忧物流管理平台', tenantId: '请输入租户ID', username: '请输入账号', password: '请输入密码', diff --git a/src/page/login/index.vue b/src/page/login/index.vue index ddb6e42..0ed2944 100644 --- a/src/page/login/index.vue +++ b/src/page/login/index.vue @@ -9,7 +9,7 @@ {{time}}

{{ $t('login.info') }}

-
+
@@ -42,10 +42,10 @@
- {{ $t('login.userLogin') }} + - {{ $t('login.thirdLogin') }} - {{ $t('login.ssoLogin') }} + +
diff --git a/src/views/factory/snm/orderLog.vue b/src/views/factory/snm/orderLog.vue new file mode 100644 index 0000000..58406e5 --- /dev/null +++ b/src/views/factory/snm/orderLog.vue @@ -0,0 +1,188 @@ + + + + + diff --git a/src/views/factory/snm/stationOrder.vue b/src/views/factory/snm/stationOrder.vue new file mode 100644 index 0000000..965bf5a --- /dev/null +++ b/src/views/factory/snm/stationOrder.vue @@ -0,0 +1,371 @@ + + + + + diff --git a/src/views/factory/snm/stationlinenum.vue b/src/views/factory/snm/stationlinenum.vue new file mode 100644 index 0000000..5aef259 --- /dev/null +++ b/src/views/factory/snm/stationlinenum.vue @@ -0,0 +1,188 @@ + + + + + diff --git a/vue.config.js b/vue.config.js index a3ad8ef..8476b50 100644 --- a/vue.config.js +++ b/vue.config.js @@ -26,9 +26,9 @@ module.exports = { proxy: { '/api': { //本地服务接口地址 - target: 'http://localhost', + target: 'http://localhost:8888', //远程演示服务地址,可用于直接启动项目 - //target: 'https://saber.bladex.vip/api', + // target: 'https://saber.bladex.vip/api', ws: true, pathRewrite: { '^/api': '/'