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-12-29 16:35:00 +08:00
parent ab3e0db922 7018c2b4e9
commit 553ed28b8f
33 changed files with 2264 additions and 955 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+2 -1
View File
@@ -1672,7 +1672,7 @@
<custom-select-array
style="margin-left: -14px"
:config="applyArcticOptions"
v-model="sarStandardsSearch['applyArctic']"
v-model="sarStandardsSearch['CLLX']"
></custom-select-array>
</template>
<!-- <el-form-item :label="$t('m.applicableModels')" class="add-form-item form-item-disabled">-->
@@ -2305,6 +2305,7 @@ export default {
standNature: '',//标准性质
textStatus: '',//文本状态
synopsis: '', // 内容摘要
CLLX: '' // 适用车型
}, // 分页查询过程中用到的对象
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+71 -26
View File
@@ -5,16 +5,17 @@
<el-form :modal="form" inline class="label-input-form">
<el-form-item label="计划状态" class="search-item">
<el-select v-model="form.planStatus" placeholder="请选择计划状态">
<el-option label="制定" value="制定"></el-option>
<el-option label="修订" value="修订"></el-option>
<el-option label="完成" value="完成"></el-option>
<el-option label="未开始" value="0"></el-option>
<el-option label="制定中" value="1"></el-option>
<el-option label="修订中" value="2"></el-option>
<el-option label="已取消" value="3"></el-option>
<el-option label="已完成" value="4"></el-option>
</el-select>
</el-form-item>
<el-form-item label="制修订状态" class="search-item">
<el-select v-model="form.reviseStatus" placeholder="请选择制修订状态">
<el-option label="制定完成" value="制定完成"></el-option>
<el-option label="制定中" value="制定中"></el-option>
<el-option label="未制定" value="未制定"></el-option>
<el-option label="制定" value="1"></el-option>
<el-option label="修订" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="企标名称" class="search-item">
@@ -90,6 +91,12 @@
align="center"
width="55">
</el-table-column>
<el-table-column
prop="bussSort"
label="企标类别"
align="center"
width="120">
</el-table-column>
<el-table-column
prop="esName"
label="企标名称"
@@ -102,7 +109,7 @@
align="center"
width="150">
<template slot-scope="scope">
<div>{{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }}</div>
<div>{{ getMap1(scope.row.planStatus)}}</div>
</template>
</el-table-column>
<el-table-column
@@ -110,9 +117,9 @@
width="150"
align="center"
label="制修订状态">
<!-- <template slot-scope="scope">-->
<!-- <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>-->
<!-- </template>-->
<template slot-scope="scope">
<div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
</template>
</el-table-column>
<el-table-column
prop="drafterName"
@@ -196,6 +203,16 @@
<el-row :gutter="24">
<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 :disabled="DrawerType === 'see'" v-model="addForm.bussSort" filterable clearable placeholder="" style="appearance: none" placeholder="请选择企标类别">
<el-option
v-for="(item, index) in standSortOptions"
:key="index"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
@@ -205,16 +222,17 @@
</el-form-item>
<el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-select :disabled="DrawerType === 'see'" v-model="addForm.planStatus" placeholder="请选择计划状态">
<el-option label="制定" value="2"></el-option>
<el-option label="修订" value="1"></el-option>
<el-option label="完成" value="0"></el-option>
<el-option label="未开始" value="0"></el-option>
<el-option label="制定中" value="1"></el-option>
<el-option label="修订中" value="2"></el-option>
<el-option label="已取消" value="3"></el-option>
<el-option label="已完成" value="4"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-select :disabled="DrawerType === 'see'" v-model="addForm.reviseStatus" placeholder="请选择制修订状态">
<el-option label="制定完成" value="0"></el-option>
<el-option label="制定中" value="1"></el-option>
<el-option label="未制定" value="2"></el-option>
<el-option label="制定" value="1"></el-option>
<el-option label="修订" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
@@ -303,7 +321,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"
@@ -315,7 +333,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>
@@ -325,13 +343,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>
@@ -341,6 +360,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>
@@ -349,6 +369,7 @@
<template>
<custom-input-for-all-standards2
class="classDisplay"
:disabled="DrawerType === 'see'"
:config="{attrName: '配套标准'}"
:labelWidth="'180px'"
v-model="addForm.esMatingRelations"
@@ -556,6 +577,7 @@
TXJGList: [],
TXJGmodal: false,
standSystemOptions: [],
standSortOptions: [],
defaultProps: {
children: 'children',
label: 'menuName'
@@ -591,6 +613,7 @@
DrawerType: '',
ids: [],
addForm: {
bussSort:'',
esMatingRelations: '',
technologic: '',
useLevel: '',
@@ -623,6 +646,9 @@
esName: [
{required: true, message: '请输入企标名称', trigger: 'blur'},
],
bussSort: [
{required: true, message: '请选择企标类别', trigger: 'change'},
],
planStatus: [
{required: true, message: '请选择计划状态', trigger: 'change'},
],
@@ -661,6 +687,15 @@
props: {},
watch: {},
methods: {
getMap1(item){
const map = new Map();
map.set('0','未开始')
map.set('1','制定中')
map.set('2','修订中')
map.set('3','已取消')
map.set('4','已完成')
return map.get(item)
},
TXJGcloseDrawer () {
this.TXJGmodal = false
},
@@ -684,12 +719,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()
@@ -734,9 +773,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 = ''
@@ -941,6 +984,7 @@
this.DrawerType = 'edit'
this.addDrawer = true
this.addForm = {
bussSort: command[0].bussSort,
esMatingRelations: command[0].esMatingRelations,
technologic: command[0].technologic,
useLevel: command[0].useLevel,
@@ -1025,6 +1069,7 @@
}, res => {
this.QCDWList = res.data.QCDW // 起草单位
this.standSystemOptions = res.data.TXLBBUSS // 体系结构
this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
this.BZList = res.data.ENERGYTYPES
}, e => {
})
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+12 -6
View File
@@ -619,7 +619,7 @@
<custom-select-array
:config="applyArcticOptions"
style="margin-left: -14px"
v-model="sarStandardsSearch['applyArctic']"
v-model="sarStandardsSearch['CLLX']"
></custom-select-array>
</template>
<!-- <el-form-item :label="$t('m.applicableModels')" class="add-form-item form-item-disabled">
@@ -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() {
@@ -1850,7 +1854,8 @@ export default {
standState: '',
standNature: '',//标准性质
synopsis: '', // 内容摘要
textStatus: ''//文本状态
textStatus: '',//文本状态
CLLX: ''
},
//高级搜索映射
advanceSearchMapping: {
@@ -2586,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(",")
@@ -2594,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