合并分支 'dev_20230216' 到 'master'

Dev 20230216

查看合并请求 laws-foton-slrs/foton-laws-system-front!72
This commit is contained in:
高嵩
2023-05-06 18:02:48 +08:00
3 changed files with 4 additions and 4 deletions
@@ -2406,7 +2406,7 @@
standNature: this.form.standNature, // 标准性质
standEnName: this.form.standEnName, // 英文名称
standName: this.form.standName, // 中文名称
signFlag: '1', // 是否需要会签
signFlag: '2', // 是否需要会签
textStatus: '', // 文本状态
standYear: '', // 标准年份
// standInData: data.standInData ? data.standInData : '0', // 标准类型
@@ -2879,7 +2879,7 @@ export default {
standNumber: [
{required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'},
{type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'},
{validator: this.verify.validateStandardItem, trigger: 'change'}
{validator: this.verify.validateStandardItem2, trigger: 'change'}
],
standYear: [
{required: true, message: '标准年份不能为空', trigger: 'change'},
@@ -2434,7 +2434,7 @@ export default {
standNumber: [
{required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'},
{type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'},
{type: 'string', validator: this.verify.validateStandardItem, trigger: 'change'}
{type: 'string', validator: this.verify.validateStandardItem2, trigger: 'change'}
],
synopsis: [
{type: 'string', max: 1000, message: '文本说明不能超过1000个字符', trigger: 'change'}
@@ -2468,7 +2468,7 @@ export default {
standNumber: [
{required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'},
{type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'},
{type: 'string', validator: this.verify.validateStandardItem, trigger: 'change'}
{type: 'string', validator: this.verify.validateStandardItem2, trigger: 'change'}
],
standYear: [
// {required: true, message: '标准年份/系列不能为空', trigger: 'change'},