diff --git a/src/api/jarvis/goofish.js b/src/api/jarvis/goofish.js new file mode 100644 index 0000000..0df5558 --- /dev/null +++ b/src/api/jarvis/goofish.js @@ -0,0 +1,76 @@ +import request from '@/utils/request' + +/* ---------- 闲管家应用配置 ---------- */ +export function listErpOpenConfig(query) { + return request({ url: '/jarvis/erpOpenConfig/list', method: 'get', params: query }) +} + +export function getErpOpenConfig(id) { + return request({ url: '/jarvis/erpOpenConfig/' + id, method: 'get' }) +} + +export function addErpOpenConfig(data) { + return request({ url: '/jarvis/erpOpenConfig', method: 'post', data }) +} + +export function updateErpOpenConfig(data) { + return request({ url: '/jarvis/erpOpenConfig', method: 'put', data }) +} + +export function delErpOpenConfig(ids) { + return request({ url: '/jarvis/erpOpenConfig/' + ids, method: 'delete' }) +} + +/** 闲管家「查询快递公司」（与 Apifox 一致：服务端 POST {} + 签名） */ +export function listGoofishExpressCompanies(appKey) { + return request({ + url: '/jarvis/erpOpenConfig/expressCompanies', + method: 'get', + params: appKey ? { appKey } : {} + }) +} + +/* ---------- 闲管家订单 ---------- */ +export function listGoofishOrder(query) { + return request({ url: '/jarvis/erpGoofishOrder/list', method: 'get', params: query }) +} + +export function getGoofishOrder(id) { + return request({ url: '/jarvis/erpGoofishOrder/' + id, method: 'get' }) +} + +export function pullGoofishOrders(appKey, hours) { + return request({ + url: '/jarvis/erpGoofishOrder/pull/' + encodeURIComponent(appKey), + method: 'post', + params: hours != null ? { hours } : {} + }) +} + +export function pullAllGoofishOrders(hours) { + return request({ + url: '/jarvis/erpGoofishOrder/pullAll', + method: 'post', + params: hours != null ? { hours } : {} + }) +} + +/** 历史全量：按服务端 pull-full-history-days + 时间分段拉 update_time */ +export function pullGoofishOrdersFull(appKey) { + return request({ + url: '/jarvis/erpGoofishOrder/pull/' + encodeURIComponent(appKey) + '/full', + method: 'post' + }) +} + +export function pullAllGoofishOrdersFull() { + return request({ url: '/jarvis/erpGoofishOrder/pullAll/full', method: 'post' }) +} + +export function refreshGoofishDetail(id) { + return request({ url: '/jarvis/erpGoofishOrder/refreshDetail/' + id, method: 'post' }) +} + +export function retryGoofishShip(id) { + return request({ url: '/jarvis/erpGoofishOrder/retryShip/' + id, method: 'post' }) +} diff --git a/src/views/system/goofish/erpGoofishOrder/index.vue b/src/views/system/goofish/erpGoofishOrder/index.vue new file mode 100644 index 0000000..c78407b --- /dev/null +++ b/src/views/system/goofish/erpGoofishOrder/index.vue @@ -0,0 +1,466 @@ + + + + + diff --git a/src/views/system/goofish/erpOpenConfig/index.vue b/src/views/system/goofish/erpOpenConfig/index.vue new file mode 100644 index 0000000..604dc56 --- /dev/null +++ b/src/views/system/goofish/erpOpenConfig/index.vue @@ -0,0 +1,227 @@ + + + diff --git a/src/views/system/jd-instruction/fadan-quick-record.vue b/src/views/system/jd-instruction/fadan-quick-record.vue index 38a420c..42630d1 100644 --- a/src/views/system/jd-instruction/fadan-quick-record.vue +++ b/src/views/system/jd-instruction/fadan-quick-record.vue @@ -134,11 +134,11 @@ export default { } return 'F-' + s }, - /** 地址压成一行：换行/多空格合并为单空格，去掉中文逗号 */ + /** 地址压成一行：换行/多空格合并为单空格，去掉中英文逗号 */ compressAddressOneLine(raw) { if (raw == null) return '' return String(raw) - .replace(/，/g, '') + .replace(/[，,]/g, '') .replace(/\s+/g, ' ') .trim() },