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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
zyd
2022-09-19 07:39:50 +08:00
parent fdaea1d906 a4c5a8a1ee
commit 22dbcea3a8
19 changed files with 19196 additions and 3455 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+15725 -19
View File
File diff suppressed because it is too large Load Diff
src/components/navMenu/index.vue
+11 -11
View File
@@ -154,7 +154,7 @@
{ {
title: '问答库', // 把 标准涉及项目 这几个字 改成 标准合规评估结果 title: '问答库', // 把 标准涉及项目 这几个字 改成 标准合规评估结果
path: '/standQA', path: '/standQA',
menuId: '' menuId: '2621269642ea4c6c8c42905863b2dc09'
}, },
// { // {
// title: '零部件编号申请', // title: '零部件编号申请',
@@ -444,7 +444,7 @@
title: '个人中心', title: '个人中心',
path: '/personal', path: '/personal',
'icon-class': 'el-icon-s-check', 'icon-class': 'el-icon-s-check',
menuId: '32143ffasdf', // menuId: '32143ffasdf',
children: [ children: [
// { // {
// title: '我的消息', // title: '我的消息',
@@ -458,8 +458,8 @@
// }, // },
{ {
title: '我的收藏', title: '我的收藏',
path: '/collection', path: '/collection'
menuId: '63e999c65b1f2b1339119a00eb1d50cf' // menuId: '63e999c65b1f2b1339119a00eb1d50cf'
}, },
// { // {
// title: '我的浏览', // title: '我的浏览',
@@ -478,14 +478,14 @@
// }, // },
{ {
title: '我的问答', title: '我的问答',
path: '/questions', path: '/questions'
menuId: '' // menuId: ''
}, },
{ // {
title: '我的板块', // title: '我的板块',
path: '/plate', // path: '/plate'
menuId: 'e4a94f03223df6f4ad70732b96f07221' // // menuId: 'e4a94f03223df6f4ad70732b96f07221'
} // }
// { // {
// title: '个人信息', // title: '个人信息',
// path: '/info', // path: '/info',
src/pages/config/pages/standLawsAttrManage/pages/standLawsAttrDetails.vue
+1 -1
View File
@@ -83,7 +83,7 @@
<i class="iconfont">&#xe61e;</i> <i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<div v-if="relateDicId"> <div v-if="relateDicId">
<el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'AQCEYWZK8F4DL85BZPRB'">查看</el-dropdown-item> <el-dropdown-item :command="[scope.row, '查看']" >查看</el-dropdown-item>
</div> </div>
<el-dropdown-item :command="[scope.row, '编辑']" v-if="dictionaryId !== 'ERDFGHGGJJ' && dictionaryId !== '48723deaa90798f56e939aea6aa49a23' && dictionaryId !== 'WQERWC39J4E8SV6WREP2'" v-btn-permission="'48723deaa90798f56e939aea6aa49a23'">编辑</el-dropdown-item> <el-dropdown-item :command="[scope.row, '编辑']" v-if="dictionaryId !== 'ERDFGHGGJJ' && dictionaryId !== '48723deaa90798f56e939aea6aa49a23' && dictionaryId !== 'WQERWC39J4E8SV6WREP2'" v-btn-permission="'48723deaa90798f56e939aea6aa49a23'">编辑</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '删除']" v-if="dictionaryId !== 'ERDFGHGGJJ' && dictionaryId !== '982b2f92a26c3c91b6b868419f0e2d3b' && dictionaryId !== 'WQERWC39J4E8SV6WREP2'" v-btn-permission="'982b2f92a26c3c91b6b868419f0e2d3b'">删除</el-dropdown-item> <el-dropdown-item :command="[scope.row, '删除']" v-if="dictionaryId !== 'ERDFGHGGJJ' && dictionaryId !== '982b2f92a26c3c91b6b868419f0e2d3b' && dictionaryId !== 'WQERWC39J4E8SV6WREP2'" v-btn-permission="'982b2f92a26c3c91b6b868419f0e2d3b'">删除</el-dropdown-item>
src/pages/details/otherBussStandardDetails/index.vue
+2 -2
View File
@@ -943,13 +943,13 @@
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
class="icon-download" class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '9882f477aad895ec56a7464f3e9c0b11'" v-btn-permission="'9882f477aad895ec56a7464f3e9c0b11'"
/> />
<i <i
title="下载带水印" title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)" @click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2" class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '9bab2662fbd9d0507b39be813371a597'" v-btn-permission="'9bab2662fbd9d0507b39be813371a597'"
/> />
<div v-if="relateNowList.length >1"> <div v-if="relateNowList.length >1">
<el-divider></el-divider> <el-divider></el-divider>
src/pages/details/otherBussStandardExternalDetails/index.vue
+2 -2
View File
@@ -946,13 +946,13 @@
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
class="icon-download" class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '9882f477aad895ec56a7464f3e9c0b11'" v-btn-permission="'9882f477aad895ec56a7464f3e9c0b11'"
/> />
<i <i
title="下载带水印" title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)" @click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2" class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '9bab2662fbd9d0507b39be813371a597'" v-btn-permission="'9bab2662fbd9d0507b39be813371a597'"
/> />
<div v-if="relateNowList.length >1"> <div v-if="relateNowList.length >1">
<el-divider></el-divider> <el-divider></el-divider>
src/pages/details/otherStandardDetails/index.vue
+16 -15
View File
@@ -411,13 +411,13 @@
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
class="icon-download" class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/> />
<i <i
title="下载带水印" title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)" @click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2" class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/> />
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>--> <!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</template> </template>
@@ -493,13 +493,13 @@
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
class="icon-download" class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45': 'a772afab2a6708883335500f3f86e771'"
/> />
<i <i
title="下载带水印" title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)" @click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2" class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/> />
<!-- <el-button v-if="file.fileSuffix='pdf'" type="primary" round>OCR</el-button>--> <!-- <el-button v-if="file.fileSuffix='pdf'" type="primary" round>OCR</el-button>-->
@@ -513,13 +513,13 @@
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
class="icon-download" class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/> />
<i <i
title="下载带水印" title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)" @click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2" class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/> />
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>--> <!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</template> </template>
@@ -560,13 +560,13 @@
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
class="icon-download" class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/> />
<i <i
title="下载带水印" title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)" @click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2" class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/> />
</template> </template>
<template v-else> <template v-else>
@@ -575,13 +575,13 @@
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
class="icon-download" class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/> />
<i <i
title="下载带水印" title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)" @click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2" class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/> />
</template> </template>
</p> </p>
@@ -655,13 +655,13 @@
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
class="icon-download" class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/> />
<i <i
title="下载带水印" title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)" @click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2" class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/> />
<!-- OCR按钮,根据文件名取后缀判断是否出现--> <!-- OCR按钮,根据文件名取后缀判断是否出现-->
@@ -678,13 +678,13 @@
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
class="icon-download" class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/> />
<i <i
title="下载带水印" title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)" @click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2" class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/> />
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>--> <!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</template> </template>
@@ -785,7 +785,7 @@
<div class="action-bar"> <div class="action-bar">
<el-button class="common-button-default export-button" icon="export" size="mini" <el-button class="common-button-default export-button" icon="export" size="mini"
@click="exportStandardItem" @click="exportStandardItem"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '52HT9PLW49G6ZWS9RZSC' : '9CLEQQBS75SYV8JQQYFB'"> >
导出 导出
</el-button> </el-button>
<el-button <el-button
@@ -801,6 +801,7 @@
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
@click="editResolveList" @click="editResolveList"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'bd291146ac1e42c48968c5142ae55375' : '960a97045a6e47b0b8e33ebc347e5fd9'"
>编辑 >编辑
</el-button> </el-button>
</div> </div>
src/pages/details/otherStandardExternalDetails/index.vue
+16 -15
View File
@@ -423,13 +423,13 @@
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
class="icon-download" class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/> />
<i <i
title="下载带水印" title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)" @click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2" class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/> />
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>--> <!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</template> </template>
@@ -505,13 +505,13 @@
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
class="icon-download" class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/> />
<i <i
title="下载带水印" title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)" @click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2" class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/> />
<!-- <el-button v-if="file.fileSuffix='pdf'" type="primary" round>OCR</el-button>--> <!-- <el-button v-if="file.fileSuffix='pdf'" type="primary" round>OCR</el-button>-->
@@ -525,13 +525,13 @@
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
class="icon-download" class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/> />
<i <i
title="下载带水印" title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)" @click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2" class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/> />
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>--> <!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</template> </template>
@@ -581,13 +581,13 @@
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
class="icon-download" class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/> />
<i <i
title="下载带水印" title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)" @click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2" class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/> />
<!-- OCR按钮,根据文件名取后缀判断是否出现--> <!-- OCR按钮,根据文件名取后缀判断是否出现-->
@@ -604,13 +604,13 @@
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
class="icon-download" class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/> />
<i <i
title="下载带水印" title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)" @click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2" class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/> />
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>--> <!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</template> </template>
@@ -685,13 +685,13 @@
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
class="icon-download" class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/> />
<i <i
title="下载带水印" title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)" @click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2" class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/> />
<!-- OCR按钮,根据文件名取后缀判断是否出现--> <!-- OCR按钮,根据文件名取后缀判断是否出现-->
@@ -708,13 +708,13 @@
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
class="icon-download" class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/> />
<i <i
title="下载带水印" title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)" @click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2" class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/> />
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>--> <!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</template> </template>
@@ -815,7 +815,7 @@
<div class="action-bar"> <div class="action-bar">
<el-button class="common-button-default export-button" icon="export" size="mini" <el-button class="common-button-default export-button" icon="export" size="mini"
@click="exportStandardItem" @click="exportStandardItem"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '52HT9PLW49G6ZWS9RZSC' : '9CLEQQBS75SYV8JQQYFB'"> >
导出 导出
</el-button> </el-button>
<el-button <el-button
@@ -831,6 +831,7 @@
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
@click="editResolveList" @click="editResolveList"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'bd291146ac1e42c48968c5142ae55375' : '960a97045a6e47b0b8e33ebc347e5fd9'"
>编辑 >编辑
</el-button> </el-button>
</div> </div>
src/pages/details/process/ruku/index.vue
+1 -1
View File
@@ -350,7 +350,7 @@
<!--<el-button class="common-button-default" :loading="searching" @click="uploadImportModal">模板下载</el-button>--> <!--<el-button class="common-button-default" :loading="searching" @click="uploadImportModal">模板下载</el-button>-->
<!--<el-button class="common-button-default in-button" :loading="searching" icon="in" @click="addImportModal(2)" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '9ca97b05b2' : '6JM97X9W9C'">导入</el-button>--> <!--<el-button class="common-button-default in-button" :loading="searching" icon="in" @click="addImportModal(2)" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '9ca97b05b2' : '6JM97X9W9C'">导入</el-button>-->
<el-button class="common-button-default export-button" icon="export" <el-button class="common-button-default export-button" icon="export"
@click="exportStandardItem" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '52HT9PLW49G6ZWS9RZSC' : '9CLEQQBS75SYV8JQQYFB'">导出</el-button> @click="exportStandardItem" >导出</el-button>
<!--<el-button class="common-button-default delete-button" icon="delete" @click="deleteStandItem(2)" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '8ac1820c42' : 'LRQHPT8E2Y'">删除</el-button>--> <!--<el-button class="common-button-default delete-button" icon="delete" @click="deleteStandItem(2)" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '8ac1820c42' : 'LRQHPT8E2Y'">删除</el-button>-->
<el-button <el-button
round round
src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+1 -1
View File
@@ -44,7 +44,7 @@
<el-button v-btn-permission="'6c51b9f4bb333aaf4895c98f8c2ea896'" size="mini" @click="batchCopy">批量复制</el-button> <el-button v-btn-permission="'6c51b9f4bb333aaf4895c98f8c2ea896'" size="mini" @click="batchCopy">批量复制</el-button>
<el-button v-btn-permission="'b5eb643881b814cadd477a1e414e568e'" size="mini" @click="combineItems">合并条款</el-button> <el-button v-btn-permission="'b5eb643881b814cadd477a1e414e568e'" size="mini" @click="combineItems">合并条款</el-button>
<!-- <el-button v-btn-permission="'958e004c1ac4fe39564aa7547b8c0b6b'" size="mini" @click="openSubmitAndExamine" v-if="this.$route.query.result === '1'">提交</el-button>--> <!-- <el-button v-btn-permission="'958e004c1ac4fe39564aa7547b8c0b6b'" size="mini" @click="openSubmitAndExamine" v-if="this.$route.query.result === '1'">提交</el-button>-->
<el-button v-if="auditFlag==='1'" size="mini" v-btn-permission="'958e004c1ac4fe39564aa7547b8c0b6b'" @click="splitCheckBtn">审核</el-button> <!-- <el-button v-if="auditFlag==='1'" size="mini" v-btn-permission="'958e004c1ac4fe39564aa7547b8c0b6b'" @click="splitCheckBtn">审核</el-button>-->
<!--<el-button size="mini" @click="$message.warning('需求暂不明确')" v-if="this.$route.query.result === '1'">提交</el-button>--> <!--<el-button size="mini" @click="$message.warning('需求暂不明确')" v-if="this.$route.query.result === '1'">提交</el-button>-->
</div> </div>
<el-table <el-table
src/pages/localTool/standardRecognition/index.vue
+10 -10
View File
@@ -763,16 +763,16 @@ export default {
// standId: '' // standId: ''
}, },
upFileRules: { upFileRules: {
standNumber: [ // standNumber: [
{ required: true, message: "标准号/政策号不能为空", trigger: "blur" }, // { required: true, message: "标准号/政策号不能为空", trigger: "blur" },
], // ],
standName: [ // standName: [
{ // {
required: true, // required: true,
message: "标准名称/政策名称不能为空", // message: "标准名称/政策名称不能为空",
trigger: "blur", // trigger: "blur",
}, // },
], // ],
fileType: [ fileType: [
{ required: true, message: "文本状态称不能为空", trigger: "change" }, { required: true, message: "文本状态称不能为空", trigger: "change" },
], ],
src/pages/personal/pages/my-collection/index.vue
+4 -4
View File
@@ -24,8 +24,8 @@ export default {
const list = [ const list = [
{ {
title: '已收藏的标准法规', title: '已收藏的标准法规',
name: 'CollectionStandard', name: 'CollectionStandard'
permission:'f3686f4736acca57b1c0a97a990f96fc' // permission:'f3686f4736acca57b1c0a97a990f96fc'
}, },
// { // {
// title: '已收藏的动态&资料 ', // title: '已收藏的动态&资料 ',
@@ -33,8 +33,8 @@ export default {
// }, // },
{ {
title: '已收藏的政策', title: '已收藏的政策',
name: 'CollectionLaws', name: 'CollectionLaws'
permission:'200212748ffc5fd3d93179789446535a' // permission:'200212748ffc5fd3d93179789446535a'
}, },
// { // {
// title: '已收藏的标准拆分', // title: '已收藏的标准拆分',
src/pages/phone/domesticDetails.vue
+2 -1
View File
@@ -525,7 +525,7 @@
<div class="action-bar"> <div class="action-bar">
<el-button class="common-button-default export-button" icon="export" size="mini" <el-button class="common-button-default export-button" icon="export" size="mini"
@click="exportStandardItem" @click="exportStandardItem"
v-btn-permission="$route.query.pageType === 'INLAND_STAND' ? '52HT9PLW49G6ZWS9RZSC' : '9CLEQQBS75SYV8JQQYFB'"> >
导出 导出
</el-button> </el-button>
<el-button <el-button
@@ -541,6 +541,7 @@
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
@click="editResolveList" @click="editResolveList"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'bd291146ac1e42c48968c5142ae55375' : '960a97045a6e47b0b8e33ebc347e5fd9'"
>编辑 >编辑
</el-button> </el-button>
</div> </div>
src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
+9 -1
View File
@@ -344,6 +344,14 @@
align="center" align="center"
prop="uname" prop="uname"
label="项目经理"/> label="项目经理"/>
<el-table-column
align="center"
prop="flag"
label="是否维护">
<template slot-scope="scope">
<span>{{ scope.row.flag ==="1" ? '已维护' : '未维护'}}</span>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
<loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading> <loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
@@ -571,7 +579,7 @@ export default {
getProductData() { getProductData() {
this.replaceLoading = true this.replaceLoading = true
// 已维护 状态 1 , 为维护 状态 0 // 已维护 状态 1 , 为维护 状态 0
this.projectSearch.flag = '1' // this.projectSearch.flag = '1'
this.$http.get("sarStandProjectLibrary/queryProjects", { this.$http.get("sarStandProjectLibrary/queryProjects", {
projectGroup: this.projectGroup, projectGroup: this.projectGroup,
current: this.pageNo, current: this.pageNo,
src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
+4 -4
View File
@@ -129,7 +129,7 @@
<el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''"> <el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="startUserName" style="margin-bottom: 0"> <el-form-item prop="startUserName" style="margin-bottom: 0">
<h4>标准法规工程师</h4> <h4>发起人</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input :disabled="disabledXX" v-model="roleForm.prcCreateUser" style="display: none;"></el-input> <el-input :disabled="disabledXX" v-model="roleForm.prcCreateUser" style="display: none;"></el-input>
<el-input :disabled="disabledXX" v-model="roleForm.prcCreateUserName" placeholder="起草" <el-input :disabled="disabledXX" v-model="roleForm.prcCreateUserName" placeholder="起草"
@@ -156,11 +156,11 @@
:color="roleForm.dockUser ? '#66b1ff' : ''" > :color="roleForm.dockUser ? '#66b1ff' : ''" >
<el-card> <el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0"> <el-form-item prop="dockUserName" style="margin-bottom: 0">
<h4>标准法规部部长</h4> <h4>业务部门负责人</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input :disabled="disabledXX" v-model="roleForm.dockUser" style="display: none;"></el-input> <el-input :disabled="disabledXX" v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input :disabled="disabledXX" v-model="roleForm.dockUserName" readonly placeholder="选择标准法规部部长" <el-input :disabled="disabledXX" v-model="roleForm.dockUserName" readonly placeholder="选择业务部门负责人"
@click.native="choiceZRR('dockUser', '选择标准法规部部长', roleForm.dockUser)"> @click.native="choiceZRR('dockUser', '选择业务部门负责人', roleForm.dockUser)">
</el-input> </el-input>
</div> </div>
</el-form-item> </el-form-item>
src/pages/processCenter/pages/creatProcess/qbfz/step4.vue
+2 -2
View File
@@ -64,11 +64,11 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="下一步状态说明" prop="nextStatusDetils" class="add-form-item"> <el-form-item label="选择下一步状态理由" prop="nextStatusDetils" class="add-form-item">
<el-input <el-input
type="textarea" type="textarea"
v-model="qbfsForm.nextStatusDetils" v-model="qbfsForm.nextStatusDetils"
placeholder="请输入下一步状态说明" placeholder="请输入下一步状态理由"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+3 -3
View File
@@ -1543,9 +1543,9 @@
QCRBUSS: [ QCRBUSS: [
{ required: true, message: '请选择起草人', trigger: 'change' } { required: true, message: '请选择起草人', trigger: 'change' }
], ],
DTQBBHBUSS: [ // DTQBBHBUSS: [
{ required: true, message: '请选择代替企标编号', trigger: 'change' } // { required: true, message: '请选择代替企标编号', trigger: 'change' }
], // ],
DTQBBHBUSSNot: [], DTQBBHBUSSNot: [],
}, },
zrUserIds: [], // 选择多个会签责任人 zrUserIds: [], // 选择多个会签责任人
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
+1 -1
View File
@@ -37,7 +37,7 @@
<el-button <el-button
class="common-button-default" class="common-button-default"
size="small" size="small"
v-btn-permission="'23e01cb6ac6bfcedd39537f236a769e5'" v-btn-permission="'41945d15f5cb658665ef4916f62354a2'"
@click="clearSearch">清空</el-button> @click="clearSearch">清空</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
src/router/index.js
+15 -14
View File
@@ -211,16 +211,17 @@ const routes = [
path: '/personal', path: '/personal',
name: 'Personal', name: 'Personal',
redirect: () => { redirect: () => {
if (hasRouterPermission('ZY9RFA4M35') && hasRouterPermission('JCEV4AEV32')) { return '/collection'
return '/dynamics' // if (hasRouterPermission('ZY9RFA4M35') && hasRouterPermission('JCEV4AEV32')) {
} else { // return '/collection'
return getRedirectPath('ZY9RFA4M35') || '/info' // } else {
} // return getRedirectPath('ZY9RFA4M35') || '/info'
// }
}, },
component: resolve => require(['@/pages/personal'], resolve), component: resolve => require(['@/pages/personal'], resolve),
meta: { meta: {
title: '个人', title: '个人中心'
menuId: 'ZY9RFA4M35' // menuId: 'ZY9RFA4M35'
}, },
children: [ children: [
// { // {
@@ -248,9 +249,9 @@ const routes = [
name: 'MyCollection', name: 'MyCollection',
component: resolve => require(['@/pages/personal/pages/my-collection'], resolve), component: resolve => require(['@/pages/personal/pages/my-collection'], resolve),
meta: { meta: {
requireAuth: true, requireAuth: false,
title: '我的收藏', title: '我的收藏'
menuId: 'JY5LKL2HPD' // menuId: 'JY5LKL2HPD'
} }
}, },
{ {
@@ -318,9 +319,9 @@ const routes = [
name: 'MyQuestions', name: 'MyQuestions',
component: resolve => require(['@/pages/personal/pages/my-questions'], resolve), component: resolve => require(['@/pages/personal/pages/my-questions'], resolve),
meta: { meta: {
requireAuth: true, requireAuth: false,
title: '我的问答', title: '我的问答'
menuId: '' // menuId: ''
} }
}, },
{ {
@@ -328,7 +329,7 @@ const routes = [
name: 'QuestionDetail', name: 'QuestionDetail',
component: resolve => require(['@/pages/personal/pages/my-questions/components/questionDetail.vue'], resolve), component: resolve => require(['@/pages/personal/pages/my-questions/components/questionDetail.vue'], resolve),
meta: { meta: {
requireAuth: true, requireAuth: false,
title: '问题详情', title: '问题详情',
menuId: '' menuId: ''
} }
yarn.lock
+3371 -3348
View File
File diff suppressed because it is too large Load Diff