From 495da50c21fa91b3bd0d37d2ed158a0ba0d79335 Mon Sep 17 00:00:00 2001
From: 康东 <98470202+kangdong59@users.noreply.github.com>
Date: 星期一, 26 六月 2023 11:12:18 +0800
Subject: [PATCH] 业务类型Feign模糊查询
---
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 45 ++++++++++++++++++++++-----------------------
1 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index f895fb8..f58d3b0 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -28,13 +28,13 @@
@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>
<el-button plain size="small" type="primary">鍒犻櫎</el-button>
<el-button plain size="small" type="primary" @click="setHandler">鍙戝竷</el-button>
- <set-personnel :visible.sync="visibleFlow" :parameter="this.parameter"
+ <set-personnel :visible.sync="visibleFlow" :parameter="parameter"
></set-personnel>
<el-button plain size="small" type="primary" @click="DataChange">鏁版嵁鏇存敼</el-button>
<FormTemplateDialog
@@ -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: {
@@ -150,7 +153,6 @@
},
templateOid: {
type: String,
- default:''
},
tableHeadDataFateher: {
type: Array,
@@ -169,8 +171,8 @@
similarVisible:false,
//鍙戝竷
parameter:{
- ids:[],
- code:'',
+ ids:['0000','22222222'],
+ code:this.templateOid,
type:'PUBLIC',
template:'妯℃澘template'
},
@@ -181,6 +183,7 @@
label: 'name'
},
tableHeadFindDatas:[],
+ templateOid: "",
addvisible: false,
editvisible: false,
findvisible: false,
@@ -208,19 +211,27 @@
tableHeadData: [],
items: {},
seniorQueryColumns: [],
- selectRow: []
+ selectRow: [],
+ historyVisible: false
}
},
computed: {},
created() {
-
+ // this.CrudHeaderRend();
+ // this.tableHeadHandle()
},
mounted() {
+
},
activated() {
this.doLayout()
},
watch: {
+ tableHeadDataFateher:{
+ handler(newval,oldval){
+ this.options=newval.tableDefineVO.seniorQueryColumns
+ }
+ },
codeClassifyOid: {
handler(newval, oldval) {
this.codeClassifyOid = newval;
@@ -243,21 +254,13 @@
this.page.total = newval;
}
},
- templateOid:{
- handler(newval,oldval) {
- this.parameter.code=newval;
- },
- deep:true
- }
},
methods: {
setHandler() {
+ this.visibleFlow = true;
+ },
+ huishouHandler() {
- if (this.selectRow.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
- } else {
- this.visibleFlow = true;
- }
},
openD() {
this.dialogPush = true;
@@ -392,10 +395,6 @@
}
this.selectRow = row;
console.log(row)
- row.forEach(item=>{
- this.parameter.ids.push(item.oid)
- console.log( this.parameter.ids)
- })
},
//缂栬緫
editHandler() {
--
Gitblit v1.10.0