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:
zhutianqi
2021-11-23 16:58:42 +08:00
parent 029e6d71ca ab2ab9c968
commit 6f89978a4f
5 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+4 -4
View File
@@ -1478,9 +1478,9 @@
], ],
}, },
rules:{ rules:{
standSort: [ /*standSort: [
{ required: true, message: '请选择标准类别', trigger: 'change' } { required: true, message: '请选择标准类别', trigger: 'change' }
], ],*/
standNumber: [ standNumber: [
{ 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' }
@@ -1497,9 +1497,9 @@
{ required: false, message: '请输入标准英文名称', trigger: 'blur' }, { required: false, message: '请输入标准英文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' } { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
], ],
standNature: [ /*standNature: [
{ required: true, message: '请选择标准性质', trigger: 'change' } { required: true, message: '请选择标准性质', trigger: 'change' }
], ],*/
textStatus: [ textStatus: [
{ required: true, message: '请选择文本状态', trigger: 'change' } { required: true, message: '请选择文本状态', trigger: 'change' }
] ]
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+6 -6
View File
@@ -44,7 +44,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled"> <el-form-item label="标准类别" v-show="form.standInData === '0'" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" placeholder="请选择标准类别" disabled> <el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
<el-option <el-option
v-for="item in standSortOptions" v-for="item in standSortOptions"
@@ -95,7 +95,7 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled"> <el-form-item v-show="form.standInData === '0'" label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
<el-select v-model="form.standNature" placeholder="请选择标准性质" disabled> <el-select v-model="form.standNature" placeholder="请选择标准性质" disabled>
<el-option <el-option
v-for="item in standNatureOptions" v-for="item in standNatureOptions"
@@ -382,7 +382,7 @@
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled"> <!-- <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
<el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple disabled> <el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple disabled>
<el-option <el-option
v-for="item in zrbmOptions" v-for="item in zrbmOptions"
@@ -392,7 +392,7 @@
:label="item.label" :label="item.label"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>-->
<el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled"> <el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled">
<el-select v-model="form.cllx" placeholder="请选择适用车型" multiple disabled> <el-select v-model="form.cllx" placeholder="请选择适用车型" multiple disabled>
<el-option <el-option
@@ -475,7 +475,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled"> <!-- <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
<el-select v-model="form.zrgcs" placeholder="请选择责任工程师" multiple disabled> <el-select v-model="form.zrgcs" placeholder="请选择责任工程师" multiple disabled>
<el-option <el-option
v-for="item in zrgcsOptions" v-for="item in zrgcsOptions"
@@ -485,7 +485,7 @@
:label="item.label" :label="item.label"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>-->
<el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled"> <el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="form.cycvppscn" v-model="form.cycvppscn"
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+6 -6
View File
@@ -44,7 +44,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled"> <el-form-item v-show="form.standInData === '0'" label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" placeholder="请选择标准类别" disabled> <el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
<el-option <el-option
v-for="item in standSortOptions" v-for="item in standSortOptions"
@@ -95,7 +95,7 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled"> <el-form-item v-show="form.standInData === '0'" label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
<el-select v-model="form.standNature" placeholder="请选择标准性质" disabled> <el-select v-model="form.standNature" placeholder="请选择标准性质" disabled>
<el-option <el-option
v-for="item in standNatureOptions" v-for="item in standNatureOptions"
@@ -296,7 +296,7 @@
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled"> <!-- <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
<el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple disabled> <el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple disabled>
<el-option <el-option
v-for="item in zrbmOptions" v-for="item in zrbmOptions"
@@ -306,7 +306,7 @@
:label="item.label" :label="item.label"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>-->
<el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled"> <el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled">
<el-select v-model="form.cllx" placeholder="请选择适用车型" multiple disabled> <el-select v-model="form.cllx" placeholder="请选择适用车型" multiple disabled>
<el-option <el-option
@@ -389,7 +389,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled"> <!-- <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
<el-select v-model="form.zrgcs" placeholder="请选择责任工程师" multiple disabled> <el-select v-model="form.zrgcs" placeholder="请选择责任工程师" multiple disabled>
<el-option <el-option
v-for="item in zrgcsOptions" v-for="item in zrgcsOptions"
@@ -399,7 +399,7 @@
:label="item.label" :label="item.label"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>-->
<el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled"> <el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="form.cycvppscn" v-model="form.cycvppscn"
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+10 -10
View File
@@ -44,7 +44,7 @@
</el-form-item> </el-form-item>
<el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled"> <el-form-item v-show="form.standInData === '0'" label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" filterable placeholder="请选择标准类别"> <el-select v-model="form.standSort" filterable placeholder="请选择标准类别">
<el-option <el-option
v-for="item in standSortOptions" v-for="item in standSortOptions"
@@ -91,7 +91,7 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled"> <el-form-item v-show="form.standInData === '0'" label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
<el-select v-model="form.standNature" placeholder="请选择标准性质"> <el-select v-model="form.standNature" placeholder="请选择标准性质">
<el-option <el-option
v-for="item in standNatureOptions" v-for="item in standNatureOptions"
@@ -748,7 +748,7 @@
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled"> <!-- <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
<el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple> <el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple>
<el-option <el-option
v-for="item in zrbmOptions" v-for="item in zrbmOptions"
@@ -758,7 +758,7 @@
:label="item.label" :label="item.label"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>-->
<el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled"> <el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled">
<el-select v-model="form.cllx" placeholder="请选择适用车型" multiple> <el-select v-model="form.cllx" placeholder="请选择适用车型" multiple>
<el-option <el-option
@@ -874,7 +874,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled"> <!-- <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
<el-select v-model="form.zrgcs" placeholder="请选择责任工程师" multiple> <el-select v-model="form.zrgcs" placeholder="请选择责任工程师" multiple>
<el-option <el-option
v-for="item in zrgcsOptions" v-for="item in zrgcsOptions"
@@ -884,7 +884,7 @@
:label="item.label" :label="item.label"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>-->
<el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled"> <el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
@@ -1456,9 +1456,9 @@ export default {
replaceLoading: true, replaceLoading: true,
replacePage: 1, replacePage: 1,
rules:{ rules:{
standSort: [ /* standSort: [
{ required: true, message: '请选择标准类别', trigger: 'change' } { required: true, message: '请选择标准类别', trigger: 'change' }
], ],*/
standNumber: [ standNumber: [
{ 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' }
@@ -1475,9 +1475,9 @@ export default {
{ 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' }
], ],
standNature: [ /*standNature: [
{ required: true, message: '请选择标准性质', trigger: 'change' } { required: true, message: '请选择标准性质', trigger: 'change' }
], ],*/
textStatus: [ textStatus: [
{ required: true, message: '请选择文本状态', trigger: 'change' } { required: true, message: '请选择文本状态', trigger: 'change' }
], ],
src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+6 -6
View File
@@ -30,7 +30,7 @@
<el-radio label="1">海外标准入库</el-radio> <el-radio label="1">海外标准入库</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled"> <el-form-item v-show="form.standInData === '0'" label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" placeholder="请选择标准类别" disabled> <el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
<el-option <el-option
v-for="item in standSortOptions" v-for="item in standSortOptions"
@@ -80,7 +80,7 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled"> <el-form-item v-show="form.standInData === '0'" label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
<el-select v-model="form.standNature" placeholder="请选择标准性质" disabled> <el-select v-model="form.standNature" placeholder="请选择标准性质" disabled>
<el-option <el-option
v-for="item in standNatureOptions" v-for="item in standNatureOptions"
@@ -289,7 +289,7 @@
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled"> <!-- <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
<el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple disabled> <el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple disabled>
<el-option <el-option
v-for="item in zrbmOptions" v-for="item in zrbmOptions"
@@ -299,7 +299,7 @@
:label="item.label" :label="item.label"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>-->
<el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled"> <el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled">
<el-select v-model="form.cllx" placeholder="请选择适用车型" multiple disabled> <el-select v-model="form.cllx" placeholder="请选择适用车型" multiple disabled>
<el-option <el-option
@@ -397,7 +397,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled"> <!-- <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
<el-select v-model="form.zrgcs" placeholder="请选择责任工程师" multiple disabled> <el-select v-model="form.zrgcs" placeholder="请选择责任工程师" multiple disabled>
<el-option <el-option
v-for="item in zrgcsOptions" v-for="item in zrgcsOptions"
@@ -407,7 +407,7 @@
:label="item.label" :label="item.label"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>-->
<el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled"> <el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="form.cycvppscn" v-model="form.cycvppscn"