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:
宋伟佳
2021-08-12 15:50:49 +08:00
parent 338408823c c2ff22256c
commit 4c999305ea
14 changed files with 975 additions and 1041 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+810 -784
View File
File diff suppressed because it is too large Load Diff
src/pages/home1/components/release/index.vue
+1 -1
View File
@@ -4,7 +4,7 @@
<ul>
<li v-for="item in standardReleaseList" :key="item.id" class="time-title">
<a @click="handlePreview(item)" class="table-jump">{{ item.standName }}</a>
<span class="time">{{ getDate(item.issueTime) }}</span>
<span class="time">{{item.issueTime }}</span>
</li>
</ul>
</div>
src/pages/localTool/standAutoSplit/index.vue
+15 -2
View File
@@ -77,6 +77,18 @@
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="splitStatus"
label="拆分状态"
align="center">
<template slot-scope="scope">
<span v-if="scope.row.splitStatus == '0'">编辑中</span>
<span v-else-if="scope.row.splitStatus == '1'">审核中</span>
<span v-else-if="scope.row.splitStatus == '2'">已关联</span>
<span v-else-if="scope.row.splitStatus == '3'">解读中</span>
<span v-else>已完成</span>
</template>
</el-table-column>
<el-table-column
prop="creationTime"
label="拆分时间"
@@ -822,7 +834,7 @@ export default {
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'INLAND_STAND'
pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
@@ -833,7 +845,7 @@ export default {
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: item.sarType + '_STAND'
pageType: item.sarType + '_STAND',
}
})
window.open(routeUrl.href, '_blank')
@@ -1369,6 +1381,7 @@ export default {
query: {
infoId: row.id,
result: row.result,
splitStatus: row.splitStatus
}
})
},
src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+3 -2
View File
@@ -97,7 +97,8 @@
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '属性']" v-btn-permission="''">属性</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '编辑', scope.$index]" v-btn-permission="''">编辑</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '编辑', scope.$index]" v-if="splitStatus === '4'" v-btn-permission="''">编辑</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '编辑', scope.$index]" v-else :disabled="true" v-btn-permission="''">编辑</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '复制']" v-btn-permission="''">复制</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>
</el-dropdown-menu>
@@ -685,6 +686,7 @@ export default {
},
data () {
return {
splitStatus: this.$route.query.splitStatus,
auditFlag: this.$route.query.auditFlag,
splitCheckDialog: false,
submitLoading: false,
@@ -1306,7 +1308,6 @@ export default {
if (cur[i].pId == null || cur[i].pId === '') {
this.parentNode = cur[i]
}
console.log(str);
this.zNodes = str
}
// 查完左侧目录后，如果没有选中的，设置最外层选中
src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+1 -1
View File
@@ -208,7 +208,7 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail} from 'api/process'
import {inboundLiaisonDetail,saveTaskForPub} from 'api/process'
export default {
name: "bzdyStep5",
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+4
View File
@@ -388,6 +388,7 @@
sarType: '',
loading: false,
standId: '',
statusId: '',
commentText: '',
textarea: '', // 意见
title: '', // 新增抽屉标题
@@ -401,6 +402,7 @@
itemsNum: '',
itemsName: '',
standId: '',
statusId: '',
itemsNum1: '',
itemsName1: '',
oldNumber: ''
@@ -622,6 +624,8 @@
this.form.standId = bringData[0].standId
this.sarType = bringData[0].standType
this.standId = bringData[0].standId
this.statusId = bringData[0].id
this.form.statusId = bringData[0].id
this.listModel = false;
this.listModel2 = true
this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+4
View File
@@ -388,6 +388,7 @@
sarType: '',
loading: false,
standId: '',
statusId: '',
commentText: '',
textarea: '', // 意见
title: '', // 新增抽屉标题
@@ -401,6 +402,7 @@
itemsNum: '',
itemsName: '',
standId: '',
statusId: '',
itemsNum1: '',
itemsName1: '',
oldNumber: ''
@@ -627,6 +629,8 @@
this.form.standId = bringData[0].standId
this.sarType = bringData[0].standType
this.standId = bringData[0].standId
this.statusId = bringData[0].id
this.form.statusId = bringData[0].id
this.listModel = false;
this.listModel2 = true
this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+33 -77
View File
@@ -304,11 +304,14 @@
label="能源类型">
</el-table-column>
<el-table-column
prop="putTime"
prop="ssrq"
sortable
align="center"
width="210px"
label="标准实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -458,7 +461,7 @@
</el-form-item>
<el-form-item label="标准实施日期" prop="putTime">
<el-date-picker
v-model.trim="editRowData.putTime"
v-model.trim="editRowData.ssrq"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
@@ -582,7 +585,7 @@ export default {
standEnName: '',
typeApplicable: '',
nylx: '',
putTime: '',
ssrq: '',
zccssrqgj: '',
xcxssrqgj: '',
zrbm: '',
@@ -1108,66 +1111,6 @@ export default {
}
]
// 国内外政策可查字段
}else if (val === 'FOREIGN_LAWS'){
this.twoOptions=[
{
label: '适用车辆类型',
value: 'SYCLLX',
type: 'SEL_OPTION',
disabled: false
}, {
label: '政策编号',
value: 'LAWS_NUMBER',
type: 'INPUT',
disabled: false
}, {
label: '中文名称',
value: 'LAWS_NAME',
type: 'INPUT',
disabled: false
}, {
label: '英文名称',
value: 'LAWS_EN_NAME',
type: 'INPUT',
disabled: false
}, {
label: '个性化标签',
value: 'GXHBQXX',
type: 'SEL_OPTION',
disabled: false
}, {
label: '新车型实施日期(文本)',
value: 'XCXSSRQ',
type: 'DATE_PIC_OPTS',
disabled: false
}, {
label: '在产车实施日期(文本)',
value: 'ZCCSSRQ',
type: 'DATE_PIC_OPTS',
disabled: false
}, {
label: '维护工程师',
value: 'ZCGCS',
type: 'SEL_OPTION',
selVal: "USERLIST",
disabled: false
}
]
// 标准法规清单可查字段
}else {
this.twoOptions=[
{
label: '清单名称',
value: 'ACCESS_CONTENT',
type: 'INPUT',
disabled: false
}, {
label: '国家地区',
value: 'COUNTRY',
type: 'SEL_OPTION',
disabled: false
}
]
}
},
/**
@@ -1305,10 +1248,10 @@ export default {
let rowlist3 = []
for (let i = 0; i < this.sarAccessInfoList.length; i++) {
rowlist.push(this.sarAccessInfoList[i].id)
if (this.sarAccessInfoList[i].putTime === null) {
rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
if (this.sarAccessInfoList[i].ssrq === null) {
rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
}else {
rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
}
if (this.sarAccessInfoList[i].xcxssrqgj === null) {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
@@ -1382,14 +1325,7 @@ export default {
}
})
},
// 查询数据搜索 table 数据
selectLawsStands () {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
this.sarAccessInfoSearch.standType = ''
} else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
}
pageInfo() {
StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
@@ -1402,6 +1338,7 @@ export default {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'ssrq', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
this.$set(item, 'zrbm', '')
@@ -1413,6 +1350,7 @@ export default {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
@@ -1426,12 +1364,18 @@ export default {
}, e => {
})
},
selectBtn() {
// 查询数据搜索 table 数据
selectLawsStands () {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
this.sarAccessInfoSearch.standType = 'INLAND'
this.pageInfo()
} else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
this.pageInfo()
}
},
selectPage() {
StandardsInfoPage(this.sarAccessInfo).then(res =>{
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
@@ -1443,6 +1387,7 @@ export default {
if (item.attrInfoMap === null) {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'ssrq', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
@@ -1454,6 +1399,7 @@ export default {
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1468,6 +1414,15 @@ export default {
}, e => {
})
},
selectBtn() {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.standType = 'INLAND'
this.selectPage()
} else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
this.selectPage()
}
},
// 数据搜索table判断checked状态
selectable (row) {
return row.isRelateAccess === '1'
@@ -1479,6 +1434,7 @@ export default {
if (item.attrInfoMap === null) {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'ssrq', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
@@ -1490,6 +1446,7 @@ export default {
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1578,7 +1535,6 @@ export default {
},
// 导出确定功能
exportTestItem () {
let exportNames = this.exportName
let exportList = []
if (this.sarAccessInfoListArry.length > 0) {
exportList = this.sarAccessInfoListArry
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+7 -12
View File
@@ -150,11 +150,17 @@
label="能源类型">
</el-table-column>
<el-table-column
prop="putTime"
prop="ssrq"
sortable
align="center"
width="210px"
label="标准实施日期">
<template slot-scope="scope">
<span v-if="scope.row.ssrq === null">
{{ scope.row.ssrq }}
</span>
<span v-else>{{ scope.row.ssrq.slice(0, 10) }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -757,11 +763,6 @@ export default {
setMap(data){
data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label)
this.$set(this.typeApplicableMap, item.value, item.label)
this.$set(this.nylxMap, item.value, item.label)
this.$set(this.zrbmMap, item.value, item.label)
this.$set(this.sycpxMap, item.value, item.label)
this.$set(this.countryAreaMap, item.value, item.label)
})
}
},
@@ -797,12 +798,6 @@ export default {
this.textStatusOptions = res.data.WBZTCLASS
this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
this.setMap(this.textStatusOptions)
this.setMap(this.zrbmOptions)
this.setMap(this.categoryOptions)
this.setMap(this.sycpxOptions)
this.setMap(this.energyKindOptions)
this.setMap(this.drawerCountryOptions)
this.setMap(this.applyArcticOptions)
this.getGzzOption();
}, e => {
});
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+34 -78
View File
@@ -288,11 +288,14 @@
label="能源类型">
</el-table-column>
<el-table-column
prop="putTime"
prop="ssrq"
sortable
align="center"
width="210px"
label="标准实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -440,9 +443,9 @@
<el-form-item label="能源类型" prop="nylx">
<el-input v-model.trim="editRowData.nylx" :disabled="true"/>
</el-form-item>
<el-form-item label="标准实施日期" prop="putTime">
<el-form-item label="标准实施日期" prop="ssrq">
<el-date-picker
v-model.trim="editRowData.putTime"
v-model.trim="editRowData.ssrq"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
@@ -566,7 +569,7 @@ export default {
standEnName: '',
typeApplicable: '',
nylx: '',
putTime: '',
ssrq: '',
zccssrqgj: '',
xcxssrqgj: '',
zrbm: '',
@@ -1076,66 +1079,6 @@ export default {
}
]
// 国内外政策可查字段
}else if (val === 'FOREIGN_LAWS'){
this.twoOptions=[
{
label: '适用车辆类型',
value: 'SYCLLX',
type: 'SEL_OPTION',
disabled: false
}, {
label: '政策编号',
value: 'LAWS_NUMBER',
type: 'INPUT',
disabled: false
}, {
label: '中文名称',
value: 'LAWS_NAME',
type: 'INPUT',
disabled: false
}, {
label: '英文名称',
value: 'LAWS_EN_NAME',
type: 'INPUT',
disabled: false
}, {
label: '个性化标签',
value: 'GXHBQXX',
type: 'SEL_OPTION',
disabled: false
}, {
label: '新车型实施日期(文本)',
value: 'XCXSSRQ',
type: 'DATE_PIC_OPTS',
disabled: false
}, {
label: '在产车实施日期(文本)',
value: 'ZCCSSRQ',
type: 'DATE_PIC_OPTS',
disabled: false
}, {
label: '维护工程师',
value: 'ZCGCS',
type: 'SEL_OPTION',
selVal: "USERLIST",
disabled: false
}
]
// 标准法规清单可查字段
}else {
this.twoOptions=[
{
label: '清单名称',
value: 'ACCESS_CONTENT',
type: 'INPUT',
disabled: false
}, {
label: '国家地区',
value: 'COUNTRY',
type: 'SEL_OPTION',
disabled: false
}
]
}
},
/**
@@ -1274,10 +1217,10 @@ export default {
let rowlist3 = []
for (let i = 0; i < this.sarAccessInfoList.length; i++) {
rowlist.push(this.sarAccessInfoList[i].id)
if (this.sarAccessInfoList[i].putTime === null) {
rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
if (this.sarAccessInfoList[i].ssrq === null) {
rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
}else {
rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
}
if (this.sarAccessInfoList[i].xcxssrqgj === null) {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
@@ -1350,14 +1293,7 @@ export default {
}
})
},
// 查询数据搜索 table 数据
selectLawsStands () {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
this.sarAccessInfoSearch.standType = ''
} else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
}
pageInfo() {
StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
@@ -1369,6 +1305,7 @@ export default {
if (item.attrInfoMap === null) {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'ssrq', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
@@ -1380,6 +1317,7 @@ export default {
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1394,13 +1332,17 @@ export default {
}, e => {
})
},
// 高级检索查询按钮
selectBtn() {
// 查询数据搜索 table 数据
selectLawsStands () {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
this.sarAccessInfoSearch.standType = 'INLAND'
this.pageInfo()
} else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
this.pageInfo()
}
},
selectPage() {
StandardsInfoPage(this.sarAccessInfo).then(res =>{
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
@@ -1412,6 +1354,7 @@ export default {
if (item.attrInfoMap === null) {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'ssrq', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
@@ -1423,6 +1366,7 @@ export default {
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1437,6 +1381,16 @@ export default {
}, e => {
})
},
// 高级检索查询按钮
selectBtn() {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.standType = 'INLAND'
this.selectPage()
} else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
this.selectPage()
}
},
// 数据搜索table判断checked状态
selectable (row) {
return row.isRelateAccess === '1'
@@ -1448,6 +1402,7 @@ export default {
if (item.attrInfoMap === null) {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'ssrq', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
@@ -1459,6 +1414,7 @@ export default {
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+33 -77
View File
@@ -288,11 +288,14 @@
label="能源类型">
</el-table-column>
<el-table-column
prop="putTime"
prop="ssrq"
sortable
align="center"
width="210px"
label="标准实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -439,9 +442,9 @@
<el-form-item label="能源类型" prop="nylx">
<el-input v-model.trim="editRowData.nylx" :disabled="true"/>
</el-form-item>
<el-form-item label="标准实施日期" prop="putTime">
<el-form-item label="标准实施日期" prop="ssrq">
<el-date-picker
v-model.trim="editRowData.putTime"
v-model.trim="editRowData.ssrq"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
@@ -580,7 +583,7 @@ export default {
standEnName: '',
typeApplicable: '',
nylx: '',
putTime: '',
ssrq: '',
zccssrqgj: '',
xcxssrqgj: '',
zrbm: '',
@@ -1076,66 +1079,6 @@ export default {
}
]
// 国内外政策可查字段
}else if (val === 'FOREIGN_LAWS'){
this.twoOptions=[
{
label: '适用车辆类型',
value: 'SYCLLX',
type: 'SEL_OPTION',
disabled: false
}, {
label: '政策编号',
value: 'LAWS_NUMBER',
type: 'INPUT',
disabled: false
}, {
label: '中文名称',
value: 'LAWS_NAME',
type: 'INPUT',
disabled: false
}, {
label: '英文名称',
value: 'LAWS_EN_NAME',
type: 'INPUT',
disabled: false
}, {
label: '个性化标签',
value: 'GXHBQXX',
type: 'SEL_OPTION',
disabled: false
}, {
label: '新车型实施日期(文本)',
value: 'XCXSSRQ',
type: 'DATE_PIC_OPTS',
disabled: false
}, {
label: '在产车实施日期(文本)',
value: 'ZCCSSRQ',
type: 'DATE_PIC_OPTS',
disabled: false
}, {
label: '维护工程师',
value: 'ZCGCS',
type: 'SEL_OPTION',
selVal: "USERLIST",
disabled: false
}
]
// 标准法规清单可查字段
}else {
this.twoOptions=[
{
label: '清单名称',
value: 'ACCESS_CONTENT',
type: 'INPUT',
disabled: false
}, {
label: '国家地区',
value: 'COUNTRY',
type: 'SEL_OPTION',
disabled: false
}
]
}
},
/**
@@ -1273,10 +1216,10 @@ export default {
let rowlist3 = []
for (let i = 0; i < this.sarAccessInfoList.length; i++) {
rowlist.push(this.sarAccessInfoList[i].id)
if (this.sarAccessInfoList[i].putTime === null) {
rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
if (this.sarAccessInfoList[i].ssrq === null) {
rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
}else {
rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
}
if (this.sarAccessInfoList[i].xcxssrqgj === null) {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
@@ -1350,13 +1293,7 @@ export default {
})
},
// 查询数据搜索 table 数据
selectLawsStands () {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
this.sarAccessInfoSearch.standType = ''
} else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
}
pageInfo() {
StandardsInfoPage(this.sarAccessInfoSearch, this.sarAccessInfo).then(res =>{
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
@@ -1368,6 +1305,7 @@ export default {
if (item.attrInfoMap === null) {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'ssrq', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
@@ -1379,6 +1317,7 @@ export default {
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1393,13 +1332,17 @@ export default {
}, e => {
})
},
/** 高级查询查询按钮*/
selectBtn() {
selectLawsStands () {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
this.sarAccessInfoSearch.standType = 'INLAND'
this.pageInfo()
} else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
this.pageInfo()
}
},
/** 高级查询查询按钮*/
selectPage() {
StandardsInfoPage(this.sarAccessInfo).then(res =>{
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
@@ -1411,6 +1354,7 @@ export default {
if (item.attrInfoMap === null) {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'ssrq', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
@@ -1422,6 +1366,7 @@ export default {
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1436,6 +1381,15 @@ export default {
}, e => {
})
},
selectBtn() {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.standType = 'INLAND'
this.selectPage()
} else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
this.selectPage()
}
},
// 数据搜索table判断checked状态
selectable (row) {
return row.isRelateAccess === '1'
@@ -1447,6 +1401,7 @@ export default {
if (item.attrInfoMap === null) {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'ssrq', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
@@ -1458,6 +1413,7 @@ export default {
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+28 -5
View File
@@ -239,7 +239,7 @@
</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'">编辑</el-dropdown-item>
<!-- <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'413e676a155d6eb2dfbe08df8cbcf682'">分享</el-dropdown-item>-->
<el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'413e676a155d6eb2dfbe08df8cbcf682'">删除</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'">删除</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
@@ -391,8 +391,8 @@
</el-select>
</el-form-item>
<!-- 是否纳入标准清单-->
<el-form-item title="是否纳入标准清单" label="是否纳入标准清单">
<el-select v-model="sarStandardsSearch.isRelateAccess" class="advanced-one" placeholder="根据是否纳入标准清单查找">
<el-form-item label="是否纳入标准清单" class="serch-form-item">
<el-select v-model="sarStandardsSearch.isRelateAccess" placeholder="根据是否纳入标准清单查找">
<el-option value="yes" label="是"></el-option>
<el-option value="no" label="否"></el-option>
</el-select>
@@ -437,7 +437,7 @@
<el-form-item label="我司参与深度">
<el-select v-model="sarStandardsSearch.nameShow" placeholder="请选择我司参与深度" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
<el-option v-for="opt in wscysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select>
</el-form-item>
@@ -530,6 +530,23 @@
</el-option>
</el-select>
</el-form-item>
<!-- 标记-->
<!-- 标签-->
<el-form-item label="标签">
<el-input v-model="sarStandardsSearch.tag" clearable
placeholder="根据被标签查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 体系类别-->
<el-form-item label="体系类别">
<el-select v-model="sarStandardsSearch.txlbOption" placeholder="根据体系类别查找" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select>
</el-form-item>
</el-form>
</div>
<div class="demo-drawer-footer">
@@ -1428,7 +1445,10 @@ export default {
replacedStandNum: '',
synopsis: '', // 内容摘要
// category: '', // 所属类别
standSort: '' // 标准类别
standSort: '', // 标准类别
txlbOption:'', //标准体系
tag:'' //标签
}, // 分页查询过程中用到的对象
loading: false,
isCollapse: true,
@@ -1484,6 +1504,8 @@ export default {
categoryConfigOptions: [], // 所属类别下拉框
assemClassOptions: [], // 总成分类下拉框
standAttributeList: [],
qcdwOptions:[],//起草单位
wscysdOptions:[], //我司参与深度
// 树形结构
// tree function
MoveTest: '',
@@ -4283,6 +4305,7 @@ export default {
this.categoryConfigOptions = res.data.CATEGORY
this.standAttributeList = res.data.RULETYPE
this.qcdwOptions = res.data.QCDW
this.wscysdOptions=res.data.WSCYSD;
this.getGzzOption()
this.setMap(this.standStateOptions)
}, e => {
src/pages/regulatoryRepository/standardForComments/index.vue
+1 -1
View File
@@ -55,7 +55,7 @@
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column
prop="category"
label="标准"
label="标准/政策"
align="center">
<template slot-scope="scope">
<a class="table-jump" @click.stop="handlePreview(scope.row)">{{ scope.row.category }}</a>
src/pages/searchCenter/pages/standardSearch.vue
+1 -1
View File
@@ -233,7 +233,7 @@
</div>
<div class="AllBoxContent" v-html="item.textContent"></div>
<div v-if="item.indexType !== 'items' && item.indexType !== 'msgdyinfo'" class="AllTime">
<div style="margin-right: 15px;">发布日期11: {{ item.issue_time !== null && item.issue_time !== '' ? dateFormat2(item.issue_time) : '--' }} </div>
<div style="margin-right: 15px;">发布日期: {{ item.issue_time !== null && item.issue_time !== '' ? dateFormat2(item.issue_time) : '--' }} </div>
<!-- <div>{{$t('m.putTime')}}: {{ item.issue_time !== null && item.issue_time !== '' ? $dateFormat(new Date(item.put_time), 'yyyy-MM-dd') : '&#45;&#45;' }} </div>-->
</div>
</div>