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

This commit is contained in:
yanyizhou
2021-08-06 14:05:19 +08:00
45 changed files with 3567 additions and 1184 deletions
+4
View File
@@ -909,4 +909,8 @@ tr.el-table__row{
.button-list {
padding: 5px 0px;
}
.myNewSelect {
backgrounnd: red;
}
+2
View File
@@ -24,6 +24,7 @@ import DeptRoleTree from './deptRoleTree' // 根据部门查询角色
import RoleTree from './roleTree' // 查询所有机构及人员
import SQTree from './SQTree'
import OrgTable from './OrgTable'
import MySelect from './mySelect'
const install = function (Vue) {
Vue.component('loading', Loading)
@@ -48,6 +49,7 @@ const install = function (Vue) {
Vue.component('SQTree', SQTree)
Vue.component('OrgTable', OrgTable)
Vue.component('RoleTree', RoleTree)
Vue.component('MySelect', MySelect)
}
export default {
+105
View File
@@ -0,0 +1,105 @@
<template>
<div id="mySelect">
<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 mySelect" type="text" v-model.lazy="showLabel" readonly="readonly">
</div>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
v-for="(item,index) in options"
:key="index"
:command="item">{{ item.label }}</el-dropdown-item>
</el-dropdown-menu>
<i class="el-icon-arrow-down myIcon"></i>
</el-dropdown>
</div>
</template>
<script>
export default {
name: "mySelect",
data() {
return {
showLabel: '',
activeLi: '',
active: false,
selectVal: ''
}
},
props: {
value: {
type: String,
required: true
},
options: { // option
type: Array,
default: () => {
return []
}
}
},
methods: {
handleCommand (row) {
this.selectVal = row.label
this.showLabel = row.label
this.active = !this.active
this.$emit('update:value', this.selectVal);
}
},
watch: {
value: {
immediate: true,
handler (val) {
this.selectVal = val
for (let a = 0; a < this.options.length; a++) {
if (this.selectVal === this.options[a].value) {
this.showLabel = this.options[a].label
}
}
}
}
},
mounted() {
for (let a = 0; a < this.options.length; a++) {
if (this.selectVal === this.options[a].value) {
this.showLabel = this.options[a].label
}
}
}
}
</script>
<style scoped lang="less">
#mySelect {
}
.active {
background-color: rgb(245, 247, 250);
}
.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
@@ -114,7 +114,9 @@
label="核心技术要求"
align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.technicalRequir" placeholder="请输入核心技术要求" />
<div class="el-input">
<input class="el-input__inner" type="text" v-model.lazy="scope.row.technicalRequir" placeholder="请输入核心技术要求">
</div>
</template>
</el-table-column>
<el-table-column
@@ -123,7 +125,9 @@
label="基于上一版本差异"
align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.changePoint" placeholder="请输入基于上一版本差异" />
<div class="el-input">
<input class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入基于上一版本差异">
</div>
</template>
</el-table-column>
<el-table-column
@@ -133,7 +137,9 @@
label="相对于国行标差异点"
align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.changePoint" placeholder="请输入相对于国行标差异点" />
<div class="el-input">
<input class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入相对于国行标差异点" >
</div>
</template>
</el-table-column>
<el-table-column
@@ -142,10 +148,7 @@
label="符合项状态"
align="center">
<template slot-scope="scope">
<el-select v-model="scope.row.complianceRequir">
<el-option value="1" label="符合" key="1"></el-option>
<el-option value="2" label="不符合" key="2"></el-option>
</el-select>
<My-select v-model="scope.row.complianceRequir" :options="fhList"></My-select>
</template>
</el-table-column>
<el-table-column
@@ -154,7 +157,9 @@
label="合规性分析"
align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.complianceState" placeholder="请输入合规性分析" />
<div class="el-input">
<input class="el-input__inner" type="text" v-model.lazy="scope.row.complianceState" placeholder="请输入合规性分析">
</div>
</template>
</el-table-column>
<el-table-column
@@ -164,7 +169,7 @@
align="center">
<template slot-scope="scope">
<el-date-picker
v-model="scope.row.newData"
v-model.lazy="scope.row.newData"
type="date"
placeholder="选择新车型实施日期">
</el-date-picker>
@@ -177,7 +182,7 @@
align="center">
<template slot-scope="scope">
<el-date-picker
v-model="scope.row.onlineData"
v-model.lazy="scope.row.onlineData"
type="date"
placeholder="选择新车型实施日期">
</el-date-picker>
@@ -189,9 +194,7 @@
label="适用车型"
align="center">
<template slot-scope="scope">
<el-select v-model="scope.row.applyArctic">
<el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
</el-select>
<My-select v-model="scope.row.applyArctic" :options="cxList"></My-select>
</template>
</el-table-column>
<el-table-column
@@ -367,6 +370,16 @@
name: "bzjdStep3",
data() {
return {
fhList: [
{
value: '1',
label: '符合'
},
{
value: '2',
label: '不符合'
}
],
cxList: [],
histortData: [],
plForm: {
@@ -545,9 +558,9 @@
item.changePoint = item.changePoint || ''
item.technicalRequir = item.technicalRequir || ''
item.itemsTitle = item.itermsConditions
item.applyArctic = item.applyArctic || ''
})
this.itemList = itemList
console.log(this.itemList)
this.loading = false
}).catch(e => {
})
@@ -561,6 +574,9 @@
_this: this
}, res => {
this.cxList = res.data.ENERGYTYPES // 适用车型
this.cxList.forEach(item => {
item.value = item.label
})
})
}
}
@@ -120,6 +120,9 @@
align="center"
width="260px"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="issueTime"
@@ -622,6 +625,9 @@
align="center"
label="标准名称"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="issueTime"
@@ -100,6 +100,9 @@
label="标准名称"
width="260px"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="issueTime"
@@ -91,6 +91,9 @@
label="标准名称"
width="260px"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="issueTime"
@@ -120,6 +120,9 @@
align="center"
width="260px"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="issueTime"
@@ -599,6 +602,9 @@
align="center"
label="标准名称"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="issueTime"
@@ -91,6 +91,9 @@
label="标准名称"
width="260px"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="issueTime"
@@ -115,6 +115,9 @@
label="标准名称"
width="260px"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="issueTime"
@@ -323,6 +326,9 @@
align="center"
label="标准名称"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="issueTime"
@@ -91,6 +91,9 @@
label="标准名称"
width="260px"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="issueTime"
@@ -810,7 +810,7 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="修订申请人" placement="top" :color="roleForm.applyUpdUserName ? '#66b1ff' : ''">
<el-timeline-item timestamp="修订申请人" v-if="form.signFlag === '1'" placement="top" :color="roleForm.applyUpdUserName ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="applyUpdUserName" style="margin-bottom: 0">
<h4>修订申请人</h4>
@@ -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
@@ -263,6 +263,9 @@
prop="standName"
label="标准名称"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="issueTime"
@@ -250,6 +250,9 @@
prop="standName"
label="标准名称"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="issueTime"
@@ -62,12 +62,25 @@
width="55"
align="center">
</el-table-column>
<el-table-column
align="center"
width="200px"
label="标准号"
>
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
prop="standName"
align="center"
label="中文名称"
width="180px"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="standEnName"
@@ -75,6 +88,9 @@
align="center"
width="180px"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
</template>
</el-table-column>
<el-table-column
prop="ssrq"
@@ -510,6 +526,17 @@ export default {
},
pageChange(page) {
},
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'INLAND_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
pageSizeChange(pageSize) {
@@ -62,12 +62,25 @@
width="55"
align="center">
</el-table-column>
<el-table-column
align="center"
width="200px"
label="标准号"
>
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
prop="standName"
align="center"
label="中文名称"
width="180px"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="standEnName"
@@ -75,6 +88,9 @@
align="center"
width="180px"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
</template>
</el-table-column>
<el-table-column
prop="ssrq"
@@ -578,6 +594,17 @@ export default {
}
});
},
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'INLAND_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
choiceZRR(type, title, id) {
this.nodeList = [];
this.nodeList.push(id);
@@ -78,6 +78,9 @@
align="center"
label="标准名称"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="itemsNum"
@@ -327,7 +330,6 @@ export default {
methods: {
// 点击查看
handlePreview(item) {
console.log(item)
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
@@ -78,6 +78,9 @@
align="center"
label="标准名称"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="itemsNum"
@@ -325,7 +328,6 @@ export default {
methods: {
// 点击查看
handlePreview(item) {
console.log(item)
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
@@ -78,6 +78,9 @@
align="center"
label="标准名称"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="itemsNum"
@@ -327,7 +330,6 @@ export default {
methods: {
// 点击查看
handlePreview(item) {
console.log(item)
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
@@ -55,12 +55,25 @@
width="55"
align="center">
</el-table-column>
<el-table-column
align="center"
width="200px"
label="标准号"
>
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
prop="standName"
align="center"
label="中文名称"
width="180px"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="standEnName"
@@ -68,6 +81,9 @@
align="center"
width="180px"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
</template>
</el-table-column>
<el-table-column
prop="ssrq"
@@ -284,6 +300,17 @@ export default {
handleTabs(type) {
this.active = type;
},
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'INLAND_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
//获取数据
getData() {
return new Promise((resolve, reject) => {
@@ -82,12 +82,18 @@
align="center"
label="中文名称"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="standEnName"
label="英文名称"
align="center"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
</template>
</el-table-column>
<el-table-column
prop="ssrq"
@@ -79,12 +79,18 @@
align="center"
label="中文名称"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="standEnName"
label="英文名称"
align="center"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
</template>
</el-table-column>
<el-table-column
prop="ssrq"
@@ -79,6 +79,9 @@
prop="standName"
label="标准名称"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="itemsNum"
@@ -255,7 +258,6 @@ export default {
methods: {
//
handlePreview(item) {
console.log(item)
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
@@ -79,6 +79,9 @@
align="center"
label="标准名称"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="itemsNum"
@@ -78,6 +78,9 @@
align="center"
label="标准名称"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="itemsNum"
@@ -78,6 +78,9 @@
align="center"
label="标准名称"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="itemsNum"
@@ -327,7 +330,6 @@ export default {
methods: {
//
handlePreview(item) {
console.log(item)
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
@@ -78,6 +78,9 @@
align="center"
label="标准名称"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="itemsNum"
@@ -327,7 +330,6 @@ export default {
methods: {
//
handlePreview(item) {
console.log(item)
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
@@ -165,7 +165,6 @@
<div class="process-box">
</div>
</div>
</div>
</template>
<script>
@@ -350,6 +349,7 @@ export default {
border-radius: 10px;
}
.card-box {
cursor: pointer;
.card-top {
width: 100%;
background: #2d8cf0;
@@ -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 {
@@ -3118,6 +3118,7 @@ export default {
formData.collectMenuId = undefined
}
formData.standType = 'FOREIGN'
formData.userId = this.$store.getters.userInfo.userId
this.SarExportSearchEo = formData
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
_this: this, loading: 'loading'
@@ -246,6 +246,10 @@
prop="standName"
label="标准名称"
>
<template slot-scope="scope">
<a class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="issueTime"
@@ -188,7 +188,7 @@
label="相对于国行标差异点">
</el-table-column>
<el-table-column
prop="carModel"
prop="complianceState"
label="合规性分析">
</el-table-column>
</el-table-column>
File diff suppressed because it is too large Load Diff
+1
View File
@@ -1708,6 +1708,7 @@ const routes = [
meta: {
requireAuth: true,
title: '征求意见详情',
parentPath: '/standardForComments',
// isBoolean: true,
// menuId: ''
}
+1 -1
View File
@@ -6,7 +6,7 @@
// 服务器地址
// const devIp = '10.96.10.171'
// const devInterfacePORT = '9999'
const devIp = '192.168.0.104'
const devIp = '10.96.170.156'
const devInterfacePORT = '9999'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'