diff --git a/core/request/apis.js b/core/request/apis.js index 57dac6e..97622ea 100644 --- a/core/request/apis.js +++ b/core/request/apis.js @@ -476,6 +476,12 @@ export default { method: "POST", isSystemApi: true }, + interceptScan: { + path: "order.recheckOrder.interceptScan", + auth: true, + method: "POST", + isSystemApi: true + }, confirmIntercept: { path: "order.recheckOrder.confirmIntercept", auth: true, @@ -539,5 +545,14 @@ export default { isSystemApi: true } } + }, + /** 退件登记 ↓ **/ + returnReceived: { + create: { + path: "returnReceived.create", + auth: true, + method: "POST", + isSystemApi: true + } } }; \ No newline at end of file diff --git a/env.js b/env.js index b87b72a..c33f58a 100644 --- a/env.js +++ b/env.js @@ -1,4 +1,4 @@ -export const BASE_URL = 'http://qimen.wms.gztbyc.com' //生产环境接口地址 -// export const BASE_URL = 'http://192.168.11.56:6060' //开发环境接口地址 +// export const BASE_URL = 'http://qimen.wms.gztbyc.com' //生产环境接口地址 +export const BASE_URL = 'http://192.168.11.56:6060' //开发环境接口地址 export const API_URL = `${BASE_URL}/system` //后台接口域名 export const IMG_URL = 'https://ye4s.file.gzxunren.com' //全局网络图片地址变量,css背景图片地址变量在uni.scss diff --git a/pages.json b/pages.json index 7b5e532..6c59bea 100644 --- a/pages.json +++ b/pages.json @@ -230,6 +230,13 @@ "titleNView": false } }, + { + "path" : "pages/work/order/interceptionLog", + "style" : + { + "titleNView": false + } + }, { "path" : "pages/work/order/bindPkgMat", "style" : @@ -237,6 +244,13 @@ "titleNView": false } }, + { + "path" : "pages/work/order/returnRecord", + "style" : + { + "titleNView": false + } + }, { "path" : "pages/packing/labelReprint", "style" : diff --git a/pages/home/edit-quick-actions.vue b/pages/home/edit-quick-actions.vue index 7697b45..7517df4 100644 --- a/pages/home/edit-quick-actions.vue +++ b/pages/home/edit-quick-actions.vue @@ -319,6 +319,7 @@ const isScatterReviewShipping = menuName === '散单复核发货' || menuName === '订单复核' || (menuName.includes('散单') && menuName.includes('复核') && menuName.includes('发货')); const isGrouponPickingDetail = menuName === '团购拣货详情' || (menuName.includes('团购') && menuName.includes('拣货') && menuName.includes('详情')); const isLabelReprint = menuName === '面单补打' || (menuName.includes('面单') && menuName.includes('补打')); + const isBlockRegistration = menuName === '拦截登记'; const rawPath = item?.component || item?.path || ''; const normalizedPath = rawPath ? (rawPath.startsWith('/') ? rawPath : `/${rawPath}`) : ''; const isRandomStorage = menuName === '随机入库' || (menuName.includes('随机') && menuName.includes('入库')); @@ -347,7 +348,9 @@ ? '/pages/work/order/order-review' : (isGrouponPickingDetail ? '/pages/work/order/groupon-picking-detail' - : (isLabelReprint ? '/pages/packing/labelReprint' : normalizedPath)))))); + : (isLabelReprint + ? '/pages/packing/labelReprint' + : (isBlockRegistration ? '/pages/work/order/interceptionLog' : normalizedPath))))))); if (!targetPath) { uni.showToast({ diff --git a/pages/index/index.vue b/pages/index/index.vue index c835653..b40e101 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1189,6 +1189,7 @@ const isScatterReviewShipping = menuName === '散单复核发货' || menuName === '订单复核' || (menuName.includes('散单') && menuName.includes('复核') && menuName.includes('发货')); const isGrouponPickingDetail = menuName === '团购拣货详情' || (menuName.includes('团购') && menuName.includes('拣货') && menuName.includes('详情')); const isLabelReprint = menuName === '面单补打' || (menuName.includes('面单') && menuName.includes('补打')); + const isBlockRegistration = menuName === '拦截登记'; const rawPath = item?.component || item?.path || ''; const normalizedPath = rawPath ? (rawPath.startsWith('/') ? rawPath : `/${rawPath}`) : ''; const isRandomStorage = menuName === '随机入库' || (menuName.includes('随机') && menuName.includes('入库')); @@ -1219,7 +1220,9 @@ ? '/pages/work/order/scatter-picking-detail' : (isGrouponPickingDetail ? '/pages/work/order/groupon-picking-detail' - : (isLabelReprint ? '/pages/packing/labelReprint' : normalizedPath))))))); + : (isLabelReprint + ? '/pages/packing/labelReprint' + : (isBlockRegistration ? '/pages/work/order/interceptionLog' : normalizedPath)))))))); if (!targetPath) { uni.showToast({ diff --git a/pages/work/order/interceptionLog.vue b/pages/work/order/interceptionLog.vue new file mode 100644 index 0000000..a55b1a2 --- /dev/null +++ b/pages/work/order/interceptionLog.vue @@ -0,0 +1,306 @@ + + + + + diff --git a/pages/work/order/returnRecord.vue b/pages/work/order/returnRecord.vue new file mode 100644 index 0000000..9ec7dc0 --- /dev/null +++ b/pages/work/order/returnRecord.vue @@ -0,0 +1,374 @@ + + + + +