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-09-23 09:48:56 +08:00
parent dda6d8c084 6b6e441cf2
commit 1edffa1239
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/components/RelatedTermsSelect.vue
+2 -2
View File
@@ -190,9 +190,9 @@ export default {
page: this.pageNo,
pageSize: this.$store.getters.userInfo.configContent,
standId: this.standId,
fileType: this.fileType,
splitStatus: '2'
fileType: this.fileType
}
// splitStatus: '2'
this.$http.get('lawss/sarFileSplitInfo/getSarFileSplitInfoEOPage',
formData,
{
src/pages/details/otherStandardDetails/index.vue
+2 -1
View File
@@ -515,7 +515,7 @@
type="primary"
class="common-button-primary"
@click="openRelatedTermsDrawer"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '28CUM4KPUXDMCCMTFUQA' : 'R62HAB3QEMD27BZ7XHCM'"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
>关联条款
</el-button>
</div>
@@ -2382,6 +2382,7 @@ export default {
}
}, e => {
})
console.log(this.standItemSearch);
},
downloadFile(attId) {
if (attId != null && attId !== '') {
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+1 -1
View File
@@ -267,7 +267,7 @@
<span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="50" fixed="right">
<el-table-column label="操作" align="center" width="50">
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand">
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+1 -1
View File
@@ -275,7 +275,7 @@
<span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="50" fixed="right">
<el-table-column label="操作" align="center" width="50" >
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand">
src/pages/searchCenter/pages/standardSearch.vue
+4 -3
View File
@@ -114,8 +114,8 @@
:label="$t('m.putTime')"
width="130">
<template slot-scope="scope">
<div v-if="selectIndex === 'stand' ? (scope.row.SSRQ !== null && scope.row.SSRQ !== undefined && scope.row.SSRQ !== '') : (scope.row.putTime !== null && scope.row.putTime !== undefined && scope.row.putTime !== '')">
{{ $dateFormat(new Date((selectIndex === 'stand') ? scope.row.SSRQ : scope.row.putTime), "yyyy-MM-dd") }}
<div v-if="selectIndex === 'stand' || selectIndex === 'bussstand' ? (scope.row.SSRQ !== null && scope.row.SSRQ !== undefined && scope.row.SSRQ !== '') : (scope.row.putTime !== null && scope.row.putTime !== undefined && scope.row.putTime !== '')">
{{ $dateFormat(new Date((selectIndex === 'stand' || (selectIndex === 'bussstand' && scope.row.standType === 'FOREIGN')) ? scope.row.SSRQ : scope.row.putTime), "yyyy-MM-dd") }}
</div>
<div v-else></div>
</template>
@@ -129,7 +129,7 @@
<span v-if="selectIndex === 'laws'">{{ getLawsState(scope.row.statecode) }}</span>
<div v-else :class="selectIndex === 'enterprise' ? (scope.row.textStatusBussName === '参考' ? 'yellowClass' :
(scope.row.textStatusBussName === '作废' || scope.row.textStatusBussName === '被代替' ? 'redClass' : '')) : ''">
{{ selectIndex === 'stand' ? scope.row.textStatusName : (selectIndex === 'laws' ? scope.row.textStatusLawsName : scope.row.textStatusBussName) }}</div>
{{ selectIndex === 'stand'|| (selectIndex === 'bussstand' && scope.row.standType === 'FOREIGN') ? scope.row.textStatusName : (selectIndex === 'laws' ? scope.row.textStatusLawsName : scope.row.textStatusBussName) }}</div>
</template>
</el-table-column>
<el-table-column
@@ -1277,6 +1277,7 @@
}
if(condition.selectIndex === 'enterprise'){
condition.selectIndex='bussstand'
condition.standType = 'bussstand'
condition.textStatusBuss = condition.BUSSSTATE
condition.QCDW = condition.ORGLIST
}