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:
super_liu
2022-01-18 16:14:03 +08:00
parent dae0e83a6c 11298ff68e
commit cd1037d997
3 changed files with 962 additions and 912 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/CustomFormComponents/DatePicker.vue
+1
View File
@@ -15,6 +15,7 @@
format="yyyy-MM-dd"
:value="value"
type="date"
clearable
:editable="true"
:disabled="disabled"
:placeholder="placeholder"
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+37 -11
View File
@@ -503,7 +503,7 @@
class="add-form-item"
>
<template slot="label">是否纳入认证清单</template>
<el-select v-model="sarStandardsInfoEO.isRelateAccess" @change="isRegulationsChange">
<el-select v-model="sarStandardsInfoEO.isRelateAccess" clearable @change="isRegulationsChange">
<el-option value="1" label="是" key="1"></el-option>
<el-option value="2" label="否" key="2"></el-option>
</el-select>
@@ -568,6 +568,7 @@
>
<template slot="label">关联模块--乘用车VPPS编码</template>
<el-input v-model="sarStandardsInfoEO.CYCVPPSBM" placeholder="选择乘用车VPPS编码"
clearable
@click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', sarStandardsInfoEO.cycvppsbm)"></el-input>
</el-form-item>
</template>
@@ -579,6 +580,7 @@
>
<template slot="label">关联模块--卡车VPPS编码</template>
<el-input v-model="sarStandardsInfoEO.KCCVPPSBM" placeholder="选择卡车VPPS编码"
clearable
@click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"></el-input>
</el-form-item>
</template>
@@ -590,6 +592,7 @@
>
<template slot="label">模块结构单元变型号</template>
<el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号"
clearable
@click.native="choiceZRR4('dybxh', '模块结构单元', sarStandardsInfoEO.dybxh)"></el-input>
</el-form-item>
</template>
@@ -597,7 +600,15 @@
<el-form-item title="关联模块--乘用车VPPS中文名称" label="关联模块--乘用车VPPS中文名称" label-width="150px"
prop="cycvppscn" class="add-form-item">
<el-input
v-model="sarStandardsInfoEO.CYCVPPSCN" disabled
v-if="sarStandardsInfoEO.CYCVPPSBM === '' || sarStandardsInfoEO.CYCVPPSBM === undefined"
v-model="sarStandardsInfoEO.CYCVPPSCN = ''"
disabled
clearable
></el-input>
<el-input
v-else
v-model="sarStandardsInfoEO.CYCVPPSCN"
disabled
clearable
></el-input>
</el-form-item>
@@ -606,7 +617,15 @@
<el-form-item title="关联模块--卡车VPPS中文名称" label="关联模块--卡车VPPS中文名称" label-width="150px" prop="kccvppscn"
class="add-form-item">
<el-input
v-model="sarStandardsInfoEO.KCCVPPSCN" disabled
v-if="sarStandardsInfoEO.KCCVPPSBM === '' || sarStandardsInfoEO.KCCVPPSBM === undefined"
v-model="sarStandardsInfoEO.KCCVPPSCN = ''"
disabled
clearable
></el-input>
<el-input
v-else
v-model="sarStandardsInfoEO.KCCVPPSCN"
disabled
clearable
></el-input>
</el-form-item>
@@ -614,7 +633,15 @@
<template v-else-if="field.attrField === 'DYMC'">
<el-form-item label="模块结构单元名称" label-width="150px" prop="dymc" class="add-form-item">
<el-input
v-model="sarStandardsInfoEO.DYMC" disabled
v-if="sarStandardsInfoEO.DYBXH === '' || sarStandardsInfoEO.DYBXH === undefined"
v-model="sarStandardsInfoEO.DYMC = ''"
disabled
clearable
></el-input>
<el-input
v-else
v-model="sarStandardsInfoEO.DYMC"
disabled
clearable
></el-input>
</el-form-item>
@@ -743,9 +770,6 @@
<el-input
:config="field"
clearable
type="textarea"
resize="none"
:autosize="true"
v-model="sarStandardsInfoEO['QCDW']"
:disabled="formdisableflag" placeholder="选择或输入起草单位">
</el-input>
@@ -763,7 +787,8 @@
size="mini"
type="primary"
@click="QCDWClick(field.options)"
class="common-button-primary">手动查找</el-button>
class="common-button-primary">手动查找
</el-button>
</div>
</div>
<!-- @click.native="choiceZRBM('QCDWId', '起草单位', sarStandardsInfoEO.QCDWId)">-->
@@ -2004,7 +2029,10 @@
<loading :loading="OCRLoading">数据加载中……</loading>
<div class="demo-drawer-footer">
<el-button size="mini" @click="OCRclose">取消</el-button>
<el-button type="primary" :loading="OCRSubmitLoading" size="mini" @click="OCRsubmit">{{ OCRSubmitButton }}</el-button>
<el-button type="primary" :loading="OCRSubmitLoading" size="mini" @click="OCRsubmit">{{
OCRSubmitButton
}}
</el-button>
</div>
</div>
</el-drawer>
@@ -5686,8 +5714,6 @@ export default {
}
}
},
created() {
},
async mounted() {
// 进入页面后查询树形结构目录
await this.selectMenu()
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+49 -26
View File
@@ -955,22 +955,22 @@
placeholder="请输入标准英文名称"
clearable></el-input>
</el-form-item>
<!-- <el-form-item prop="standNature" label-width="150px" class="add-form-item">-->
<!-- <template slot="label">标准性质</template>-->
<!-- <el-select v-model="sarStandardsInfoEO.standNature"-->
<!-- placeholder="请选择标准性质"-->
<!-- clearable>-->
<!-- <el-option-->
<!-- v-for="item in standNatureOptions"-->
<!-- placeholder="请选择"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- >-->
<!-- {{ item.label }}-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item prop="standNature" label-width="150px" class="add-form-item">
<template slot="label">标准性质</template>
<el-select v-model="sarStandardsInfoEO.standNature"
placeholder="请选择标准性质"
clearable>
<el-option
v-for="item in standNatureOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
>
{{ item.label }}
</el-option>
</el-select>
</el-form-item>-->
<el-form-item title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
prop="standState" label-width="150px" class="add-form-item">
<template slot="label">文本状态</template>
@@ -988,10 +988,7 @@
</el-select>
</el-form-item>
<custom-date-pick
:config="{
attrName: '发布日期',
attrField: 'issueTime'
}"
:config="{ attrName: '发布日期',attrField: 'issueTime'}"
v-model="sarStandardsInfoEO.issueTime"
:disabled="formdisableflag"
></custom-date-pick>
@@ -1002,7 +999,7 @@
class="add-form-item"
>
<template slot="label">是否纳入认证清单</template>
<el-select v-model="sarStandardsInfoEO.isRelateAccess" @change="isRegulationsChange">
<el-select v-model="sarStandardsInfoEO.isRelateAccess" clearable @change="isRegulationsChange">
<el-option value="1" label="是" key="1"></el-option>
<el-option value="2" label="否" key="2"></el-option>
</el-select>
@@ -1072,6 +1069,7 @@
>
<template slot="label">关联模块--乘用车VPPS编码</template>
<el-input v-model="sarStandardsInfoEO.CYCVPPSBM" placeholder="选择乘用车VPPS编码"
clearable
@click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', sarStandardsInfoEO.cycvppsbm)"></el-input>
</el-form-item>
</template>
@@ -1082,7 +1080,7 @@
class="add-form-item"
>
<template slot="label">关联模块--卡车VPPS编码</template>
<el-input v-model="sarStandardsInfoEO.KCCVPPSBM" placeholder="选择卡车VPPS编码" @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"></el-input>
<el-input v-model="sarStandardsInfoEO.KCCVPPSBM" placeholder="选择卡车VPPS编码" clearable @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'DYBXH'">
@@ -1092,13 +1090,14 @@
class="add-form-item"
>
<template slot="label">模块结构单元变型号</template>
<el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxh', '模块结构单元', sarStandardsInfoEO.dybxh)"></el-input>
<el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号" clearable @click.native="choiceZRR4('dybxh', '模块结构单元', sarStandardsInfoEO.dybxh)"></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'CYCVPPSCN'">
<el-form-item label="关联模块--乘用车vpps中文名称" label-width="150px" prop="CYCVPPSCN" class="add-form-item">
<el-input
v-model="sarStandardsInfoEO.CYCVPPSCN" disabled
v-model="sarStandardsInfoEO.CYCVPPSCN"
disabled
clearable
></el-input>
</el-form-item>
@@ -1106,7 +1105,8 @@
<template v-else-if="field.attrField === 'KCCVPPSCN'">
<el-form-item label="关联模块--卡车vpps中文名称" label-width="150px" prop="KCCVPPSCN" class="add-form-item">
<el-input
v-model="sarStandardsInfoEO.KCCVPPSCN" disabled
v-model="sarStandardsInfoEO.KCCVPPSCN"
disabled
clearable
></el-input>
</el-form-item>
@@ -1114,7 +1114,8 @@
<template v-else-if="field.attrField === 'DYMC'">
<el-form-item label="模块结构单元名称" label-width="150px" prop="DYMC" class="add-form-item">
<el-input
v-model="sarStandardsInfoEO.DYMC" disabled
v-model="sarStandardsInfoEO.DYMC"
disabled
clearable
></el-input>
</el-form-item>
@@ -1819,6 +1820,7 @@ export default {
urlChild: '',
drawerTitle: '', //drawer标题
nodeKey: 'id',
defaultCheckedKeys: [],
defaultCheckedKeys1: [],
defaultCheckedKeys2: [],
defaultCheckedKeys3: [],
@@ -2490,6 +2492,27 @@ export default {
}
}
},
'sarStandardsInfoEO.CYCVPPSBM': {
handler() {
if (this.sarStandardsInfoEO.CYCVPPSBM === '') {
this.sarStandardsInfoEO.CYCVPPSCN = ''
}
}
},
'sarStandardsInfoEO.KCCVPPSBM': {
handler() {
if (this.sarStandardsInfoEO.KCCVPPSBM === '') {
this.sarStandardsInfoEO.KCCVPPSCN = ''
}
}
},
'sarStandardsInfoEO.DYBXH': {
handler() {
if (this.sarStandardsInfoEO.DYBXH === '') {
this.sarStandardsInfoEO.DYMC = ''
}
}
},
filterText(val) {
this.$refs.tree.filter(val);
}