FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

Browse Source
This commit is contained in:
宋伟佳
2021-08-08 13:37:32 +08:00
parent debfa1b142 81f303f93c
commit 25425b98b8
14 changed files with 93 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/navMenu/index.vue
+2 -2
View File
@@ -300,11 +300,11 @@ export default {
// path: '/convertDocView',
// menuId: '3F52K25546'
// },
{
/*{
title: '菜单管理',
path: '/menuManage',
menuId: '87b8b4f5817a7829696e63185c744d52'
},
},*/
{
title: '链接管理',
path: '/linkManage',
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+2 -2
View File
@@ -103,13 +103,13 @@
<el-table-column
prop="itemsName"
label="条款名称"
width="170"
width="230"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="itermsConditions"
label="条款内容"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+2 -2
View File
@@ -104,13 +104,13 @@
<el-table-column
prop="itemsName"
label="条款名称"
width="170"
width="230"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="itermsConditions"
label="条款内容"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+2 -2
View File
@@ -98,13 +98,13 @@
<el-table-column
prop="itemsName"
label="条款名称"
width="170"
width="230"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="itermsConditions"
label="条款内容"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+7 -7
View File
@@ -99,15 +99,15 @@
<el-table-column
prop="itemsName"
label="条款名称"
width="100"
width="230"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="itemsTitle"
label="条款内容"
align="center">
</el-table-column>
<!-- <el-table-column-->
<!-- prop="itemsTitle"-->
<!-- label="条款内容"-->
<!-- show-overflow-tooltip-->
<!-- align="center">-->
<!-- </el-table-column>-->
<el-table-column
prop="technicalRequir"
width="150"
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+2 -2
View File
@@ -94,13 +94,13 @@
<el-table-column
prop="itemsName"
label="条款名称"
width="100"
width="230"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="itemsTitle"
label="条款内容"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+2 -2
View File
@@ -94,13 +94,13 @@
<el-table-column
prop="itemsName"
label="条款名称"
width="100"
width="230"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="itemsTitle"
label="条款内容"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+2 -2
View File
@@ -95,13 +95,13 @@
<el-table-column
prop="itemsName"
label="条款名称"
width="100"
width="230"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="itemsTitle"
label="条款内容"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+11 -14
View File
@@ -836,29 +836,26 @@ export default {
methods: {
downloadFile (fileType) {
if(fileType === 'fbgbjbd'){
if(this.fbgbjbdFileId.search(',')){
this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",","");
console.log(this.fbgbjbdFileId);
}
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId.replace(",","");
}else if(fileType === 'xgd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId.replace(",","");
}else if(fileType === 'bpg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId.replace(",","");
}else if(fileType === 'ssg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId.replace(",","");
}else if(fileType === 'zqyjg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId.replace(",","");
}else if(fileType === 'jdwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId.replace(",","");
}else if(fileType === 'kwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId.replace(",","");
}else if(fileType === 'glwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId.replace(",","");
}else if(fileType === 'ca'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId.replace(",","");
}else if(fileType === 'zbjbd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId.replace(",","");
}
},
popoverHide (checkedIds, checkedData) {
src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
+4 -4
View File
@@ -9,9 +9,9 @@
<div v-else-if="tabValue === 'listProject'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<list-project></list-project>
</div>
<div v-else-if="tabValue === 'listTracking'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<!-- <div v-else-if="tabValue === 'listTracking'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<list-tracking></list-tracking>
</div>
</div>-->
<div v-else-if="tabValue === 'listOther'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<list-other></list-other>
</div>
@@ -68,13 +68,13 @@ export default {
name: "listProject"
});
continue;
} else if (entity.id === "418123d180abf67bd2c46d5a694baaa5") {
}/* else if (entity.id === "418123d180abf67bd2c46d5a694baaa5") {
list.push({
label: "重点标准跟踪清单",
name: "listTracking"
});
continue;
} else if (entity.id === "5a75523729b04102a565167004d640e9") {
}*/ else if (entity.id === "5a75523729b04102a565167004d640e9") {
list.push({
label: "其他清单",
name: "listOther"
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
-1
View File
@@ -646,7 +646,6 @@ export default {
},
// 点击查看
handlePreview(data) {
debugger
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+17 -1
View File
@@ -60,13 +60,18 @@
width="180"
>
<template slot-scope="scope">
<div><span>{{ scope.row.standSort }} {{ scope.row.standNumber }}</span> <span v-if="scope.row.standYear">-{{ scope.row.standYear }}</span></div>
<a class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
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="interpretationTime"
@@ -322,6 +327,17 @@ export default {
this.$store.getters.userInfo.configContent = pageSize
this.queryStandAndLaws()
},
//点击查看详情
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'INLAND_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
queryStandAndLaws () {
this.sarProject.current = this.page
this.sarProject.size = this.pageSize
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
+21 -4
View File
@@ -65,14 +65,19 @@
label="标准/政策号"
width="180"
>
<template slot-scope="scope">
<div><span>{{ scope.row.standSort }} {{ scope.row.standNumber }}</span> <span v-if="scope.row.standYear">-{{ scope.row.standYear }}</span></div>
</template>
<template slot-scope="scope">
<a class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
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="interpretationTime"
@@ -259,7 +264,19 @@ name: "technologyInvolveProject",
this.sarProjectListDatas = res.data.records
this.total = res.data.total
}, e=> {})
}, // 分页查询
},
//点击查看详情
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
// 分页查询
resetSelect () {
this.sarProject.country = ''
this.sarProject.standCode=''
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+19 -4
View File
@@ -11,19 +11,19 @@
<div v-show="heightShow" class="transition-box">
<p class="transition-box-p">
<label class="transition-box-label">标准号：</label>
<span class="transition-box-span">{{ this.$route.query.item.cid }}</span>
<span class="transition-box-span" @click="handlePreview($route.query.item)">{{ $route.query.item.cid }}</span>
</p>
<p class="transition-box-p">
<label class="transition-box-label">标准名称：</label>
<span class="transition-box-span">{{ this.$route.query.item.cname || '-' }}</span>
<span class="transition-box-span">{{ $route.query.item.cname || '-' }}</span>
</p>
<p class="transition-box-p">
<label class="transition-box-label">上传时间：</label>
<span class="transition-box-span">{{ this.$route.query.item.endTime || '-' }}</span>
<span class="transition-box-span">{{ $route.query.item.endTime || '-' }}</span>
</p>
<p class="transition-box-p">
<label class="transition-box-label">征求意见周期：</label>
<span class="transition-box-span" v-if="this.$route.query.item.startTime && this.$route.query.item.endTime">{{ this.$route.query.item.startTime + ' ~ ' + this.$route.query.item.endTime}}</span>
<span class="transition-box-span" v-if="$route.query.item.startTime && $route.query.item.endTime">{{ $route.query.item.startTime + ' ~ ' + $route.query.item.endTime}}</span>
<span class="transition-box-span" v-else>-</span>
</p>
</div>
@@ -166,6 +166,21 @@
}
})
},
//点击查看
handlePreview(data) {
console.log(data);
return
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: data.id,
pageType: data.standType
}
});
window.open(routeUrl.href, "_blank");
},
// 获取详情信息列表
getList() {
this.spinShow = true