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:
yanyizhou
2021-11-17 15:05:23 +08:00
parent 4105514d45 4bf1400a35
commit 9139d4665e
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+8 -8
View File
@@ -16,7 +16,7 @@
class="label-input-form" class="label-input-form"
label-width="210px" label-width="210px"
> >
<div style="flex: auto; overflow: auto;" v-show="active === '1'"> <div style="flex: auto;" v-show="active === '1'">
<ProcessTitle> <ProcessTitle>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
</ProcessTitle> </ProcessTitle>
@@ -49,14 +49,14 @@
<el-radio label="2">否</el-radio> <el-radio label="2">否</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item v-show="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled"> <el-form-item v-if="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
<el-input <el-input
v-model.number="form.standYear" v-model.number="form.standYear"
placeholder="请输入标准标准年份" placeholder="请输入标准标准年份"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-show="verifySarStandard" label="文本状态" prop="textStatus" class="add-form-item form-item-disabled"> <el-form-item v-if="verifySarStandard" label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.textStatus" placeholder="请选择文本状态"> <el-select :popper-append-to-body="false" v-model="form.textStatus" placeholder="请选择文本状态">
<el-option <el-option
v-for="item in standStateOptions" v-for="item in standStateOptions"
@@ -67,7 +67,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-show="verifySarStandard" label="标准发布日期" prop="issueTime" class="add-form-item form-item-disabled"> <el-form-item v-if="verifySarStandard" label="标准发布日期" prop="issueTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
v-model="form.issueTime" v-model="form.issueTime"
type="date" type="date"
@@ -126,13 +126,13 @@
根据类别、编号、中英文名称查询 根据类别、编号、中英文名称查询
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item v-show="verifySarStandard" label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled"> <el-form-item v-if="verifySarStandard" label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.isRelateAccess"> <el-radio-group v-model="form.isRelateAccess">
<el-radio label="1">是</el-radio> <el-radio label="1">是</el-radio>
<el-radio label="2">否</el-radio> <el-radio label="2">否</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item v-show="verifySarStandard && form.standInData === '0' " label="标准体系" prop="standSystem" class="add-form-item form-item-disabled"> <el-form-item v-if="verifySarStandard && form.standInData === '0' " label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<el-input v-model="form.standSystem" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input> <el-input v-model="form.standSystem" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
<tree-select-new <tree-select-new
:key="key" :key="key"
@@ -145,7 +145,7 @@
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new> :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
</el-form-item> </el-form-item>
<el-form-item v-show="verifySarStandard && form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled"> <el-form-item v-if="verifySarStandard && form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="form.gxhbq" v-model="form.gxhbq"
placeholder="请输入标签" placeholder="请输入标签"
@@ -1496,7 +1496,7 @@
] ]
, ,
issueTime: [ issueTime: [
{ required: true, message: '请选择标准发布日期', trigger: 'change' } { required: false, message: '请选择标准发布日期', trigger: 'change' }
], ],
qcdw: [ qcdw: [
{ required: true, message: '请选择起草单位', validator: validateQcdw, trigger: 'change' } { required: true, message: '请选择起草单位', validator: validateQcdw, trigger: 'change' }
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+1 -1
View File
@@ -1474,7 +1474,7 @@ export default {
{ required: true, message: '请选择文本状态', trigger: 'change' } { required: true, message: '请选择文本状态', trigger: 'change' }
], ],
issueTime: [ issueTime: [
{ required: true, message: '请选择标准发布日期', trigger: 'change' } { required: false, message: '请选择标准发布日期', trigger: 'change' }
], ],
qcdw: [ qcdw: [
{ required: true, message: '请选择起草单位', trigger: 'change' } { required: true, message: '请选择起草单位', trigger: 'change' }
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+2 -2
View File
@@ -2358,7 +2358,7 @@ export default {
{type: 'string', max: 500, message: '文本说明要不能超过500个字符', trigger: 'blur'} {type: 'string', max: 500, message: '文本说明要不能超过500个字符', trigger: 'blur'}
], ],
issueTime: [ issueTime: [
{required: true, message: '发布日期不能为空', trigger: 'change'} {required: false, message: '发布日期不能为空', trigger: 'change'}
] ]
}, },
// 代替标准号 // 代替标准号
@@ -4934,7 +4934,7 @@ export default {
rules[item.attrField] = rule rules[item.attrField] = rule
} }
}) })
rules.issueTime = [{required: true, message: '发布日期不能为空', trigger: 'change'}] rules.issueTime = [{required: false, message: '发布日期不能为空', trigger: 'change'}]
// this.rules = rules // this.rules = rules
// rules.standState = [{required: true, message: '标准状态不能为空', trigger: 'change'}] // rules.standState = [{required: true, message: '标准状态不能为空', trigger: 'change'}]
this.$set(this, 'sarStandardsInfoRules', rules) this.$set(this, 'sarStandardsInfoRules', rules)
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+3 -3
View File
@@ -2151,7 +2151,7 @@ export default {
{required: false, message: '重要度不能为空', trigger: 'change'} {required: false, message: '重要度不能为空', trigger: 'change'}
], ],
issueTime: [ issueTime: [
{required: true, message: '发布日期不能为空', trigger: 'change'} {required: false, message: '发布日期不能为空', trigger: 'change'}
] ]
}, },
sarStandardsInfoRules: { sarStandardsInfoRules: {
@@ -2180,7 +2180,7 @@ export default {
{type: 'string', max: 1000, message: '文本说明不能超过1000个字符', trigger: 'change'} {type: 'string', max: 1000, message: '文本说明不能超过1000个字符', trigger: 'change'}
], ],
issueTime: [ issueTime: [
{required: true, message: '发布日期不能为空', trigger: 'change'} {required: false, message: '发布日期不能为空', trigger: 'change'}
] ]
}, },
// 代替标准号 // 代替标准号
@@ -4642,7 +4642,7 @@ export default {
} }
}) })
// rules.standState = [{required: true, message: '标准状态不能为空', trigger: 'change'}] // rules.standState = [{required: true, message: '标准状态不能为空', trigger: 'change'}]
rules.issueTime = [{required: true, message: '发布日期不能为空', trigger: 'change'}] rules.issueTime = [{required: false, message: '发布日期不能为空', trigger: 'change'}]
this.$set(this, 'sarStandardsInfoRules', rules) this.$set(this, 'sarStandardsInfoRules', rules)
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.sarStandardsInfoForm.clearValidate() this.$refs.sarStandardsInfoForm.clearValidate()