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-07-27 15:49:51 +08:00
parent 2eca268fd0 23c6e90950
commit 8b960b384e
21 changed files with 2326 additions and 2238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+80 -155
View File
@@ -80,55 +80,13 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="标准名称" v-if="sarAccessInfoSearch.dataSource !== 'TEMP'" class="search-item">
<el-form-item label="标准名称" class="search-item">
<el-input
v-model="sarAccessInfoSearch.standName"
placeholder="请输入"
:maxlength="100"
></el-input>
</el-form-item>
<el-form-item label="适用车辆类型" class="search-item" v-show="moreSearchShow">
<el-select v-model="sarAccessInfoSearch.applyArctic" filterable clearable>
<el-option
v-for="item in energyKindOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item class="search-item" prop="askType" label="要求类型" v-show="moreSearchShow">
<el-select v-model="sarAccessInfoSearch.askType">
<el-option
v-for="item in accessSarTypeOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="国家/地区" class="search-item" v-show="isListType">
<el-select
v-model="sarAccessInfoSearch.countryArea"
placeholder="请选择"
filterable
>
<el-option
v-for="item in drawerCountryOptions"
:value="item.value"
:key="item.value"
:label="item.label"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="清单名称" prop="detailedListName" class="search-item" v-show="isListType">
<el-input
v-model="sarAccessInfoSearch.detailedListName"
placeholder="请输入"
:maxlength="100"
></el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
@@ -158,46 +116,23 @@
</div>
</div>
<div class="showSelectBox" v-if="!showSelectBox">
<el-form :model="sarAccessInfoSearch" class="label-input-form" v-if="!disabledFlag" inline>
<el-form-item label="文本状态" v-show="!isListType">
<el-select
v-model="sarAccessInfoSearch.textStatus"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in textStatusOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item label="发布日期" v-show="!isListType">
<el-date-picker
v-model="sarAccessInfoSearch.issueTime"
type="date"
value-format="yyyy-MM-DD"
size="small"
placeholder="选择发布日期">
</el-date-picker>
</el-form-item>
<el-form-item label="更新人" v-show="isListType">
<el-form :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
<el-form-item label="标准号" class="labelBox">
<el-input
v-model="sarAccessInfoSearch.standName"
v-model="sarAccessInfo.standNumber"
placeholder="请输入"
:maxlength="100"
size="small"/>
</el-form-item>
<el-form-item label="更新时间" v-show="isListType">
<el-date-picker
v-model="sarAccessInfoSearch.modifyTime"
type="date"
size="small"
value-format="yyyy-MM-DD"
placeholder="选择更新日期">
</el-date-picker>
clearable/>
</el-form-item>
<el-form-item label="标准名称" class="labelBox">
<el-input
v-model="sarAccessInfo.standName"
placeholder="请输入"
size="small"
clearable/>
</el-form-item>
<el-form-item>
<el-button size="small" type="primary" @click="selectBtn">查询</el-button>
</el-form-item>
</el-form>
</div>
@@ -243,13 +178,12 @@
width="180px"
label="标准号">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
<span @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</span>
</template>
</el-table-column>
<el-table-column
prop="standName"
label="标准名称"
width="260px"
>
</el-table-column>
<el-table-column
@@ -287,52 +221,6 @@
</template>
</el-table-column>
</el-table>
<el-table
v-show="isListType"
:data="sarAccessInfoSearchList"
style="width: 100%"
border
height="300px"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="accessSarTypeSelect"
ref="accessTypeSelect"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="country"
label="国家/地区"
align="center">
<template slot-scope="scope">
<span v-if="scope.row.country !== null && scope.row.country.indexOf(',') > 0">
<span>{{ scope.row.country }}</span>
</span>
<span v-else>{{ countryAreaMap[scope.row.country] }}</span>
</template>
</el-table-column>
<el-table-column
prop="detailedListName"
label="清单名称"
align="center">
</el-table-column>
<el-table-column
prop="modifyTime"
label="更新时间"
align="center">
<template slot-scope="scope">
<div>{{ scope.row.modifyTime ? scope.row.modifyTime.split(' ')[0] : '' }}</div>
</template>
</el-table-column>
<el-table-column
prop="uname"
label="更新人"
align="center">
</el-table-column>
</el-table>
<pagination :page="drawerPage" :total="drawerTotal" @pageChange="drawerPageChange"
@pageSizeChange="drawerPageSizeChange"></pagination>
<loading :loading="dataLoading">{{$t('m.dataAcquisition')}}</loading>
@@ -354,6 +242,7 @@
v-btn-permission="''"
><i class="iconfont">&#xe61b;</i>删除</el-button>
</div>
<!-- 清单条目的列表页 -->
<el-table
ref="entryTable"
:data="sarAccessInfoList"
@@ -541,21 +430,19 @@
>
<el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
<el-form-item label="标准号">
<el-input v-model.trim="editRowData.standNumber" :disabled="true">
<!-- <a>{{ editRowData.standSortShow }} {{ editRowData.standNumber }}</a>-->
</el-input>
<el-input v-model.trim="editRowData.standNumber" :disabled="true"/>
</el-form-item>
<el-form-item label="标准名称" prop="standName">
<el-input v-model.trim="editRowData.standName" :disabled="true"></el-input>
<el-input v-model.trim="editRowData.standName" :disabled="true"/>
</el-form-item>
<el-form-item label="英文名称" prop="standEnName">
<el-input v-model.trim="editRowData.standEnName" :disabled="true"></el-input>
<el-input v-model.trim="editRowData.standEnName" :disabled="true"/>
</el-form-item>
<el-form-item label="适用车型" prop="typeApplicable">
<el-input v-model.trim="editRowData.typeApplicable" :disabled="true"></el-input>
<el-input v-model.trim="editRowData.typeApplicable" :disabled="true"/>
</el-form-item>
<el-form-item label="能源类型" prop="nylx">
<el-input v-model.trim="editRowData.nylx" :disabled="true"></el-input>
<el-input v-model.trim="editRowData.nylx" :disabled="true"/>
</el-form-item>
<el-form-item label="标准实施日期" prop="putTime">
<el-date-picker
@@ -582,22 +469,22 @@
</el-date-picker>
</el-form-item>
<el-form-item label="责任部门" prop="zrbm">
<el-input v-model.trim="editRowData.zrbm" :disabled="true"></el-input>
<el-input v-model.trim="editRowData.zrbm" :disabled="true"/>
</el-form-item>
<el-form-item label="适用产品线" prop="sycpx">
<el-input v-model.trim="editRowData.sycpx" :disabled="true"></el-input>
<el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
</el-form-item>
<el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
<el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"></el-input>
<el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
</el-form-item>
<el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
<el-input v-model.trim="editRowData.cycvppscn" :disabled="true"></el-input>
<el-input v-model.trim="editRowData.cycvppscn" :disabled="true"/>
</el-form-item>
<el-form-item label="卡车VPPS编码" prop="kccvppsbm">
<el-input v-model.trim="editRowData.kccvppsbm" :disabled="true"></el-input>
<el-input v-model.trim="editRowData.kccvppsbm" :disabled="true"/>
</el-form-item>
<el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
<el-input v-model.trim="editRowData.kccvppscn" :disabled="true"></el-input>
<el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
</el-form-item>
</el-form>
<div class="demo-drawer-footer">
@@ -746,19 +633,23 @@ export default {
{value: 'FOREIGN_STAND', label: '海外标准法规'},
//{value: 'FOREIGN_LAWS', label: '国内外政策'},
// {value: 'BUSINESS', label: '企业标准 '},
{value: 'TEMP', label: '标准法规清单 '}
// {value: 'TEMP', label: '标准法规清单 '}
],
// 新增、编辑 数据搜索字段
sarAccessInfoSearch: {
id: '',
countryArea: '', // 国家
issueTime: '',
standName: '',
textStatus: '',
// applicationScope: '', //适用区域
keywords: '', // 关键字
detailedListName: '', //清单名称
applyArctic: '', // 能源种类
askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
validFlag: 0,
advanceSearchVOStr: ''
},
sarAccessInfo: {
id: '',
standNumber: '',
standName: '',
askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源
page: 1,
@@ -1104,15 +995,11 @@ export default {
},
// 点击清空查询条件 按钮事件
clearSearchLaws () {
this.sarAccessInfoSearch.advanceSearchVOStr = ''
this.sarAccessInfoSearch.applyArctic = '' // 能源种类
this.sarAccessInfoSearch.keywords = '' // 关键字
this.sarAccessInfoSearch.askType = '' // 监管类型
this.sarAccessInfoSearch.detailedListName = '' // 清单名称
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
this.sarAccessInfoSearch.standName = ''
this.sarAccessInfoSearch.putTime = ''
this.sarAccessInfoSearch.textStatus = ''
this.sarAccessInfo.standName = ''
this.sarAccessInfo.standNumber = ''
this.isListType = false
this.selectLawsStands()
},
@@ -1474,6 +1361,11 @@ export default {
},
// 查询数据搜索 table 数据
selectLawsStands () {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
} else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
}
StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
@@ -1482,8 +1374,35 @@ export default {
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
})
this.drawerTotal = res.data.list.length
}, e => {
})
},
selectBtn() {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
} else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
}
StandardsInfoPage(this.sarAccessInfo).then(res =>{
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
@@ -2169,6 +2088,12 @@ export default {
text-align: right;
}
}
.labelBox {
/deep/ .el-form-item__label {
padding-right: 5px;
padding-left: 10px;
}
}
.un-select {
user-select: none;
}
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+13 -6
View File
@@ -191,13 +191,13 @@
align="center">
</el-table-column>
<el-table-column
prop="code"
prop="standNumber"
fixed="left"
width="180px"
align="center"
label="标准号">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
<span class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</span>
</template>
</el-table-column>
<el-table-column
@@ -491,6 +491,13 @@ export default {
_this: this
}, res => {
this.standinfoList = res.data;
this.standinfoList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
})
this.total = res.data.total;
}, e => {
@@ -628,7 +635,7 @@ export default {
name: "OtherStandardDetails",
params: {
id: data.id,
pageType: data.sarType
pageType: data.standType
}
});
window.open(routeUrl.href, "_blank");
@@ -660,10 +667,10 @@ export default {
//
changeState(row) {
let routeUrl = this.$router.resolve({
name: "ComplianceDetails",
name: "OtherStandardDetails",
query: {
sarId: row.resId,
sarType: row.sarState
id: data.id,
pageType: this.standType
}
});
window.open(routeUrl.href, "_blank");
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+79 -139
View File
@@ -65,40 +65,13 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="标准名称" v-if="sarAccessInfoSearch.dataSource !== 'TEMP'" class="search-item">
<el-form-item label="标准名称" class="search-item">
<el-input
v-model="sarAccessInfoSearch.standName"
placeholder="请输入"
:maxlength="100"
></el-input>
</el-form-item>
<el-form-item label="适用车辆类型" class="search-item" v-show="moreSearchShow">
<el-select v-model="sarAccessInfoSearch.applyArctic" filterable clearable>
<el-option
v-for="item in energyKindOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item class="search-item" prop="askType" label="要求类型" v-show="moreSearchShow">
<el-select v-model="sarAccessInfoSearch.askType">
<el-option
v-for="item in accessSarTypeOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="清单名称" prop="detailedListName" class="search-item" v-show="isListType">
<el-input
v-model="sarAccessInfoSearch.detailedListName"
placeholder="请输入"
:maxlength="100"
></el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
@@ -115,7 +88,11 @@
@click="clearSearchLaws">清空</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn">
<el-button type="primary" v-if="showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
<i class="iconfont">&#xe7a5;</i>
高级查询
</el-button>
<el-button type="primary" v-if="!showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
<i class="iconfont">&#xe7a5;</i>
高级查询
</el-button>
@@ -124,54 +101,23 @@
</div>
</div>
<div class="showSelectBox" v-if="!showSelectBox">
<el-form :model="sarAccessInfoSearch" class="label-input-form" label-width="70px" v-if="!disabledFlag" inline>
<el-form-item label="文本状态" v-show="!isListType">
<el-select
v-model="sarAccessInfoSearch.textStatus"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in textStatusOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item label="发布日期" v-show="!isListType">
<el-date-picker
v-model="sarAccessInfoSearch.issueTime"
type="date"
value-format="yyyy-MM-DD"
size="small"
placeholder="选择发布日期">
</el-date-picker>
</el-form-item>
<el-form-item label="项目类别" v-show="isListType">
<el-form :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
<el-form-item label="标准号" class="labelBox">
<el-input
size="small"
v-model="sarAccessInfoSearch.standSystem"
v-model="sarAccessInfo.standNumber"
placeholder="请输入"
:maxlength="100"
></el-input>
size="small"
clearable/>
</el-form-item>
<el-form-item label="更新人" v-show="isListType">
<el-form-item label="标准名称" class="labelBox">
<el-input
v-model="sarAccessInfoSearch.standName"
v-model="sarAccessInfo.standName"
placeholder="请输入"
:maxlength="100"
size="small"/>
</el-form-item>
<el-form-item label="更新时间" v-show="isListType">
<el-date-picker
v-model="sarAccessInfoSearch.modifyTime"
type="date"
size="small"
value-format="yyyy-MM-DD"
placeholder="选择更新日期">
</el-date-picker>
clearable/>
</el-form-item>
<el-form-item>
<el-button size="small" type="primary" @click="selectBtn">查询</el-button>
</el-form-item>
</el-form>
</div>
@@ -223,7 +169,6 @@
<el-table-column
prop="standName"
label="标准名称"
width="260px"
>
</el-table-column>
<el-table-column
@@ -261,46 +206,6 @@
</template>
</el-table-column>
</el-table>
<el-table
v-show="isListType"
:data="sarAccessInfoSearchList"
style="width: 100%"
border
height="300px"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="accessSarTypeSelect"
ref="accessTypeSelect"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="detailedList"
label="清单类别"
align="center">
</el-table-column>
<el-table-column
prop="detailedListName"
label="清单名称"
align="center">
</el-table-column>
<el-table-column
prop="modifyTime"
label="更新时间"
align="center">
<template slot-scope="scope">
<div>{{ scope.row.modifyTime ? scope.row.modifyTime.split(' ')[0] : '' }}</div>
</template>
</el-table-column>
<el-table-column
prop="uname"
label="更新人"
align="center">
</el-table-column>
</el-table>
<pagination :page="drawerPage" :total="drawerTotal" @pageChange="drawerPageChange"
@pageSizeChange="drawerPageSizeChange"></pagination>
<loading :loading="dataLoading">{{$t('m.dataAcquisition')}}</loading>
@@ -405,16 +310,6 @@
width="210px"
align="center"
label="责任部门">
<template slot-scope="scope">
<span
v-for="(item, index) in zrbmOptions"
:key="index"
:value="item.value"
v-if="scope.row.value == item.value"
>
{{ item.label }}
</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -525,7 +420,7 @@ import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
import stand from "../../../config/pages/attributeCustom/components/stand";
import { mapGetters } from 'vuex'
import {interfaceUrl} from "@/sysConfig";
import {dicTypeData} from "@/api/unqualProcess";
import {dicTypeData, StandardsInfoPage} from "@/api/unqualProcess";
export default {
name: 'OtherAddEit',
components: {
@@ -607,18 +502,14 @@ export default {
dataSourceOptions: [
{value: 'INLAND_STAND', label: '国内标准法规'},
{value: 'FOREIGN_STAND', label: '海外标准法规'},
{value: 'FOREIGN_LAWS', label: '国内外政策'},
// {value: 'FOREIGN_LAWS', label: '国内外政策'},
// {value: 'BUSINESS', label: '企业标准 '},
{value: 'TEMP', label: '标准法规清单 '}
// {value: 'TEMP', label: '标准法规清单 '}
],
// 新增、编辑 数据搜索字段
sarAccessInfoSearch: {
id: '',
countryArea: '', // 国家
// applicationScope: '', //适用区域
keywords: '', // 关键字
detailedListName: '', //清单名称
applyArctic: '', // 能源种类
standName: '',
askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源
page: 1,
@@ -626,6 +517,17 @@ export default {
validFlag: 0,
advanceSearchVOStr: ''
},
sarAccessInfo: {
id: '',
standName: '',
standNumber: '',
askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
validFlag: 0,
advanceSearchVOStr: ''
},
moreSearchBtn: true, // 多属性搜索按钮 状态
showTableFlag: true, // 显示添加列表 状态
sarAccessInfoSearchList: [], // 数据搜索 table列表数据
@@ -855,6 +757,9 @@ export default {
methods: {
// 高级检索
selectMoreBtn () {
this.showSelectBox = !this.showSelectBox
this.showTableFlag = false
this.selectLawsStands()
},
// 法规维护人树
getDept () {
@@ -945,11 +850,10 @@ export default {
// 点击清空查询条件 按钮事件
clearSearchLaws () {
this.sarAccessInfoSearch.standName = ''
this.sarAccessInfo.standName = ''
this.sarAccessInfo.standNumber = ''
this.sarAccessInfoSearch.advanceSearchVOStr = ''
this.sarAccessInfoSearch.applyArctic = '' // 能源种类
this.sarAccessInfoSearch.keywords = '' // 关键字
this.sarAccessInfoSearch.askType = '' // 监管类型
this.sarAccessInfoSearch.detailedListName = '' // 清单名称
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
this.isListType = false
this.selectLawsStands()
@@ -1278,9 +1182,42 @@ export default {
},
// 查询数据搜索 table 数据
selectLawsStands () {
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, {
_this: this
}, res =>{
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
} else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
}
StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
})
this.drawerTotal = res.data.list.length
}, e => {
})
},
// 高级检索查询按钮
selectBtn() {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
} else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
}
StandardsInfoPage(this.sarAccessInfo).then(res =>{
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
@@ -1288,8 +1225,6 @@ export default {
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
})
this.sarAccessInfoSearchList.forEach(item => {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
@@ -1303,7 +1238,6 @@ export default {
})
this.drawerTotal = res.data.list.length
}, e => {
})
},
// 数据搜索table判断checked状态
@@ -1987,6 +1921,12 @@ export default {
text-align: right;
}
}
.labelBox {
/deep/ .el-form-item__label {
padding-right: 5px;
padding-left: 10px;
}
}
.un-select {
user-select: none;
}
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+81 -126
View File
@@ -65,40 +65,13 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="标准名称" v-if="sarAccessInfoSearch.dataSource !== 'TEMP'" class="search-item">
<el-form-item label="标准名称" class="search-item">
<el-input
v-model="sarAccessInfoSearch.standName"
placeholder="请输入"
:maxlength="100"
></el-input>
</el-form-item>
<el-form-item label="适用车辆类型" class="search-item" v-show="moreSearchShow">
<el-select v-model="sarAccessInfoSearch.applyArctic" filterable clearable>
<el-option
v-for="item in energyKindOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item class="search-item" prop="askType" label="要求类型" v-show="moreSearchShow">
<el-select v-model="sarAccessInfoSearch.askType">
<el-option
v-for="item in accessSarTypeOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="清单名称" prop="detailedListName" class="search-item" v-show="isListType">
<el-input
v-model="sarAccessInfoSearch.detailedListName"
placeholder="请输入"
:maxlength="100"
></el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
@@ -128,54 +101,23 @@
</div>
</div>
<div class="showSelectBox" v-if="!showSelectBox">
<el-form :model="sarAccessInfoSearch" class="label-input-form" label-width="70px" v-if="!disabledFlag" inline>
<el-form-item label="文本状态" v-show="!isListType">
<el-select
v-model="sarAccessInfoSearch.textStatus"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in textStatusOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item label="发布日期" v-show="!isListType">
<el-date-picker
v-model="sarAccessInfoSearch.issueTime"
type="date"
value-format="yyyy-MM-DD"
size="small"
placeholder="选择发布日期">
</el-date-picker>
</el-form-item>
<el-form-item label="项目名称" v-show="isListType">
<el-form :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
<el-form-item label="标准号" class="labelBox">
<el-input
size="small"
v-model="sarAccessInfoSearch.standSystem"
v-model="sarAccessInfo.standNumber"
placeholder="请输入"
:maxlength="100"
></el-input>
size="small"
clearable/>
</el-form-item>
<el-form-item label="更新人" v-show="isListType">
<el-form-item label="标准名称" class="labelBox">
<el-input
v-model="sarAccessInfoSearch.standName"
v-model="sarAccessInfo.standName"
placeholder="请输入"
:maxlength="100"
size="small"/>
</el-form-item>
<el-form-item label="更新时间" v-show="isListType">
<el-date-picker
v-model="sarAccessInfoSearch.modifyTime"
type="date"
size="small"
value-format="yyyy-MM-DD"
placeholder="选择更新日期">
</el-date-picker>
clearable/>
</el-form-item>
<el-form-item>
<el-button size="small" type="primary" @click="selectBtn">查询</el-button>
</el-form-item>
</el-form>
</div>
@@ -227,7 +169,6 @@
<el-table-column
prop="standName"
label="标准名称"
width="260px"
>
</el-table-column>
<el-table-column
@@ -265,46 +206,6 @@
</template>
</el-table-column>
</el-table>
<el-table
v-show="isListType"
:data="sarAccessInfoSearchList"
style="width: 100%"
border
height="300px"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="accessSarTypeSelect"
ref="accessTypeSelect"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="projectName"
label="项目名称"
align="center">
</el-table-column>
<el-table-column
prop="detailedListName"
label="清单名称"
align="center">
</el-table-column>
<el-table-column
prop="modifyTime"
label="更新时间"
align="center">
<template slot-scope="scope">
<div>{{ scope.row.modifyTime ? scope.row.modifyTime.split(' ')[0] : '' }}</div>
</template>
</el-table-column>
<el-table-column
prop="uname"
label="更新人"
align="center">
</el-table-column>
</el-table>
<pagination :page="drawerPage" :total="drawerTotal" @pageChange="drawerPageChange"
@pageSizeChange="drawerPageSizeChange"></pagination>
<loading :loading="dataLoading">{{$t('m.dataAcquisition')}}</loading>
@@ -519,7 +420,7 @@ import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
import stand from "../../../config/pages/attributeCustom/components/stand";
import { mapGetters } from 'vuex'
import {interfaceUrl} from "@/sysConfig";
import {dicTypeData} from "@/api/unqualProcess";
import {dicTypeData, StandardsInfoPage} from "@/api/unqualProcess"
export default {
name: 'OtherAddEit',
components: {
@@ -601,18 +502,25 @@ export default {
dataSourceOptions: [
{value: 'INLAND_STAND', label: '国内标准法规'},
{value: 'FOREIGN_STAND', label: '海外标准法规'},
{value: 'FOREIGN_LAWS', label: '国内外政策'},
// {value: 'FOREIGN_LAWS', label: '国内外政策'},
// {value: 'BUSINESS', label: '企业标准 '},
{value: 'TEMP', label: '标准法规清单 '}
// {value: 'TEMP', label: '标准法规清单 '}
],
// 新增、编辑 数据搜索字段
sarAccessInfoSearch: {
id: '',
countryArea: '', // 国家
// applicationScope: '', //适用区域
keywords: '', // 关键字
detailedListName: '', //清单名称
applyArctic: '', // 能源种类
standName: '',
askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
validFlag: 0,
advanceSearchVOStr: ''
},
sarAccessInfo: {
id: '',
standName: '',
standNumber: '',
askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源
page: 1,
@@ -943,11 +851,10 @@ export default {
// 点击清空查询条件 按钮事件
clearSearchLaws () {
this.sarAccessInfoSearch.standName = ''
this.sarAccessInfo.standName = ''
this.sarAccessInfo.standNumber = ''
this.sarAccessInfoSearch.advanceSearchVOStr = ''
this.sarAccessInfoSearch.applyArctic = '' // 能源种类
this.sarAccessInfoSearch.keywords = '' // 关键字
this.sarAccessInfoSearch.askType = '' // 监管类型
this.sarAccessInfoSearch.detailedListName = '' // 清单名称
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
this.isListType = false
this.selectLawsStands()
@@ -1276,9 +1183,12 @@ export default {
},
// 查询数据搜索 table 数据
selectLawsStands () {
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, {
_this: this
}, res =>{
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
} else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
}
StandardsInfoPage(this.sarAccessInfoSearch, this.sarAccessInfo).then(res =>{
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
@@ -1286,10 +1196,49 @@ export default {
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
})
this.drawerTotal = res.data.list.length
}, e => {
})
},
/** 高级查询查询按钮*/
selectBtn() {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
} else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
}
StandardsInfoPage(this.sarAccessInfo).then(res =>{
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
})
this.drawerTotal = res.data.list.length
}, e => {
})
},
// 数据搜索table判断checked状态
@@ -1987,6 +1936,12 @@ export default {
text-align: right;
}
}
.labelBox {
/deep/ .el-form-item__label {
padding-right: 5px;
padding-left: 10px;
}
}
.un-select {
user-select: none;
}
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+13 -11
View File
@@ -188,22 +188,21 @@
</template>
</el-table-column>
<el-table-column
prop="xcxssrq"
prop="XCXSSRQ"
sortable="custom"
width="150px"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ formatText(scope.row.XCXSSRQ) }}</span>
<span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
</template>
</el-table-column>
<el-table-column
prop="zccssrq"
prop="ZCCSSRQ"
sortable="custom"
width="150px"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ formatText(scope.row.ZCCSSRQ) }}</span>
<span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
</template>
</el-table-column>
<el-table-column
@@ -2516,7 +2515,6 @@ export default {
console.log(item, 'itemitemitemitem')
const formFieldList = this.formFieldList
this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
console.log(item.attrInfoCaseMap, 'gggg大大大滴滴答答')
if(this.sarStandardsInfoEO.standSystem){
this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
}
@@ -2679,10 +2677,11 @@ export default {
},
// 树节点鼠标移入移出
mouseenter(data){
console.log(data)
this.$set(data, 'show', true)
if(data.parentId !== null){
this.$set(data, 'showDel', true)
if(data.menuName !== '我的收藏'){
this.$set(data, 'show', true)
if(data.parentId !== null){
this.$set(data, 'showDel', true)
}
}
},
mouseleave(data){
@@ -2690,6 +2689,7 @@ export default {
this.$set(data, 'showDel', false)
},
treeClick (treeNode) {
console.log(treeNode)
this.selectSarMenu = treeNode
this.standCommonlySearch.menuId = treeNode.id
this.sarStandardsSearch.menuId = treeNode.id // 将当前二级菜单的id传回后台做标准的条件查询
@@ -3431,8 +3431,9 @@ export default {
formData.nowOrder = this.nowOrder
formData.nowOrderBy = this.nowOrderBy
// formData.orderBy = this.orderBy
console.log(this.selectSarMenu.id)
// 处理我的收藏和个性化标签传参
if (this.selectSarMenu.id === 'wdsc') {
if (this.selectSarMenu.menuName === '我的收藏') {
formData.menuId = undefined
formData.labelMenuId = undefined
formData.collectMenuId = 'wdsc'
@@ -3472,6 +3473,7 @@ export default {
}
}
this.stahndinfoList = res.data.list
console.log(this.stahndinfoList)
this.total = res.data.count
if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.sarStandardsSearch.page !== 1) {
this.pageChange(1)
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+17 -16
View File
@@ -184,21 +184,21 @@
</template>
</el-table-column>
<el-table-column
prop="XCXSSRQ"
sortable="custom"
width="150px"
label="新车型实施日期">
prop="XCXSSRQ"
sortable="custom"
width="150px"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ formatText(scope.row.XCXSSRQ) }}</span>
<span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
</template>
</el-table-column>
<el-table-column
prop="ZCCSSRQ"
sortable="custom"
width="150px"
label="在产车实施日期">
prop="ZCCSSRQ"
sortable="custom"
width="150px"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ formatText(scope.row.ZCCSSRQ) }}</span>
<span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
</template>
</el-table-column>
<el-table-column
@@ -2187,7 +2187,7 @@ export default {
type: 'warning'
}).then(() => {
this.$http.delete("sarResource/ts-resource", {
menuId: data.id
resourceId: data.id
}, res => {
}, e => {
if(e.ok){
@@ -2217,10 +2217,11 @@ export default {
},
// 树节点鼠标移入移出
mouseenter(data){
console.log(data)
this.$set(data, 'show', true)
if(data.parentId !== null){
this.$set(data, 'showDel', true)
if(data.menuName !== '我的收藏'){
this.$set(data, 'show', true)
if(data.parentId !== null){
this.$set(data, 'showDel', true)
}
}
},
mouseleave(data){
@@ -2878,7 +2879,7 @@ export default {
formData.nowOrderBy = this.nowOrder ? this.orderBy : ''
formData.nowOrder = this.nowOrder
// 处理我的收藏和个性化标签传参
if (this.selectSarMenu.id === 'wdsc') {
if (this.selectSarMenu.menuName === '我的收藏') {
formData.menuId = undefined
formData.labelMenuId = undefined
formData.collectMenuId = 'wdsc'