diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue
index e3ae74377..cc552b957 100644
--- a/jero-web/src/views/documentManage/library/docDetail/index.vue
+++ b/jero-web/src/views/documentManage/library/docDetail/index.vue
@@ -9,11 +9,9 @@
+ v-html="serial_number">
-
-
+
{{$t('StandardDetails')}}
@@ -258,6 +256,7 @@
+ {{$t('dataLoading')}}
@@ -275,10 +274,12 @@
return {
url: {
getInfo: 'document/bussDocumentLibraryEO/getInfoById',
- list: 'log/bussLogEO/page'
+ list: 'log/bussLogEO/page',
+ getTitle: '/document/bussDocumentLibraryEO/getTitle'
},
titleHeader: '',
visibleFile: false,
+ loading: false,
columnsRelated: [
{
title: this.$t('standardName'),
@@ -306,6 +307,7 @@
dataSourceRelated: [],
detailList: [],
visible: false,
+ serial_number: '',
confirmLoading: false,
downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
loading: false,
@@ -341,24 +343,30 @@
}
},
created() {
- this.getInfoById()
- if (this.$route.query.serial_number && this.$route.query.title) {
- this.titleHeader = this.$route.query.serial_number + ' 《' + this.$route.query.title + ' 》' + this.$t('StandardDetails')
- } else if (!this.$route.query.serial_number && this.$route.query.title) {
- this.titleHeader = '《' + this.$route.query.title + '》' + this.$t('StandardDetails')
- } else if (this.$route.query.serial_number && !this.$route.query.title) {
- this.titleHeader = this.$route.query.serial_number + ' 《' + ' 》' + this.$t('StandardDetails')
- } else {
- this.titleHeader = ' 《' + ' 》' + this.$t('StandardDetails')
- }
+ let _this = this
+ this.loading = true
+ this.getTitle(function() {
+ _this.getInfoById()
+ })
},
methods: {
+ getTitle(callback) {
+ let _id = this.$route.query.documentId === undefined ? this.$route.query.id : this.$route.query.documentId
+ getAction(this.url.getTitle, { id: _id }).then((res) => {
+ if (res.success) {
+ this.serial_number = res.result
+ callback && callback()
+ } else {
+ this.serial_number = ''
+ }
+ })
+ },
getInfoById() {
let _id = this.$route.query.documentId === undefined ? this.$route.query.id : this.$route.query.documentId
- console.log(_id)
getAction(this.url.getInfo, { id: _id }).then((res) => {
if (res.success) {
this.detailList = res.result
+ this.loading = false
} else {
this.detailList = []
}
diff --git a/jero-web/src/views/system/DictItemList.vue b/jero-web/src/views/system/DictItemList.vue
index 83986357d..41a03ead3 100644
--- a/jero-web/src/views/system/DictItemList.vue
+++ b/jero-web/src/views/system/DictItemList.vue
@@ -53,7 +53,7 @@
ref="table"
rowKey="id"
size="middle"
- :scroll="{x: 900}"
+ :scroll="{x: '100%'}"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
@@ -94,22 +94,29 @@
{
title: this.$t('name'),
align: "center",
+ width:100,
+ ellipsis: true,
dataIndex: 'itemText',
},
{
title: this.$t('enName'),
align: "center",
+ width:100,
+ ellipsis: true,
dataIndex: 'enName',
},
{
title: this.$t('DataValue'),
align: "center",
+ width:100,
+ ellipsis: true,
dataIndex: 'itemValue',
},
{
title: this.$t('operation'),
dataIndex: 'action',
align: "center",
+ width:80,
scopedSlots: {customRender: 'action'},
}
],
@@ -122,7 +129,7 @@
},
title: this.$t('operation'),
visible: false,
- screenWidth: 800,
+ screenWidth: 900,
model: {},
dictId: "",
status: 1,
diff --git a/jero-web/src/views/system/DictList.vue b/jero-web/src/views/system/DictList.vue
index 852a42dd9..207cb1fcd 100644
--- a/jero-web/src/views/system/DictList.vue
+++ b/jero-web/src/views/system/DictList.vue
@@ -129,10 +129,17 @@
align: 'center',
dataIndex: 'dictName',
width: '25%',
- ellipsis: true,
+ ellipsis: true
},
// {
// title: this.$t('DictionaryEnName'),
+ // align: 'center',
+ // dataIndex: 'dictEnName',
+ // width: '180',
+ // ellipsis: true
+ // },
+ // {
+ // title: this.$t('DictionaryEnName'),
// align: "left",
// width: 180,
// dataIndex: 'dictEnName',
@@ -142,14 +149,14 @@
align: 'center',
dataIndex: 'dictCode',
width: '25%',
- ellipsis: true,
+ ellipsis: true
},
{
title: this.$t('describe'),
align: 'center',
dataIndex: 'description',
width: '25%',
- ellipsis: true,
+ ellipsis: true
},
{
title: this.$t('operation'),
diff --git a/jero-web/src/views/system/modules/DictItemModal.vue b/jero-web/src/views/system/modules/DictItemModal.vue
index 420753ad2..dae926132 100644
--- a/jero-web/src/views/system/modules/DictItemModal.vue
+++ b/jero-web/src/views/system/modules/DictItemModal.vue
@@ -14,39 +14,44 @@
-
+ :label="$t('name')">
+
+
+
+
+
+
+
-
+ :label="$t('describe')">
+
-
-
-
-
+ :label="$t('sort')">
值越小越靠前,支持小数
-
-
-
+
+
+
+
+
+
+
@@ -55,130 +60,168 @@