From 32f4bb41c82ded759e7db18c9fa449b1442f15c8 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期三, 21 六月 2023 16:39:12 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 35 +++++++++++++++--------------------
1 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index a73954c..f58d3b0 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -34,7 +34,7 @@
<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
@@ -153,7 +153,6 @@
},
templateOid: {
type: String,
- default:''
},
tableHeadDataFateher: {
type: Array,
@@ -172,8 +171,8 @@
similarVisible:false,
//鍙戝竷
parameter:{
- ids:[],
- code:'',
+ ids:['0000','22222222'],
+ code:this.templateOid,
type:'PUBLIC',
template:'妯℃澘template'
},
@@ -184,6 +183,7 @@
label: 'name'
},
tableHeadFindDatas:[],
+ templateOid: "",
addvisible: false,
editvisible: false,
findvisible: false,
@@ -217,14 +217,21 @@
},
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;
@@ -247,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;
@@ -396,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.9.3