WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhn
2022-03-09 18:11:22 +08:00
parent b80addc3d2 13e8a09d15
commit 2fac0fc582
12 changed files with 74 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/Standardselection/index.vue
+1
View File
@@ -180,6 +180,7 @@
this.replacePage()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.replacePage()
}
jero-web/src/components/coTable/index.vue
+1
View File
@@ -187,6 +187,7 @@
this.getTableList()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.getTableList()
},
jero-web/src/components/frameAssembly/index.vue
+1
View File
@@ -155,6 +155,7 @@
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.getTableList()
},
jero-web/src/components/ocrTable/docTable.vue
+1
View File
@@ -211,6 +211,7 @@
this.getTableList()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.getTableList()
},
jero-web/src/components/tableDate/index.vue
+1
View File
@@ -207,6 +207,7 @@
this.getTableList()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.getTableList()
},
jero-web/src/views/documentManage/library/docDetail/index.vue
+63 -7
View File
@@ -34,7 +34,7 @@
</div>
</div>
</div>
<div style="overflow: auto;margin-top: 68px;background: #fff">
<div style="margin-top: 68px;background: #fff">
<div class="detail-content">
<div v-for="(item,index) in detailList" class="content-box">
<div v-for="val in Object.keys(item)" class="content">
@@ -59,9 +59,11 @@
{{ol.value ? ol.value.fileName : '--'}}
</span>
</span>
<span class="TextInformationContentright" v-show="ol.value" @click="download(ol.value)">
<a-icon type="vertical-align-bottom"/>
<span class="TextInformationContentright">
<span v-show="ol.value" @click="download(ol.value)">
<a-icon type="vertical-align-bottom"/>
{{$t('download')}}
</span>
</span>
</span>
</div>
@@ -69,11 +71,13 @@
<div class="TextInformation" v-else-if="val == $t('relatedInformation')">
<div class="TextInformationContent" v-for="(ol,index1) in item[val]" style="width: 100%">
<span class="TextInformationContentLeft">
<span :title="ol.db_field_txt" @click="relatedClick(ol)">{{ol.db_field_txt}}</span>
<span :title="ol.db_field_txt"
>{{ol.db_field_txt}}</span>
</span>
<span class="TextInformationContentcontentButton">
<span :title="ol.value">{{ol.value ? ol.value : '--'}}</span>
</span>
<span style="cursor: pointer" @click="relatedClick(ol)"
:title="ol.value">{{ol.value ? ol.value : '--'}}</span>
</span>
</div>
</div>
</div>
@@ -112,6 +116,29 @@
/>
</div>
</a-modal>
<a-modal
:title="'标准'"
:width="600"
:visible="visibleRelated"
:maskClosable="false"
@ok="visibleRelated = false"
@cancel="visibleRelated = false"
>
<a-table
class="table"
:columns="columnsRelated"
:pagination="false"
:scroll="{y: 400}"
:data-source="dataSourceRelated"
:loading="loading"
>
<span slot="operation" slot-scope="text,record">
<a class="text" :title="text" @click="detailClick(record)">
{{text && text.length > 18?text.slice(0,17)+'...':text}}
</a>
</span>
</a-table>
</a-modal>
</div>
</template>
<script>
@@ -125,6 +152,16 @@
getInfo: 'document/bussDocumentLibraryEO/getInfoById',
list: 'log/bussLogEO/page'
},
columnsRelated: [
{
title: '标准名称',
dataIndex: 'title',
align: 'center',
ellipsis: true,
scopedSlots: { customRender: 'operation' }
}
],
dataSourceRelated: [],
detailList: [],
visible: false,
confirmLoading: false,
@@ -133,6 +170,7 @@
pageNo: 1,
pageSize: 10,
total: 0,
visibleRelated: false,
columns: [
{
title: this.$t('ModificationContent'),
@@ -171,6 +209,7 @@
})
},
pdfPreview(fileQuery) {
console.log(fileQuery)
let fileName = fileQuery.fileName
let index1 = fileName.lastIndexOf('.')
let index2 = fileName.length
@@ -234,12 +273,25 @@
}
})
},
relatedClick(val) {
detailClick(val) {
let newUrl = this.$router.resolve({
path: '/docManage/library/detail',
query: val
})
this.visibleRelated = false
window.open(newUrl.href, '_blank')
},
relatedClick(val) {
if (val.list && val.list.length == 1) {
let newUrl = this.$router.resolve({
path: '/docManage/library/detail',
query: val.list[0]
})
window.open(newUrl.href, '_blank')
} else {
this.visibleRelated = true
this.dataSourceRelated = val.list
}
}
}
}
@@ -432,4 +484,8 @@
overflow: hidden;
text-align: right;
}
.content-box:last-child {
margin-bottom: 20px;
}
</style>
jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
+1
View File
@@ -328,6 +328,7 @@
this.pageNo = page
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
}
}
jero-web/src/views/documentTools/searchCenter/components/whole.vue
+1
View File
@@ -123,6 +123,7 @@
this.pageNo = page
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
}
}
jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue
+1
View File
@@ -114,6 +114,7 @@
this.queryProcess()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.queryProcess()
},
jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue
+1
View File
@@ -124,6 +124,7 @@
this.queryProcess()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.queryProcess()
},
jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue
+1
View File
@@ -123,6 +123,7 @@
this.queryProcess()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.queryProcess()
},
jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
+1
View File
@@ -169,6 +169,7 @@
this.queryProcess()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.queryProcess()
},