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-08-19 15:50:06 +08:00
parent 1c5ecac0d4 7b1d4bd883
commit a47a00abb4
6 changed files with 787 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+54 -51
View File
@@ -425,7 +425,7 @@
<div v-show="!isMoreAwayBtn" class="more" @click="moreClick">更多<img src="@/assets/images/shangqi/img/more.png">
</div>
<!-- <div v-show="isMoreAwayBtn" class="put-away" @click="putAwayClick">收起<img src="@/assets/images/shangqi/img/more.png"></div>-->
<!--查看标准条款列表-->
<!--查看分解单-->
<el-drawer
title="查看分解单"
:wrapperClosable="false"
@@ -559,11 +559,11 @@
</el-table-column>
<el-table-column
prop="xcxssrq"
prop="xccssrq"
label="新车型实施日期(文本)"
width="180">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.xccssrq ? $moment(scope.row.xccssrq).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
@@ -628,18 +628,18 @@
@pageSizeChange="pageSizeChange7"></pagination>
<!-- <el-pagination-->
<!-- @size-change="pageSizeChange"-->
<!-- @current-change="pageChange"-->
<!-- :current-page="1"-->
<!-- :page-sizes="[10, 20, 30, 50]"-->
<!-- :page-size="100"-->
<!-- layout="sizes, prev, pager, next, jumper"-->
<!-- :total="standitemTotal">-->
<!-- </el-pagination>-->
<!-- <el-pagination-->
<!-- @size-change="pageSizeChange"-->
<!-- @current-change="pageChange"-->
<!-- :current-page="1"-->
<!-- :page-sizes="[10, 20, 30, 50]"-->
<!-- :page-size="100"-->
<!-- layout="sizes, prev, pager, next, jumper"-->
<!-- :total="standitemTotal">-->
<!-- </el-pagination>-->
<!-- <pagination :total="standitemTotal" @pageChange="pageChange"-->
<!-- @pageSizeChange="pageSizeChange"></pagination>-->
<!-- <pagination :total="standitemTotal" @pageChange="pageChange"-->
<!-- @pageSizeChange="pageSizeChange"></pagination>-->
</el-drawer>
<!--新增标准条款-->
@@ -819,9 +819,9 @@
<div class="see-drawer-div">
<label class="see-drawer-name" title="解读内容">解读内容</label>
<span class="see-drawer-val"
:title="standShowItemEO.interpretationContent ? standShowItemEO.interpretationContent.replace(/<.*?>/ig, ' ') : ''">
:title="standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''">
{{
standShowItemEO.interpretationContent ? standShowItemEO.interpretationContent.replace(/<.*?>/ig, ' ') : ''
standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''
}}</span>
</div>
@@ -852,51 +852,51 @@
<div class="see-drawer-div">
<label class="see-drawer-name" title="责任工程师">责任工程师</label>
<span class="see-drawer-val" :title="standShowItemEO.dutyEngineer">
{{standShowItemEO.dutyEngineer }}</span>
{{ standShowItemEO.dutyEngineer }}</span>
</div>
<div class="see-drawer-div">
<label class="see-drawer-name" title="基于上一版本差异">基于上一版本差异</label>
<span class="see-drawer-val" :title="standShowItemEO.comparedWithPrevious">
{{standShowItemEO.comparedWithPrevious }}</span>
{{ standShowItemEO.comparedWithPrevious }}</span>
</div>
<div class="see-drawer-div">
<label class="see-drawer-name" title="符合性状态">符合性状态</label>
<span class="see-drawer-val" :title="standShowItemEO.complianceRequire">
{{standShowItemEO.complianceRequire }}</span>
{{ standShowItemEO.complianceRequire }}</span>
</div>
<div class="see-drawer-div">
<label class="see-drawer-name" title="合规性分析">合规性分析</label>
<span class="see-drawer-val" :title="standShowItemEO.complianceState">
{{standShowItemEO.complianceState }}</span>
{{ standShowItemEO.complianceState }}</span>
</div>
<!-- <div class="see-drawer-div">-->
<!-- <label class="see-drawer-name" title="FO">FO</label>-->
<!-- <span class="see-drawer-val" :title="standShowItemEO.foShow">{{ standShowItemEO.foShow }}</span>-->
<!-- </div>-->
<!-- <div class="see-drawer-div">-->
<!-- <label class="see-drawer-name" title="责任工程师">责任工程师</label>-->
<!-- <span class="see-drawer-val" :title="standShowItemEO.dutyEngineerShow">{{-->
<!-- standShowItemEO.dutyEngineerShow-->
<!-- }}</span>-->
<!-- </div>-->
<!-- <div class="see-drawer-div">-->
<!-- <label class="see-drawer-name" title="svpps">svpps</label>-->
<!-- <span class="see-drawer-val" :title="standShowItemEO.svppsShow">{{ standShowItemEO.svppsShow }}</span>-->
<!-- </div>-->
<!-- <div class="see-drawer-div">-->
<!-- <label class="see-drawer-name" title="FO">FO</label>-->
<!-- <span class="see-drawer-val" :title="standShowItemEO.foShow">{{ standShowItemEO.foShow }}</span>-->
<!-- </div>-->
<!-- <div class="see-drawer-div">-->
<!-- <label class="see-drawer-name" title="责任工程师">责任工程师</label>-->
<!-- <span class="see-drawer-val" :title="standShowItemEO.dutyEngineerShow">{{-->
<!-- standShowItemEO.dutyEngineerShow-->
<!-- }}</span>-->
<!-- </div>-->
<!-- <div class="see-drawer-div">-->
<!-- <label class="see-drawer-name" title="svpps">svpps</label>-->
<!-- <span class="see-drawer-val" :title="standShowItemEO.svppsShow">{{ standShowItemEO.svppsShow }}</span>-->
<!-- </div>-->
<!-- <div class="see-drawer-div">-->
<!-- <label class="see-drawer-name" title="要求类型">要求类型</label>-->
<!-- <span class="see-drawer-val" :title="standShowItemEO.claimTypeShow">{{ standShowItemEO.claimTypeShow }}</span>-->
<!-- </div>-->
<!-- <div class="see-drawer-div">-->
<!-- <label class="see-drawer-name" title="企标覆盖关系">企标覆盖关系</label>-->
<!-- <span class="see-drawer-val"-->
<!-- :title="standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)">{{-->
<!-- standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)-->
<!-- }}</span>-->
<!-- </div>-->
<!-- <div class="see-drawer-div">-->
<!-- <label class="see-drawer-name" title="要求类型">要求类型</label>-->
<!-- <span class="see-drawer-val" :title="standShowItemEO.claimTypeShow">{{ standShowItemEO.claimTypeShow }}</span>-->
<!-- </div>-->
<!-- <div class="see-drawer-div">-->
<!-- <label class="see-drawer-name" title="企标覆盖关系">企标覆盖关系</label>-->
<!-- <span class="see-drawer-val"-->
<!-- :title="standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)">{{-->
<!-- standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)-->
<!-- }}</span>-->
<!-- </div>-->
</div>
</el-drawer>
<!-- 更新LOG -->
@@ -1251,6 +1251,7 @@ export default {
knowIdList: '',
total7: 0,
page7: 1,
pageSize7: this.$store.getters.userInfo.configContent,
addForm: {
title: '',
content: '',
@@ -1772,7 +1773,7 @@ export default {
this.page7 = page
this.selectSarStandItems()
},
pageSizeChange7(pageSize){
pageSizeChange7(pageSize) {
this.pageSize7 = pageSize
this.selectSarStandItems()
},
@@ -2099,7 +2100,7 @@ export default {
console.log("pageSize");
console.log(pageSize);
// this.standItemSearch.pageSize = this.$store.getters.userInfo.configContent
this.standItemSearch.pageSize =pageSize;
this.standItemSearch.pageSize = pageSize;
this.selectSarStandItems()
// 此处需要调用接口，修改个人配置
},
@@ -2331,12 +2332,14 @@ export default {
selectSarStandItems(id, flag) {
this.standItemSearch.standId = this.sarStandardsInfoEO.id
this.standItemSearch.fileType = this.fileType
this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', this.standItemSearch, {}, res => {
this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
...this.standItemSearch,
pageSize: this.pageSize7, page: this.page7,
}, {}, res => {
this.selectedItemList = []
if (res.ok) {
this.standItemList = res.data;
console.log(res.data);
this.total7 = res.data.length // 分页需要
this.standItemList = res.data.list;
this.total7 = res.data.count // 分页需要
}
}, e => {
})
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+490 -321
View File
File diff suppressed because it is too large Load Diff
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+112 -15
View File
@@ -1264,27 +1264,38 @@ export default {
})
sarAccessEO.fileIds = relateFile.join(',')
}
if (!sarAccessEO.id) {
// 新增
sarAccessEO.state = '1'
sarAccessEO.version = 0
this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
_this: this,
loading: 'loadData'
}, res => {
if (this.sarAccessInfoList.length !== 0) {
if (this.sarAccessInfoList.length !== 0) {
this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
_this: this,
loading: 'loadData'
}, res => {
if (res.ok) {
this.$message.success('新增成功')
this.isNext = true
this.$router.push({
name: 'AccessStandardsAndRegulations'
})
if (res.data === "数据库为空，添加成功") {
this.$message.success('新增成功')
this.isNext = true
this.$router.push({
name: 'AccessStandardsAndRegulations'
})
} else if (res.data === "其他清单添加成功") {
this.$message.success('新增成功')
this.isNext = true
this.$router.push({
name: 'AccessStandardsAndRegulations'
})
}
}
}else {
this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
}
}, e => {
})
}, e => {
console.log(e)
})
} else {
this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
}
} else {
// 编辑
this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, {
@@ -1305,6 +1316,92 @@ export default {
}
})
},
// 提交按钮 事件
// saveSarAccess () {
// this.$refs['sarAccessForm'].validate((valid) => {
// if (valid) {
// let rowlist = []
// let rowlist1 = []
// let rowlist2 = []
// let rowlist3 = []
// for (let i = 0; i < this.sarAccessInfoList.length; i++) {
// rowlist.push(this.sarAccessInfoList[i].id)
// if (this.sarAccessInfoList[i].ssrq === null) {
// rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
// }else {
// rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
// }
// if (this.sarAccessInfoList[i].xcxssrqgj === null) {
// rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
// }else {
// rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
// }
// if (this.sarAccessInfoList[i].zccssrqgj === null) {
// rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
// }else {
// rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
// }
// }
// rowlist = rowlist.join(',')
// rowlist1 = rowlist1.join(',')
// rowlist2 = rowlist2.join(',')
// rowlist3 = rowlist3.join(',')
// let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
// sarAccessEO.inforlist = rowlist
// sarAccessEO.inforlist1 = rowlist1
// sarAccessEO.inforlist2 = rowlist2
// sarAccessEO.inforlist3 = rowlist3
// // sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
// // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
// // 判断是否有附件
// if (this.fileInfoList.length > 0) {
// let relateFile = []
// this.fileInfoList.map(item => {
// relateFile.push(item.id)
// })
// sarAccessEO.fileIds = relateFile.join(',')
// }
// if (!sarAccessEO.id) {
// // 新增
// sarAccessEO.state = '1'
// sarAccessEO.version = 0
// this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
// _this: this,
// loading: 'loadData'
// }, res => {
// if (this.sarAccessInfoList.length !== 0) {
// if (res.ok) {
// this.$message.success('新增成功')
// this.isNext = true
// this.$router.push({
// name: 'AccessStandardsAndRegulations'
// })
// }
// }else {
// this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
// }
// }, e => {
// })
// } else {
// // 编辑
// this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, {
// _this: this,
// loading: 'loadData'
// }, res => {
// if (res.ok) {
// this.isNext = true
// this.$router.push({
// name: 'AccessStandardsAndRegulations'
// })
// }
// }, e => {
// })
// }
// }else {
// this.$message.error('请检查表单是否填写正确')
// }
// })
// },
pageInfo() {
StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
this.sarAccessInfoSearchList = res.data.list
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+123 -15
View File
@@ -1246,23 +1246,42 @@ export default {
// 新增
sarAccessEO.state = '1'
sarAccessEO.version = 0
this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
_this: this,
loading: 'loadData'
}, res => {
if (this.sarAccessInfoList.length !== 0) {
if (this.sarAccessInfoList.length !== 0) {
this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
_this: this,
loading: 'loadData'
}, res => {
if (res.ok) {
this.$message.success('新增成功')
this.isNext = true
this.$router.push({
name: 'AccessStandardsAndRegulations'
})
if (res.data === "数据库为空，添加成功") {
this.$message.success('新增成功')
this.isNext = true
this.$router.push({
name: 'AccessStandardsAndRegulations'
})
} else if (res.data === "车型类别清单添加成功") {
this.$message.success('新增成功')
this.isNext = true
this.$router.push({
name: 'AccessStandardsAndRegulations'
})
} else if (res.data === "车型类别清单添加失败") {
this.$message.error('已存在此车型类别清单，新增失败')
} else if (res.data === "国家/地区清单添加成功") {
this.$message.success('新增成功')
this.isNext = true
this.$router.push({
name: 'AccessStandardsAndRegulations'
})
} else if (res.data === "国家/地区清单添加失败") {
this.$message.error('已存在此国家/地区清单，新增失败')
}
}
}else {
this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
}
}, e => {
})
}, e => {
console.log(e)
})
} else {
this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
}
} else {
// 编辑
this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, {
@@ -1283,6 +1302,95 @@ export default {
}
})
},
// saveSarAccess () {
// this.$refs['sarAccessForm'].validate((valid) => {
// if (valid) {
// let rowlist = []
// let rowlist1 = []
// let rowlist2 = []
// let rowlist3 = []
// for (let i = 0; i < this.sarAccessInfoList.length; i++) {
// rowlist.push(this.sarAccessInfoList[i].id)
// if (this.sarAccessInfoList[i].ssrq === null) {
// rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
// }else {
// rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
// }
// if (this.sarAccessInfoList[i].xcxssrqgj === null) {
// rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
// }else {
// rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
// }
// if (this.sarAccessInfoList[i].zccssrqgj === null) {
// rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
// }else {
// rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
// }
// }
// rowlist = rowlist.join(',')
// rowlist1 = rowlist1.join(',')
// rowlist2 = rowlist2.join(',')
// rowlist3 = rowlist3.join(',')
// let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
// sarAccessEO.inforlist = rowlist
// sarAccessEO.inforlist1 = rowlist1
// sarAccessEO.inforlist2 = rowlist2
// sarAccessEO.inforlist3 = rowlist3
// // sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
// // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
// // 判断是否有附件
// if (this.fileInfoList.length > 0) {
// let relateFile = []
// this.fileInfoList.map(item => {
// relateFile.push(item.id)
// })
// sarAccessEO.fileIds = relateFile.join(',')
// }
// if (!sarAccessEO.id) {
// // 新增
// sarAccessEO.state = '1'
// sarAccessEO.version = 0
// this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
// _this: this,
// loading: 'loadData'
// }, res => {
// if (this.sarAccessInfoList.length !== 0) {
// if (res.ok) {
// if (res.data === "车型类别清单添加成功") {
// this.$message.success('新增成功')
// this.isNext = true
// this.$router.push({
// name: 'AccessStandardsAndRegulations'
// })
// }else{
// this.$message.error('已存在此车型类别清单，新增失败')
// }
// }
// }else {
// this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
// }
// }, e => {
// })
// } else {
// // 编辑
// this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, {
// _this: this,
// loading: 'loadData'
// }, res => {
// if (res.ok) {
// this.isNext = true
// this.$router.push({
// name: 'AccessStandardsAndRegulations'
// })
// }
// }, e => {
// })
// }
// }else {
// this.$message.error('请检查表单是否填写正确')
// }
// })
// },
// 字段转化
changeText(val) {
val.forEach(item => {
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+4 -3
View File
@@ -2983,7 +2983,8 @@ export default {
// 查询二级菜单
selectMenu() {
this.$http.get('sarResource/ts-resource/getList', {
sorDivide: 'INLAND_STAND'
sorDivide: 'INLAND_STAND',
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.ok) {
this.treeList = res.data
@@ -3207,7 +3208,7 @@ export default {
const exportURL = interfaceUrl + 'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?' +
'exportType=' + this.saveExportType + '&exportContent=' + this.selectedList.join(',') + '&exportName=' + this.exportName + '&standType=' + this.standType
'exportType=' + this.saveExportType + '&exportContent=' + this.selectedList.join(',') + '&exportName=' + this.exportName + '&standType=' + this.standType + '&userId=' + this.$store.getters.userInfo.userId
window.open(exportURL)
this.$message.success('导出信息成功')
this.exportLoading = false
@@ -3238,7 +3239,7 @@ export default {
// this.$message.success('导出信息成功')
//
window.open(interfaceUrl + 'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?' +
'exportType=' + this.saveExportType + '&exportContent=' + exportEOStr + '&exportName=' + this.exportName + '&standType=' + this.standType)
'exportType=' + this.saveExportType + '&exportContent=' + exportEOStr + '&exportName=' + this.exportName + '&standType=' + this.standType + '&userId=' + this.$store.getters.userInfo.userId)
this.$message.success('导出信息成功')
this.exportLoading = false
}
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+4 -8
View File
@@ -2691,7 +2691,8 @@ export default {
// 查询二级菜单
selectMenu () {
this.$http.get('sarResource/ts-resource/getList', {
sorDivide: 'FOREIGN_STAND'
sorDivide: 'FOREIGN_STAND',
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.ok) {
this.treeList = res.data
@@ -2841,14 +2842,14 @@ export default {
if (this.saveExportType === 'apart') {
if (this.selectedList != null && this.selectedList !== '') {
const exportURL = interfaceUrl + 'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?' +
'exportType=' + this.saveExportType + '&exportContent=' + this.selectedList.join(',') + '&exportName=' + this.exportName + '&standType=' + this.standType
'exportType=' + this.saveExportType + '&exportContent=' + this.selectedList.join(',') + '&exportName=' + this.exportName + '&standType=' + this.standType + '&userId=' + this.$store.getters.userInfo.userId
window.open(exportURL)
this.$message.success('导出信息成功')
}
} else if (this.saveExportType === 'all') {
let exportEOStr = JSON.stringify(this.SarExportSearchEo)
window.open(interfaceUrl+'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?exportType=' + this.saveExportType + '&exportContent=' + exportEOStr + '&exportName=' + this.exportName + '&standType=' + this.standType)
window.open(interfaceUrl+'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?exportType=' + this.saveExportType + '&exportContent=' + exportEOStr + '&exportName=' + this.exportName + '&standType=' + this.standType+ '&userId=' + this.$store.getters.userInfo.userId)
this.$message.success('导出信息成功')
}
this.exportModelFlag = false
@@ -3302,11 +3303,6 @@ export default {
}
formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
console.log("======")
console.log(formData.advanceSearchVOStr);
this.SarExportSearchEo = formData
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {