From b5b28e8b9c639f49e69efc60684e68bf642d1092 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 21 六月 2023 16:43:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index b17dbae..f58d3b0 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -28,7 +28,7 @@
@submit="EditSumbit"
></FormTemplateDialog>
<el-button plain size="small" type="primary">鎵归噺瀵煎叆鐢宠</el-button>
- <el-button plain size="small" type="primary">鍘嗗彶鏁版嵁瀵煎叆</el-button>
+ <el-button plain size="small" type="primary" @click="historyVisible = true">鍘嗗彶鏁版嵁瀵煎叆</el-button>
<el-button plain size="small" type="primary">鎵归噺鐢宠缂栫爜</el-button>
<el-button plain size="small" type="primary">鎵归噺鍙戝竷</el-button>
<el-button plain size="small" type="primary">鏌ョ湅娴佺▼鍘嗗彶</el-button>
@@ -111,6 +111,7 @@
@current-change="handleCurrentChange">
</el-pagination>
</div>
+ <historyImport :visible.sync="historyVisible" :codeClassifyOid="codeClassifyOid" type="historyImport"></historyImport>
</basic-container>
</template>
<script>
@@ -119,11 +120,13 @@
import integrationTransfer from '@/views/integration/integrationTransfer'
import SetPersonnel from '@/components/template/SetPersonnel'
import ResembleQueryDialog from "@/components/FormTemplate/ResembleQueryDialog.vue";
+import historyImport from '../BatchImport/index.vue'
export default {
components: {
integrationTransfer,
SetPersonnel,
- ResembleQueryDialog
+ ResembleQueryDialog,
+ historyImport
},
name: "Crud.vue",
props: {
@@ -208,7 +211,8 @@
tableHeadData: [],
items: {},
seniorQueryColumns: [],
- selectRow: []
+ selectRow: [],
+ historyVisible: false
}
},
computed: {},
@@ -223,6 +227,11 @@
this.doLayout()
},
watch: {
+ tableHeadDataFateher:{
+ handler(newval,oldval){
+ this.options=newval.tableDefineVO.seniorQueryColumns
+ }
+ },
codeClassifyOid: {
handler(newval, oldval) {
this.codeClassifyOid = newval;
--
Gitblit v1.9.3