diff --git a/jero-web/src/components/UpdateLog/index.vue b/jero-web/src/components/UpdateLog/index.vue
index 254502f4b..f29fb58b8 100644
--- a/jero-web/src/components/UpdateLog/index.vue
+++ b/jero-web/src/components/UpdateLog/index.vue
@@ -5,10 +5,10 @@
:visible="visible"
:confirm-loading="confirmLoading"
:maskClosable="false"
- @cancel="visible = false"
+ @cancel="visible = false;$emit('visible')"
>
-
+
{{$t('cancel')}}
diff --git a/jero-web/src/views/documentTools/virtualList/components/addModel.vue b/jero-web/src/views/documentTools/virtualList/components/addModel.vue
index c946cdf25..95e9b29d8 100644
--- a/jero-web/src/views/documentTools/virtualList/components/addModel.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/addModel.vue
@@ -62,6 +62,7 @@
import { getAction, postAction } from '@/api/manage'
import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
+ import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
export default {
name: 'addModel',
@@ -108,6 +110,7 @@
default: {}
}
},
+ mixins:[ResizeHeader, ResizeColumnProvide],
data() {
return {
toggleSearchStatus: false,
@@ -120,19 +123,22 @@
title: this.$t('standard'),
dataIndex: 'serial_number',
align: 'left',
- ellipsis: true
+ ellipsis: true,
+ width: 228
},
{
title: this.$t('title'),
dataIndex: 'title',
align: 'left',
- ellipsis: true
+ ellipsis: true,
+ width: 228
},
{
title: this.$t('zoneOfApplication'),
dataIndex: 'region',
align: 'left',
- ellipsis: true
+ ellipsis: true,
+ width: 228
},
// {
// title: this.$t('status'),
@@ -150,13 +156,15 @@
title: this.$t('ImplementationDate'),
dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
align: 'left',
- ellipsis: true
+ ellipsis: true,
+ width: 228
},
{
title: this.$t('vehicleInProductionDate'),
dataIndex: 'implement_time',
align: 'left',
- ellipsis: true
+ ellipsis: true,
+ width: 228
}
// {
// title: this.$t('correspondingStandard'),
@@ -250,6 +258,7 @@
},
handleCancel() {
this.visible = false
+ this.$emit('visible')
},
handleSubmit() {
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue
index fa979df36..0fea84383 100644
--- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue
@@ -737,6 +737,7 @@
},
handleCancel() {
this.visible = false
+ this.$emit('visible')
},
handleSubmit() {
this.$refs.ruleForm.validate(valid => {
diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
index 63f07166b..27d9396cc 100644
--- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
@@ -151,7 +151,7 @@
{{$t('BatchDelete')}}
-
-
-
-
-
+
+
+
+
{
+ this.isTruee = true
+ })
return columnResult
}
},
methods: {
...mapGetters(['userInfo']),
+ sVisible(){
+ this.getDataAdmin()
+ },
handleSuperQuery(params, matchType) {
let sqp = {}
if (!params || (params && params.length == 0)) {
@@ -710,6 +721,12 @@
transferClick() {
this.$refs.transferListRef.transferModel()
},
+ getDataAdmin(){
+ this.isTrue = false
+ setTimeout(()=>{
+ this.isTrue = true
+ },100)
+ },
//导出
handleExport() {
let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
@@ -962,7 +979,7 @@