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
2021-12-29 17:41:24 +08:00
parent 4a48ca8e40 16c9c664b0
commit 7f2111bc46
17 changed files with 333 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+24 -13
View File
@@ -206,10 +206,10 @@
<el-col :span="24">
<el-form :model="addForm" inline class="label-input-form" label-width="180px" :rules="addFormRules" ref="addForm">
<el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-select v-model="addForm.bussSort" filterable clearable placeholder="" style="appearance: none" placeholder="请选择企标类别">
<el-select :disabled="DrawerType === 'see'" v-model="addForm.bussSort" filterable clearable placeholder="" style="appearance: none" placeholder="请选择企标类别">
<el-option
v-for="item in standSortOptions"
:key="item.value"
v-for="(item, index) in standSortOptions"
:key="index"
:value="item.value"
:label="item.label"
></el-option>
@@ -323,7 +323,7 @@
</el-form-item>
<el-form-item label="标准范围" style="width: 100%; margin-right:10px" class="add-form-item" prop="area" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex;justify-content: space-between;align-items: center;">
<el-select v-model="addForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
<el-select :disabled="DrawerType === 'see'" v-model="addForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
@@ -335,7 +335,7 @@
</el-form-item>
<el-form-item label="是否引用标准" style="width: 100%; margin-right:10px" class="add-form-item" prop="isRelate" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex; height: 100%; justify-content: space-between;align-items: center;">
<el-radio-group v-model="addForm.isRelate">
<el-radio-group :disabled="DrawerType === 'see'" v-model="addForm.isRelate">
<el-radio label="是" value="是"></el-radio>
<el-radio label="否" value="否"></el-radio>
</el-radio-group>
@@ -345,13 +345,14 @@
<custom-input-for-all-standards
class="classDisplay"
:config="{attrName: '采用标准'}"
:disabled="DrawerType === 'see'"
:labelWidth="'180px'"
v-model="addForm.esStandRelations"
></custom-input-for-all-standards>
</template>
<el-form-item v-if="addForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px" class="add-form-item" prop="useLevel" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex; height: 100%; justify-content: space-between;align-items: center;">
<el-radio-group v-model="addForm.useLevel">
<el-radio-group :disabled="DrawerType === 'see'" v-model="addForm.useLevel">
<el-radio label="等同" value="等同"></el-radio>
<el-radio label="修改" value="修改"></el-radio>
<el-radio label="非等效" value="非等效"></el-radio>
@@ -361,6 +362,7 @@
<el-form-item v-if="addForm.isRelate === '否'" label="简述技术指标依据" style="width: 100%; margin-right:10px" class="add-form-item" prop="technologic" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex;justify-content: space-between;align-items: center;">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.technologic"
placeholder="请简述技术指标依据">
</el-input>
@@ -369,6 +371,7 @@
<template>
<custom-input-for-all-standards2
class="classDisplay"
:disabled="DrawerType === 'see'"
:config="{attrName: '配套标准'}"
:labelWidth="'180px'"
v-model="addForm.esMatingRelations"
@@ -718,12 +721,16 @@
this.TXJGmodal = false
},
choiceTXJG (id) {
if (id) {
this.TXJGList = id.split(',')
if ( this.DrawerType === 'see') {
return
} else {
this.TXJGList = []
if (id) {
this.TXJGList = id.split(',')
} else {
this.TXJGList = []
}
this.TXJGmodal = true
}
this.TXJGmodal = true
},
QYBZcloseDrawer () {
this.clearQYBZ()
@@ -768,9 +775,13 @@
}
},
choiceQYBZ (id) {
this.QYBZformSelect = []
this.QYBZget()
this.QYBZmodal = true
if (this.DrawerType === 'see') {
return
} else {
this.QYBZformSelect = []
this.QYBZget()
this.QYBZmodal = true
}
},
drawerCheckZRBM (data) {
let list = ''
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+27 -22
View File
@@ -945,22 +945,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>
@@ -1659,7 +1659,7 @@
:urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs" @popoverHideCancel="popoverHideCarVsCancel"></tree-select-new>
<tree-select-new
<tree-select-module
width="500"
:lazy=true
:multiple=true
@@ -1669,7 +1669,9 @@
:url="url"
:urlChild="urlChild"
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-new>
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
@popoverHideCancel="popoverHideModelCancel()">
</tree-select-module>
<!-- 导入失败 -->
<el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
<p slot="title" style="color:#f60">
@@ -1740,6 +1742,7 @@ import {interfaceUrl} from "@/sysConfig";
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import store from "@/store";
import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
@@ -1765,6 +1768,7 @@ export default {
CustomDatePickWithText2,
TreeSelect,
TreeSelectNew,
treeSelectModule,
ProcessTitle
},
data() {
@@ -2281,11 +2285,11 @@ export default {
{type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'}
],
standName: [
{required: true, message: '中文名称不能为空', trigger: 'change'},
{required: false, message: '中文名称不能为空', trigger: 'change'},
{type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}
],
standEnName: [
{required: true, message: '英文名称不能为空', trigger: 'change'},
{required: false, message: '英文名称不能为空', trigger: 'change'},
{type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'}
// {validator: this.verify.valiateEnName, trigger: 'blur'}
],
@@ -2587,7 +2591,8 @@ export default {
this.modalShowFlag3 = false
},
popoverHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
if (checkedData) {
console.log(checkedData)
if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0) {
this.sarStandardsInfoEO.DYBXH = checkedData.map(item => item.model).join(",")
this.sarStandardsInfoEO.DYMC = checkedData.map(item => item.name).join(",")
@@ -2595,8 +2600,8 @@ export default {
this.sarStandardsInfoEO.DYBXH = checkedData.model
this.sarStandardsInfoEO.DYMC = checkedData.name
}
this.modalShowFlag4 = false
}
this.modalShowFlag4 = false
this.$forceUpdate()
}, popoverHideModelCancel() {
this.modalShowFlag4 = false