Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
This commit is contained in:
+3
-3
@@ -4139,11 +4139,11 @@ export default {
|
|||||||
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
|
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
|
||||||
var judgeFn = new RegExp(/\s+/g);
|
var judgeFn = new RegExp(/\s+/g);
|
||||||
if(judgeFn.test(nowstandinfo.standSort)){
|
if(judgeFn.test(nowstandinfo.standSort)){
|
||||||
nowstandinfo.standCode = nowstandinfo.standSort + "" + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear)
|
nowstandinfo.standCode = nowstandinfo.standSort + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear)
|
||||||
}else if(nowstandinfo.standSort === 'Q/QCBFC'){
|
}else if(nowstandinfo.standSort === 'Q/QCBFC'){
|
||||||
nowstandinfo.standCode = nowstandinfo.standSort + "" + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear)
|
nowstandinfo.standCode = nowstandinfo.standSort + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear)
|
||||||
}else {
|
}else {
|
||||||
nowstandinfo.standCode = nowstandinfo.standSort + " " + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear)
|
nowstandinfo.standCode = nowstandinfo.standSort + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear)
|
||||||
}
|
}
|
||||||
|
|
||||||
// if (nowstandinfo.standSort === 'Q/QCBFC'){
|
// if (nowstandinfo.standSort === 'Q/QCBFC'){
|
||||||
|
|||||||
Reference in New Issue
Block a user