Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
super_liu
2021-08-06 14:02:27 +08:00
14 changed files with 278 additions and 207 deletions
+27 -62
View File
@@ -3,7 +3,7 @@
<el-dropdown placement="bottom" @command="handleCommand" trigger="click">
<div class="my-select-input__wrap">
<input class="el-input__inner" type="text" v-model.lazy="selectVal" v-show="false">
<input class="el-input__inner" type="text" v-model.lazy="showLabel" readonly="readonly">
<input class="el-input__inner mySelect" type="text" v-model.lazy="showLabel" readonly="readonly">
</div>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
@@ -11,6 +11,7 @@
:key="index"
:command="item">{{ item.label }}</el-dropdown-item>
</el-dropdown-menu>
<i class="el-icon-arrow-down myIcon"></i>
</el-dropdown>
</div>
</template>
@@ -76,65 +77,29 @@
.active {
background-color: rgb(245, 247, 250);
}
/*ul {*/
/* position: absolute;*/
/* z-index: 9999;*/
/* background-color: rgb(255, 255, 255);*/
/* box-shadow: rgba(0, 0, 0, 0.1) 0px 2px 12px 0px;*/
/* box-sizing: border-box;*/
/* border-width: 1px;*/
/* border-style: solid;*/
/* border-color: rgb(228, 231, 237);*/
/* border-image: initial;*/
/* border-radius: 4px;*/
/* box-sizing: border-box;*/
/* list-style: none;*/
/* padding: 6px 0px;*/
/* margin: 0px;*/
/* display: block;*/
/* list-style-type: disc;*/
/* margin-block-start: 1em;*/
/* margin-block-end: 1em;*/
/* margin-inline-start: 0px;*/
/* margin-inline-end: 0px;*/
/* width: 100%;*/
/* li {*/
/* list-style:none;*/
/* height: 34px;*/
/* line-height: 34px;*/
/* padding: 0 20px;*/
/* }*/
/* li:hover {*/
/* background-color: rgb(245, 247, 250);*/
/* }*/
/*}*/
/*.mySelect {*/
/* width: 100%;*/
/* position: relative;*/
/* option {*/
/* height: 34px;*/
/* line-height: 34px;*/
/* padding: 0 20px;*/
/* }*/
/*}*/
/*.mySelect:focus + .myIcon{*/
/* transform:rotate(180deg);*/
/* -ms-transform:rotate(180deg); !* IE 9 *!*/
/* -moz-transform:rotate(180deg); !* Firefox *!*/
/* -webkit-transform:rotate(180deg); !* Safari 和 Chrome *!*/
/* -o-transform:rotate(180deg);*/
/*}*/
/*.mySelect:focus-within + .myIcon{*/
/* transform:rotate(180deg);*/
/* -ms-transform:rotate(180deg); !* IE 9 *!*/
/* -moz-transform:rotate(180deg); !* Firefox *!*/
/* -webkit-transform:rotate(180deg); !* Safari 和 Chrome *!*/
/* -o-transform:rotate(180deg);*/
/*}*/
/*.myIcon {*/
/* position: absolute;*/
/* right: 7px;*/
/* top: calc(~'50% - 7px');*/
/* transition: all .3s;*/
/*}*/
.mySelect {
width: 100%;
position: relative;
}
.mySelect:focus + .myIcon{
transform:rotate(180deg);
-ms-transform:rotate(180deg); /* IE 9 */
-moz-transform:rotate(180deg); /* Firefox */
-webkit-transform:rotate(180deg); /* Safari 和 Chrome */
-o-transform:rotate(180deg);
}
.mySelect:focus-within + .myIcon{
transform:rotate(180deg);
-ms-transform:rotate(180deg); /* IE 9 */
-moz-transform:rotate(180deg); /* Firefox */
-webkit-transform:rotate(180deg); /* Safari 和 Chrome */
-o-transform:rotate(180deg);
}
.myIcon {
cursor: pointer;
position: absolute;
right: 7px;
top: calc(~'50% - 7px');
transition: all .3s;
}
</style>
@@ -353,7 +353,7 @@ export default {
showRegionId: '',
selVal: '',
isSearch: '1',
sarType: '',
sarType: 'STAND',
isWarn: '1'
},
attrTypeOptions: [
@@ -561,7 +561,7 @@ export default {
queryDisplayLocationList (sarType) {
return new Promise((resolve, reject) => {
this.$http.get('lawssBase/utArea/getAreaList', {
sarType: 'INLAND_STAND'
sarType: sarType
}, {
_this: this
}, res => {
@@ -51,12 +51,20 @@
prop="showNumber"
label="标准号/政策号"
align="center">
<template slot-scope="scope">
<a class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.showNumber }}</a>
</template>
</el-table-column>
<el-table-column
prop="standName"
label="标准名称/政策名称"
show-overflow-tooltip
align="center">
<template slot-scope="scope">
<a class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="fileTypeShow"
@@ -800,6 +808,17 @@ export default {
this.conditionForm.pageSize = pageSize
this.getSearch()
},
//点击查看详情
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'INLAND_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
// 查询政策和标准
getSearch () {
if (this.conditionForm.standType === 'FOREIGN2') {
@@ -57,8 +57,8 @@
label="标准号/政策号"
align="center">
<template slot-scope="scope">
<div v-if="scope.row.standId != null && scope.row.standId !== ''">{{scope.row.showNumber}}</div>
<div v-else>{{scope.row.standNumSplit}}</div>
<a class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.showNumber }}</a>
</template>
</el-table-column>
<el-table-column
@@ -66,8 +66,8 @@
label="标准名称/政策名称"
align="center">
<template slot-scope="scope">
<div v-if="scope.row.standId != null && scope.row.standId !== ''">{{scope.row.standName}}</div>
<div v-else>{{scope.row.standNameSplit}}</div>
<a class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
@@ -146,8 +146,8 @@
label="标准号/政策号"
align="center">
<template slot-scope="scope">
<div v-if="scope.row.standId != null && scope.row.standId !== ''">{{scope.row.showNumber}}</div>
<div v-else>{{scope.row.standNumSplit}}</div>
<a class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.showNumber }}</a>
</template>
</el-table-column>
<el-table-column
@@ -155,8 +155,8 @@
label="标准名称/政策名称"
align="center">
<template slot-scope="scope">
<div v-if="scope.row.standId != null && scope.row.standId !== ''">{{scope.row.standName}}</div>
<div v-else>{{scope.row.standNameSplit}}</div>
<a class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
@@ -266,6 +266,17 @@ export default {
// this.selectedSplitStandList2 = []
// this.selectedSplitStandList2.push(this.addSpiltStandList2[0])
},
//点击查看详情
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'INLAND_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
// 条款比对
addStandCompareHis () {
return new Promise((resolve, reject) => {
@@ -235,8 +235,7 @@
width="170"
align="center">
<!-- <template slot-scope="scope">-->
<!-- <div v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNumSplit }}</div>-->
<!-- <div v-else>{{ scope.row.showNumber }}</div>-->
<!-- <div @click="showUser(scope.row)" class="table-jump">{{ scope.row.showNumber }}</div>-->
<!-- </template>-->
</el-table-column>
<el-table-column
@@ -245,8 +244,7 @@
show-overflow-tooltip
align="center">
<!-- <template slot-scope="scope">-->
<!-- <span v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNameSplit }}</span>-->
<!-- <span v-else>{{ scope.row.standName }}</span>-->
<!-- <span @click="showUser(scope.row)" class="table-jump">{{ scope.row.standName }}</span>-->
<!-- </template>-->
</el-table-column>
<el-table-column
@@ -459,6 +457,24 @@
ProcessTitle
},
methods: {
showUser (row) {
let routeUrl = this.$router.resolve({
name: 'ItemSplitInfo',
query: {
infoId: row.id,
result: row.result,
}
})
window.open(routeUrl.href, '_blank')
// this.$store.commit('setDetailMap', this.$route.path)
// this.$router.push({
// name: 'ItemSplitInfo',
// query: {
// infoId: row.id,
// result: row.result,
// }
// })
},
setMap(data){
data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label)
@@ -272,14 +272,14 @@
choiceZRRS (row, type, index) {
this.type = type
if (type === 1) {
this.drawerTitle = '选择责任部门对接人'
this.drawerTitle = '选择执行人'
this.nodeList2 = []
this.zxIndex= index
this.nodeList2.push(row)
this.modalshowflag2 = true
} else {
// 批量
this.drawerTitle = '批量选择责任部门对接人'
this.drawerTitle = '批量选择执行人'
if (this.zxIdList.length > 0) {
this.nodeList2 = []
this.modalshowflag2 = true
@@ -220,13 +220,13 @@
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="标准号" align="center">
<template slot-scope="scope">
<div v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</div>
<div v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</div>
<div v-if="scope.row.standYear" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</div>
<div v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</div>
</template>
</el-table-column>
<el-table-column prop="cname" label="标准名称" align="center">
<template slot-scope="scope">
<div>{{ scope.row.standName }}</div>
<div @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</div>
</template>
</el-table-column>
</el-table>
@@ -361,6 +361,23 @@
}
},
methods: {
// 点击查看
handlePreview (item) {
let pageType
if (item.standType === 'FOREIGN') {
pageType = 'FOREIGN_STAND'
} else {
pageType = 'INLAND_STAND'
}
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.id,
pageType: pageType
}
})
window.open(routeUrl.href, '_blank')
},
getData () {
queryTaskFirst({
bpnId: this.$route.query.bpnId
@@ -221,13 +221,13 @@
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="标准号" align="center">
<template slot-scope="scope">
<div v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</div>
<div v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</div>
<div v-if="scope.row.standYear" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</div>
<div v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</div>
</template>
</el-table-column>
<el-table-column prop="cname" label="标准名称" align="center">
<template slot-scope="scope">
<div>{{ scope.row.standName }}</div>
<div @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</div>
</template>
</el-table-column>
</el-table>
@@ -361,6 +361,23 @@ export default {
}
},
methods: {
// 点击查看
handlePreview (item) {
let pageType
if (item.standType === 'FOREIGN') {
pageType = 'FOREIGN_STAND'
} else {
pageType = 'INLAND_STAND'
}
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.id,
pageType: pageType
}
})
window.open(routeUrl.href, '_blank')
},
addZqyjList() {
this.title = '国内外标准库'
this.listModel = true
@@ -119,13 +119,15 @@
<el-form :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
<el-form-item label="标准号" class="labelBox">
<el-input
style="width: 165px"
v-model="sarAccessInfo.standNumber"
placeholder="请输入"
size="small"
clearable/>
</el-form-item>
<el-form-item label="标准名称" class="labelBox">
<el-form-item label="标准名称" class="labelBox1">
<el-input
style="width: 165px"
v-model="sarAccessInfo.standName"
placeholder="请输入"
size="small"
@@ -2175,7 +2177,12 @@ export default {
.labelBox {
/deep/ .el-form-item__label {
padding-right: 5px;
padding-left: 10px;
padding-left: 15px;
}
}
.labelBox1 {
/deep/ .el-form-item__label {
padding-right: 5px;
}
}
.un-select {
@@ -57,7 +57,6 @@
</el-form-item>
<el-form-item label="责任部门" class="search-item" prop="responseUnit">
<el-select
class="showBox"
v-model="standardForm.zrbm"
placeholder="请选择"
filterable
@@ -86,102 +85,11 @@
icon="export"
>导出
</el-button>
<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">
<el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn">
<i class="iconfont">&#xe7a5;</i>
高级查询
</el-button>
</el-form>
<div v-if="!showSelectBox">
<el-form :model="standardFormList" class="label-input-form" label-width="108px" inline>
<el-row>
<el-col :span="24">
<el-form-item label="中文名称" class="search-item">
<el-input
v-model="standardFormList.standName"
placeholder="请输入"
:maxlength="100"
size="small"
/>
</el-form-item>
<el-form-item label="适用车型" class="labelBox" label-width="61px">
<el-select
class="showBox"
v-model="standardFormList.typeApplicable"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in applyArcticOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item label="能源类型" label-width="68px" >
<el-select
class="showBox"
v-model="standardFormList.nylx"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in categoryOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="责任部门" class="labelBox" label-width="108px" >
<el-select
class="showBox"
v-model="standardFormList.zrbm"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in zrbmOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item label="适用产品线" label-width="86px" >
<el-select
class="showBox"
v-model="standardFormList.sycpx"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in sycpxOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<div style="padding-left: 110px">
<el-form-item>
<el-button type="primary" size="small" style="width: 100px" @click="selectSuper">确认</el-button>
</el-form-item>
</div>
</el-col>
</el-row>
</el-form>
</div>
</div>
</div>
<div class="container" style="position:relative;">
@@ -358,6 +266,101 @@
</div>
</el-dialog>
<el-drawer
title="高级搜索"
size="700px"
:wrapperClosable="false"
:visible.sync="isAdvancedSearch">
<div class="demo-drawer-content">
<el-form :model="standardFormList" class="labelForm" label-position="right" label-width="100px">
<el-form-item label="中文名称" >
<el-input
class="showBox"
v-model="standardFormList.standName"
placeholder="请输入"
:maxlength="100"
size="small"
/>
</el-form-item>
<el-form-item label="适用车型" >
<el-select
class="showBox"
v-model="standardFormList.typeApplicable"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in applyArcticOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item label="能源类型" >
<el-select
class="showBox"
v-model="standardFormList.nylx"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in categoryOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item label="责任部门" >
<el-select
class="showBox"
v-model="standardFormList.zrbm"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in zrbmOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item label="适用产品线" >
<el-select
class="showBox"
v-model="standardFormList.sycpx"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in sycpxOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
</el-form>
</div>
<div class="demo-drawer-footer">
<el-button
size="small"
icon="el-icon-check"
type="primary"
@click="queryInfo">搜索</el-button>
<el-button
size="small"
icon="el-icon-close"
@click="backInfo">取消</el-button>
</div>
</el-drawer>
<loading :loading="dataLoading">{{ $t("m.dataAcquisition") }}</loading>
</div>
</template>
@@ -368,6 +371,7 @@ export default {
name: "AccessStandardDetails",
data() {
return {
isAdvancedSearch: false,
// 高级检索状态
showSelectBox: true,
textStatusMap: {},
@@ -519,11 +523,6 @@ export default {
// this.$router.push(this.$store.state.detailMap)
// this.$store.commit('setDetailMap', '')
},
selectSuper() {
this.page = 1;
this.standardForm.page = 1;
this.selectInfoMore();
},
// 搜索
selectProductBtn() {
this.page = 1;
@@ -535,11 +534,6 @@ export default {
this.standardForm.zrbm = ''
this.standardForm.standName = ''
this.standardForm.responseUnit = ''
this.standardFormList.standName = ''
this.standardFormList.typeApplicable = ''
this.standardFormList.nylx = ''
this.standardFormList.zrbm = ''
this.standardFormList.sycpx = ''
this.selectInfobyAccid()
this.selectInfoMore()
},
@@ -701,18 +695,31 @@ export default {
* 高级检索
*/
selectMoreBtn() {
this.showSelectBox = !this.showSelectBox
this.isAdvancedSearch = true
this.standardFormList.standName = ''
this.standardFormList.typeApplicable = ''
this.standardFormList.nylx = ''
this.standardFormList.zrbm = ''
this.standardFormList.sycpx = ''
this.showTableFlag = false
if (!this.showSelectBox) {
// this.standardForm = {}
// this.standardForm.issueTime = ''
// this.standardForm.textStatus = ''
// this.standardForm.modifyTime = ''
}
this.page = 1
this.standardForm.page = 1
this.selectInfoMore()
},
queryInfo() {
this.page = 1;
this.standardForm.page = 1;
this.selectInfoMore();
this.isAdvancedSearch = false
},
backInfo() {
this.standardFormList.standName = ''
this.standardFormList.typeApplicable = ''
this.standardFormList.nylx = ''
this.standardFormList.zrbm = ''
this.standardFormList.sycpx = ''
this.isAdvancedSearch = false
},
// 获取工作组信息下拉框信息
getGzzOption() {
this.$http.get("lawss/sarGroupMenu/queryGroup", "", {
@@ -927,10 +934,8 @@ export default {
}
}
}
.labelBox {
/deep/ .el-form-item__label {
padding-right: 5px;
}
.labelForm {
margin-top: 20px;
}
/deep/ .relateClass {
& > button {
@@ -964,7 +969,7 @@ export default {
}
/deep/.showBox{
width: 165px;
width: 300px;
}
.iconClass {
width: 18px;
@@ -989,7 +994,6 @@ export default {
cursor: pointer
}
}
.relateClass {
.el-dialog__body {
max-height: 460px;
@@ -104,13 +104,15 @@
<el-form :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
<el-form-item label="标准号" class="labelBox">
<el-input
style="width: 165px"
v-model="sarAccessInfo.standNumber"
placeholder="请输入"
size="small"
clearable/>
</el-form-item>
<el-form-item label="标准名称" class="labelBox">
<el-form-item label="标准名称" class="labelBox1">
<el-input
style="width: 165px"
v-model="sarAccessInfo.standName"
placeholder="请输入"
size="small"
@@ -2155,7 +2157,12 @@ export default {
.labelBox {
/deep/ .el-form-item__label {
padding-right: 5px;
padding-left: 10px;
padding-left: 23px;
}
}
.labelBox1 {
/deep/ .el-form-item__label {
padding-right: 5px;
}
}
.un-select {
@@ -104,13 +104,15 @@
<el-form :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
<el-form-item label="标准号" class="labelBox">
<el-input
style="width: 165px;"
v-model="sarAccessInfo.standNumber"
placeholder="请输入"
size="small"
clearable/>
</el-form-item>
<el-form-item label="标准名称" class="labelBox">
<el-form-item label="标准名称" class="labelBox1">
<el-input
style="width: 165px"
v-model="sarAccessInfo.standName"
placeholder="请输入"
size="small"
@@ -2158,7 +2160,12 @@ export default {
.labelBox {
/deep/ .el-form-item__label {
padding-right: 5px;
padding-left: 10px;
padding-left: 23px;
}
}
.labelBox1 {
/deep/ .el-form-item__label {
padding-right: 5px;
}
}
.un-select {
@@ -188,7 +188,7 @@
label="相对于国行标差异点">
</el-table-column>
<el-table-column
prop="carModel"
prop="complianceState"
label="合规性分析">
</el-table-column>
</el-table-column>
+1
View File
@@ -1708,6 +1708,7 @@ const routes = [
meta: {
requireAuth: true,
title: '征求意见详情',
parentPath: '/standardForComments',
// isBoolean: true,
// menuId: ''
}