Commit ccece561 by zhuzhequan

Merge branch 'dev' into 'master'

Dev

See merge request !81
parents 9130dab9 92946f6f
...@@ -616,13 +616,13 @@ const trackcodeInput = async () => { ...@@ -616,13 +616,13 @@ const trackcodeInput = async () => {
await setData(orderNumber) await setData(orderNumber)
} }
// AAAB_60527128-9_1_JMSC250121017 新版示例 // AAAB_60527128-9_1_JMSC250121017 新版示例
const regex = /^[A-Z]{4}_/ //是否以四个大写字母加下划线开头 // const regex = /^[A-Z]{4}_/ //是否以四个大写字母加下划线开头
if (regex.test(orderNumber)) { // if (regex.test(orderNumber)) {
orderNumber = // orderNumber =
orderNumber.split('_')[0] + // orderNumber.split('_')[0] +
'-' + // '-' +
orderNumber.split('_')[orderNumber.split('_').length - 1] // orderNumber.split('_')[orderNumber.split('_').length - 1]
} // }
try { try {
const res = await getSubOrderBySubOrderNumber(orderNumber) const res = await getSubOrderBySubOrderNumber(orderNumber)
if (!res.data) { if (!res.data) {
......
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