Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -1005,9 +1005,9 @@
|
|||||||
{ required: true, message: '请输入企标编号', trigger: 'blur' },
|
{ required: true, message: '请输入企标编号', trigger: 'blur' },
|
||||||
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
|
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
|
||||||
],
|
],
|
||||||
standYear: [
|
// standYear: [
|
||||||
{ required: true, message: '请输入标准年份'},
|
// { required: true, message: '请输入标准年份'},
|
||||||
],
|
// ],
|
||||||
standName: [
|
standName: [
|
||||||
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
|
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
|
||||||
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
|
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
|
||||||
|
|||||||
@@ -1078,9 +1078,9 @@
|
|||||||
{ required: true, message: '请输入企标编号', trigger: 'blur' },
|
{ required: true, message: '请输入企标编号', trigger: 'blur' },
|
||||||
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
|
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
|
||||||
],
|
],
|
||||||
standYear: [
|
// standYear: [
|
||||||
{ required: true, message: '请输入标准年份'},
|
// { required: true, message: '请输入标准年份'},
|
||||||
],
|
// ],
|
||||||
standName: [
|
standName: [
|
||||||
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
|
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
|
||||||
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
|
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
|
||||||
@@ -1218,7 +1218,7 @@
|
|||||||
this.formKey++
|
this.formKey++
|
||||||
this.form.standSn = this.form.standNum
|
this.form.standSn = this.form.standNum
|
||||||
this.form.standNumber = this.form.standNum
|
this.form.standNumber = this.form.standNum
|
||||||
this.form.standYear = this.year
|
this.form.standYear = year
|
||||||
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.formKey++
|
this.formKey++
|
||||||
}else if(this.form.standStatus === '1' ){
|
}else if(this.form.standStatus === '1' ){
|
||||||
|
|||||||
@@ -1005,9 +1005,9 @@
|
|||||||
{ required: true, message: '请输入企标编号', trigger: 'blur' },
|
{ required: true, message: '请输入企标编号', trigger: 'blur' },
|
||||||
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
|
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
|
||||||
],
|
],
|
||||||
standYear: [
|
// standYear: [
|
||||||
{ required: true, message: '请输入标准年份'},
|
// { required: true, message: '请输入标准年份'},
|
||||||
],
|
// ],
|
||||||
standName: [
|
standName: [
|
||||||
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
|
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
|
||||||
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
|
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
|
||||||
|
|||||||
@@ -1088,9 +1088,9 @@
|
|||||||
{ required: true, message: '请输入企标编号', trigger: 'blur' },
|
{ required: true, message: '请输入企标编号', trigger: 'blur' },
|
||||||
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
|
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
|
||||||
],
|
],
|
||||||
standYear: [
|
// standYear: [
|
||||||
{ required: true, message: '请输入标准年份'},
|
// { required: true, message: '请输入标准年份'},
|
||||||
],
|
// ],
|
||||||
standName: [
|
standName: [
|
||||||
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
|
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
|
||||||
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
|
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
|
||||||
|
|||||||
Reference in New Issue
Block a user