FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
zyx.net
2022-10-12 14:00:52 +08:00
parent 24f527fb73 51d1acc5d3
commit e3c1c8c8e4
13 changed files with 165 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/generationNumber/index.vue
+16 -3
View File
@@ -166,9 +166,22 @@ export default {
// 拼接企标编号
let verNum = generationNumberForm.versionNumber.replace(/[^0-9]/ig,"");
let verEn= generationNumberForm.versionNumber.replace(/[^A-Z]+/ig,"");
let standCode = generationNumberForm.standCode + ' ' + generationNumberForm.standAttribute + ' ' +
generationNumberForm.classificationNumber + ' ' + generationNumberForm.sequenceNumber + '-' +
this.$moment(generationNumberForm.year).format('YYYY') + '（' + generationNumberForm.versionNumber + '）'
// 此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
let judgeFn = new RegExp(/\s+/g);
let standCode = ''
if(judgeFn.test(generationNumberForm.standSort)){
standCode = generationNumberForm.standCode + ' ' + generationNumberForm.standAttribute + ' ' +
generationNumberForm.classificationNumber + ' ' + generationNumberForm.sequenceNumber + '-' +
this.$moment(generationNumberForm.year).format('YYYY') + '（' + generationNumberForm.versionNumber + '）'
}else if(generationNumberForm.standSort === 'Q/QCBFC'){
standCode = generationNumberForm.standCode + '' + generationNumberForm.standAttribute + ' ' +
generationNumberForm.classificationNumber + ' ' + generationNumberForm.sequenceNumber + '-' +
this.$moment(generationNumberForm.year).format('YYYY') + '（' + generationNumberForm.versionNumber + '）'
}else {
standCode = generationNumberForm.standCode + ' ' + generationNumberForm.standAttribute + ' ' +
generationNumberForm.classificationNumber + ' ' + generationNumberForm.sequenceNumber + '-' +
this.$moment(generationNumberForm.year).format('YYYY') + '（' + generationNumberForm.versionNumber + '）'
}
this.$emit('isOk', standCode, {
standCode: standCode,
qbCode: this.generationNumberForm.standAttribute, // 标准属性
src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+9 -1
View File
@@ -2115,7 +2115,15 @@
this.form.standSn = this.form.standNum
this.form.standNumber = this.form.standNum
this.form.standYear = this.regDate(year)
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
let judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else {
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
this.getStandInfoByReviseStatus()
}else {
this.form.standStatus = "3"
src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+27 -3
View File
@@ -620,7 +620,15 @@
this.form.standSn = this.form.standNum
this.form.standNumber = this.form.standNum
this.form.standYear = year // 待带入立项标准
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
// 此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
var judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(nowstandinfo.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else {
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
}else {
callback(new Error('企标顺序号已存在或已锁定'))
}
@@ -2711,7 +2719,15 @@
this.form.standSn = this.form.standNum
this.form.standNumber = this.form.standNum
this.form.standYear = year
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
let judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else {
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
this.formKey++
}else if(this.form.standStatus === '1' ){
this.form.id = ""
@@ -2729,7 +2745,15 @@
this.form.standNum = standSn
this.form.standNumber = standSn
this.form.standYear = year // 待带入立项标准
this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
let judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else {
this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
if(type === '1'){
this.isSubmit = false
this.saveLoading = false
src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+9 -1
View File
@@ -1141,7 +1141,15 @@
this.form.standSn = this.form.standNum
this.form.standNumber = this.form.standNum
this.form.standYear = year
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
var judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else {
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
this.formKey++
}else if(this.form.standStatus === '1' ){
this.form.id = ""
src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+9 -1
View File
@@ -1219,7 +1219,15 @@
this.form.standSn = this.form.standNum
this.form.standNumber = this.form.standNum
this.form.standYear = year
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
var judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else {
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
this.formKey++
}else if(this.form.standStatus === '1' ){
this.form.id = ""
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+9 -1
View File
@@ -1141,7 +1141,15 @@
this.form.standSn = this.form.standNum
this.form.standNumber = this.form.standNum
this.form.standYear = year
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
var judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else {
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
this.formKey++
}else if(this.form.standStatus === '1' ){
this.form.id = ""
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+9 -1
View File
@@ -1229,7 +1229,15 @@
this.form.standSn = this.form.standNum
this.form.standNumber = this.form.standNum
this.form.standYear = year
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
var judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else {
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
this.formKey++
}else if(this.form.standStatus === '1' ){
this.form.id = ""
src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
+8 -9
View File
@@ -968,7 +968,6 @@ export default {
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
this.$emit('emitDataLoading',false)
}
},
@@ -986,15 +985,15 @@ export default {
mounted () {
if(this.formSub && this.formSub.standSort && this.formSub.standSort !== ''){
this.getDataAsync()
this.form = this.formSub
this.form = JSON.parse(JSON.stringify(this.formSub))
console.log(this.QTWJBUSSFileListSub)
this.FBGBUSSFileList= this.FBGBUSSFileListSub
this.BZSMBUSSFileList= this.BZSMBUSSFileListSub
this.LSBBBUSSFileList= this.LSBBBUSSFileListSub
this.QTWJBUSSFileList= this.QTWJBUSSFileListSub
this.GLWJBUSSFileList= this.GLWJBUSSFileListSub
this.summaryFileList= this.summaryFileListSub
this.madelSubList= this.madelSubListSub
this.FBGBUSSFileList= this.FBGBUSSFileListSub?JSON.parse(JSON.stringify(this.FBGBUSSFileListSub)):[]
this.LSBBBUSSFileList= this.LSBBBUSSFileListSub?JSON.parse(JSON.stringify(this.LSBBBUSSFileListSub)):[]
this.BZSMBUSSFileList=this.BZSMBUSSFileListSub?JSON.parse(JSON.stringify(this.BZSMBUSSFileListSub)):[]
this.QTWJBUSSFileList= this.QTWJBUSSFileListSub?JSON.parse(JSON.stringify(this.QTWJBUSSFileListSub)):[]
this.GLWJBUSSFileList= this.GLWJBUSSFileListSub?JSON.parse(JSON.stringify(this.GLWJBUSSFileListSub)):[]
this.summaryFileList= this.summaryFileListSub?JSON.parse(JSON.stringify(this.summaryFileListSub)):[]
this.madelSubList= this.madelSubListSub?JSON.parse(JSON.stringify(this.madelSubListSub)):[]
}
},
watch: {
src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+18 -2
View File
@@ -2678,7 +2678,15 @@
this.form.standSn = this.form.standNum
this.form.standNumber = this.form.standNum
this.form.standYear = this.regDate(year)
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
// 此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
let judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else {
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
}else {
this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus}, {
_this: this
@@ -2688,7 +2696,15 @@
this.form.standSn = standSn
this.form.standNumber = standSn
this.form.standYear = year // 待带入立项标准
this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
// 此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
let judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else {
this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
}, e => {
})
}
src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+27 -3
View File
@@ -665,7 +665,15 @@
this.form.standSn = this.form.standNum
this.form.standNumber = this.form.standNum
this.form.standYear = this.regDate(year) // 待带入立项标准
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
let judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + "" + this.form.standNumber + (this.form.standYear === '' ? '' : '-' + this.form.standYear)
}else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + "" + this.form.standNumber + (this.form.standYear === '' ? '' : '-' + this.form.standYear)
}else {
this.form.standCode = this.form.standSort + " " + this.form.standNumber + (this.form.standYear === '' ? '' : '-' + this.form.standYear)
}
}else {
callback(new Error('企标顺序号已存在或已锁定'))
}
@@ -2782,7 +2790,15 @@
this.form.standSn = this.form.standNum
this.form.standNumber = this.form.standNum
this.form.standYear = this.regDate(year)
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
// 此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
let judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else {
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
this.formKey++
}else {
this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus,standSort:this.form.standSort,taskId: this.taskIds}, {
@@ -2794,7 +2810,15 @@
this.form.standNumber = standSn
this.form.standNum = standSn
this.form.standYear = this.regDate(year) // 待带入立项标准
this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
let judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else {
this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
this.formKey++
}, e => {
})
src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+1 -1
View File
@@ -1458,7 +1458,7 @@
}else {
const nowTime = new Date().getTime()
// window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
this.iframeUrl = kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl));
this.iframeUrl = kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))+'&office.preview.type=pdf';
}
this.iframeLoading = false
this.$forceUpdate()
src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
+21 -5
View File
@@ -1171,9 +1171,9 @@
QCRBUSS: [
{ required: true, message: '请选择起草人', trigger: 'change' }
],
DTQBBHBUSS: [
{ required: true, message: '请选择代替企标编号', trigger: 'change' }
],
// DTQBBHBUSS: [
// { required: true, message: '请选择代替企标编号', trigger: 'change' }
// ],
},
zrUserIds: [], // 选择多个会签责任人
userType:'', // 选择用户ID判断
@@ -2944,7 +2944,15 @@
this.form.standSn = this.form.standNum
this.form.standNumber = this.form.standNum
this.form.standYear = this.regDate(year)
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
let judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else {
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
}else {
this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus}, {
_this: this
@@ -2954,7 +2962,15 @@
this.form.standSn = standSn
this.form.standNumber = standSn
this.form.standYear = year // 待带入立项标准
this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
let judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else {
this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
}, e => {
})
}
src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+2 -3
View File
@@ -50,8 +50,7 @@
ref="selection"
tooltip-effect="dark"
style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:auto;border-bottom: 1px solid #EBEEF5;"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',fontWeight: 'bold', height: '48px'}"
:data="form.fileModelList"
border
default-expand-all>
@@ -802,7 +801,7 @@
// 任务分解单数据
taskTableData: []
},
tablePHeight:'',
tablePHeight:'auto',
tableHeight: {
standardTableHeight: null
},