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

Merge branch 'develop' of ssh://gitlab.91isoft.com:10022/LAWS/laws-system-front-FOTON into develop

Browse Source
This commit is contained in:
zhaoxianhui
2022-07-05 11:30:21 +08:00
parent 0c86bdee23 9977a4cdb7
commit 9d4e8ce2de
7 changed files with 44 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
-1
View File
@@ -1601,7 +1601,6 @@
this.FBGBUSSName = ""
}
this.LSBBBUSSFileList=this.LSBBBUSSFileList.concat(this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName))
console.log(this.LSBBBUSSFileList)
this.form.LSBBBUSS = this.form.FBGBUSS
this.form.LSBBBUSSName = this.form.FBGBUSSName
this.FBGBUSSFileList= []
src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+1 -1
View File
@@ -2700,7 +2700,7 @@
this.formKey++
this.form.standSn = this.form.standNum
this.form.standNumber = this.form.standNum
this.form.standYear = this.regDate(year)
this.form.standYear = year
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
this.formKey++
}else if(this.form.standStatus === '1' ){
src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+4 -4
View File
@@ -1005,9 +1005,9 @@
{ required: true, message: '请输入企标编号', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
],
standYear: [
{ required: true, message: '请输入标准年份'},
],
// standYear: [
// { required: true, message: '请输入标准年份'},
// ],
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
@@ -1140,7 +1140,7 @@
this.formKey++
this.form.standSn = this.form.standNum
this.form.standNumber = this.form.standNum
this.form.standYear = this.regDate(year)
this.form.standYear = year
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
this.formKey++
}else if(this.form.standStatus === '1' ){
src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+4 -4
View File
@@ -1078,9 +1078,9 @@
{ required: true, message: '请输入企标编号', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
],
standYear: [
{ required: true, message: '请输入标准年份'},
],
// standYear: [
// { required: true, message: '请输入标准年份'},
// ],
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
@@ -1218,7 +1218,7 @@
this.formKey++
this.form.standSn = this.form.standNum
this.form.standNumber = this.form.standNum
this.form.standYear = this.regDate(year)
this.form.standYear = year
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
this.formKey++
}else if(this.form.standStatus === '1' ){
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+4 -4
View File
@@ -1005,9 +1005,9 @@
{ required: true, message: '请输入企标编号', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
],
standYear: [
{ required: true, message: '请输入标准年份'},
],
// standYear: [
// { required: true, message: '请输入标准年份'},
// ],
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
@@ -1140,7 +1140,7 @@
this.formKey++
this.form.standSn = this.form.standNum
this.form.standNumber = this.form.standNum
this.form.standYear = this.regDate(year)
this.form.standYear = year
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
this.formKey++
}else if(this.form.standStatus === '1' ){
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+4 -4
View File
@@ -1088,9 +1088,9 @@
{ required: true, message: '请输入企标编号', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
],
standYear: [
{ required: true, message: '请输入标准年份'},
],
// standYear: [
// { required: true, message: '请输入标准年份'},
// ],
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
@@ -1228,7 +1228,7 @@
this.formKey++
this.form.standSn = this.form.standNum
this.form.standNumber = this.form.standNum
this.form.standYear = this.regDate(year)
this.form.standYear = year
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
this.formKey++
}else if(this.form.standStatus === '1' ){