合并分支 'dev_20230216' 到 'master'
Dev 20230216 查看合并请求 laws-foton-slrs/foton-laws-system-front!89
This commit is contained in:
@@ -1181,6 +1181,7 @@
|
|||||||
},
|
},
|
||||||
'form.standNum': {
|
'form.standNum': {
|
||||||
handler(val) {
|
handler(val) {
|
||||||
|
this.form.standNum = this.form.standNum + ''
|
||||||
this.form.standNum = this.form.standNum.replace(/^0+/,"")
|
this.form.standNum = this.form.standNum.replace(/^0+/,"")
|
||||||
this.form.standNum = this.form.standNum.padStart(3,'0')
|
this.form.standNum = this.form.standNum.padStart(3,'0')
|
||||||
}
|
}
|
||||||
@@ -1201,7 +1202,7 @@
|
|||||||
let standSn = (obj.newStandSn / 1) + 1
|
let standSn = (obj.newStandSn / 1) + 1
|
||||||
this.form.standSn = standSn
|
this.form.standSn = standSn
|
||||||
this.form.standNumber = standSn
|
this.form.standNumber = standSn
|
||||||
this.form.standNum = standSn
|
this.form.standNum = standSn + ''
|
||||||
|
|
||||||
// this.form.standYear = this.standYear.slice(0,4)
|
// this.form.standYear = this.standYear.slice(0,4)
|
||||||
let year = new Date().getFullYear()
|
let year = new Date().getFullYear()
|
||||||
@@ -1219,6 +1220,8 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.form.standNum = this.form.standNum.replace(/^0+/,"")
|
||||||
|
this.form.standNum = this.form.standNum.padStart(3,'0')
|
||||||
this.form.standCode = this.form.standSort + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
|
this.form.standCode = this.form.standSort + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
|
||||||
}, e => {
|
}, e => {
|
||||||
})
|
})
|
||||||
@@ -1242,6 +1245,8 @@
|
|||||||
this.form.standYear = this.standYear
|
this.form.standYear = this.standYear
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
this.form.standNum = this.form.standNum.replace(/^0+/,"")
|
||||||
|
this.form.standNum = this.form.standNum.padStart(3,'0')
|
||||||
this.form.standCode = this.form.standSort + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
|
this.form.standCode = this.form.standSort + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
|
||||||
}
|
}
|
||||||
// else if(this.form.reviseStatus === '3'){
|
// else if(this.form.reviseStatus === '3'){
|
||||||
@@ -2983,6 +2988,8 @@
|
|||||||
// }else {
|
// }else {
|
||||||
// this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
|
// this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
|
||||||
// }
|
// }
|
||||||
|
this.form.standNum = this.form.standNum.replace(/^0+/,"")
|
||||||
|
this.form.standNum = this.form.standNum.padStart(3,'0')
|
||||||
|
|
||||||
this.standNum = this.form.standNum // 保存初始顺序号
|
this.standNum = this.form.standNum // 保存初始顺序号
|
||||||
this.form.standCode = this.form.standSort + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
|
this.form.standCode = this.form.standSort + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
|
||||||
@@ -3015,6 +3022,9 @@
|
|||||||
// this.standSort = noYearStand.slice(0, index2) // 'Q-F'
|
// this.standSort = noYearStand.slice(0, index2) // 'Q-F'
|
||||||
this.standSort = this.form.standSort
|
this.standSort = this.form.standSort
|
||||||
|
|
||||||
|
this.standNum = this.standNum.replace(/^0+/,"")
|
||||||
|
this.standNum = this.standNum.padStart(3,'0')
|
||||||
|
|
||||||
// this.form.standSort = this.standSort
|
// this.form.standSort = this.standSort
|
||||||
this.form.standNum = this.standNum
|
this.form.standNum = this.standNum
|
||||||
// ---
|
// ---
|
||||||
@@ -3050,7 +3060,7 @@
|
|||||||
let standSn = (obj.newStandSn / 1) + 1
|
let standSn = (obj.newStandSn / 1) + 1
|
||||||
this.form.standSn = standSn
|
this.form.standSn = standSn
|
||||||
this.form.standNumber = standSn
|
this.form.standNumber = standSn
|
||||||
this.form.standNum = standSn
|
this.form.standNum = standSn + ''
|
||||||
// this.form.standYear = this.regDate(year) // 待带入立项标准
|
// this.form.standYear = this.regDate(year) // 待带入立项标准
|
||||||
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
|
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
|
||||||
// let judgeFn = new RegExp(/\s+/g);
|
// let judgeFn = new RegExp(/\s+/g);
|
||||||
@@ -3061,6 +3071,9 @@
|
|||||||
// }else {
|
// }else {
|
||||||
// this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
|
// this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
|
||||||
// }
|
// }
|
||||||
|
this.form.standNum = this.form.standNum.replace(/^0+/,"")
|
||||||
|
this.form.standNum = this.form.standNum.padStart(3,'0')
|
||||||
|
|
||||||
this.form.standCode = this.form.standSort + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
|
this.form.standCode = this.form.standSort + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
|
||||||
this.standSort = this.form.standSort
|
this.standSort = this.form.standSort
|
||||||
this.standCode = this.form.standCode
|
this.standCode = this.form.standCode
|
||||||
|
|||||||
Reference in New Issue
Block a user