From cfededd9721be4322e660fc879f11a806fcc7963 Mon Sep 17 00:00:00 2001
From: weidy <lastanimals@163.com>
Date: 星期二, 20 六月 2023 17:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index f8ab6cd..f895fb8 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="parameter"
+ <set-personnel :visible.sync="visibleFlow" :parameter="this.parameter"
></set-personnel>
<el-button plain size="small" type="primary" @click="DataChange">鏁版嵁鏇存敼</el-button>
<FormTemplateDialog
@@ -150,6 +150,7 @@
},
templateOid: {
type: String,
+ default:''
},
tableHeadDataFateher: {
type: Array,
@@ -168,8 +169,8 @@
similarVisible:false,
//鍙戝竷
parameter:{
- ids:['0000','22222222'],
- code:this.templateOid,
+ ids:[],
+ code:'',
type:'PUBLIC',
template:'妯℃澘template'
},
@@ -180,7 +181,6 @@
label: 'name'
},
tableHeadFindDatas:[],
- templateOid: "",
addvisible: false,
editvisible: false,
findvisible: false,
@@ -213,11 +213,9 @@
},
computed: {},
created() {
- // this.CrudHeaderRend();
- // this.tableHeadHandle()
+
},
mounted() {
-
},
activated() {
this.doLayout()
@@ -245,13 +243,21 @@
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;
@@ -386,6 +392,10 @@
}
this.selectRow = row;
console.log(row)
+ row.forEach(item=>{
+ this.parameter.ids.push(item.oid)
+ console.log( this.parameter.ids)
+ })
},
//缂栬緫
editHandler() {
@@ -405,7 +415,8 @@
},
//楂樼骇鏌ヨ鎸夐挳
findHandler(){
- this.findvisible=true
+ this.findvisible=true;
+ console.log(this.options)
},
// 楂樼骇鏌ヨ
echoContion(val) {
--
Gitblit v1.9.3