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/views/flow/flowPath.vue | 74 ++++++++----------------------------
1 files changed, 17 insertions(+), 57 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/flow/flowPath.vue b/Source/UBCS-WEB/src/views/flow/flowPath.vue
index e14690f..8aec65c 100644
--- a/Source/UBCS-WEB/src/views/flow/flowPath.vue
+++ b/Source/UBCS-WEB/src/views/flow/flowPath.vue
@@ -1,73 +1,36 @@
<template>
<div>
<el-button @click="outerVisible = true">娴佺▼娴嬭瘯</el-button>
- <el-button @click="visibleStage = true">妯℃澘闃舵</el-button>
- <el-button @click="handleTable">table绌挎妗�</el-button>
+ <el-button @click="handleTable">浜哄憳璁剧疆</el-button>
<flow-business :visible.sync="outerVisible"></flow-business>
- <stage code="8b5e2017-990f-454a-9c39-4c4eeeb57553"></stage>
- <table-transfer :visible.sync="visibleTable" v-model="value" :dataList="list" :columns="columns" keyName="id"
- @save="handleSave"></table-transfer>
+ <set-personnel :visible.sync="visibleFlow" :parameter="parameter" :parameter-keys="props" ></set-personnel>
</div>
</template>
<script>
import FlowBusiness from '@/components/template/Business'
-import FlowPath from '@/components/template/FlowPath'
-import Stage from '@/components/template/Stage'
-import TableTransfer from '@/components/template/TableTransfer'
+import SetPersonnel from '@/components/template/SetPersonnel'
export default {
components: {
FlowBusiness,
- FlowPath,
- Stage,
- TableTransfer
+ SetPersonnel
},
data() {
- const getTables = () => {
- let data = []
- for (let i = 0; i < 5; i++) {
- let item = {
- id: `${i + 1}`,
- name: 'name',
- address: `闆嗗洟鐮�${i + 1}`,
- data: '',
- checked: i === 1 ? true : false,
- }
- data.push(item)
- }
- return data
- }
return {
- list: getTables(),
- value: ['2'],
outerVisible: false,
visibleFlow: false,
- visibleStage: false,
- visibleTable: false,
-
- columns: [
- {
- key: "id",
- label: "id",
- visible: false,
- },
- {
- key: "name",
- label: "灞炴�х紪鍙�",
- visible: true,
- },
- {
- key: "address",
- label: "灞炴�у悕绉�",
- visible: true,
- },
- {
- key: "address",
- label: "灞炴�у垎缁�",
- visible: true,
- },
- ],
-
+ parameter:{
+ ids:['0000','22222222'],
+ code:'8b5e2017-990f-454a-9c39-4c4eeeb57553',
+ type:'PUBLIC',
+ template:'妯℃澘template'
+ },
+ props:{
+ flowTemplate:'template',
+ type:'type',
+ ids:'ids',
+ code:'code'
+ }
}
},
methods: {
@@ -75,10 +38,7 @@
console.log(event)
},
handleTable(){
- this.visibleTable = true
- // this.$nextTick(()=>{
-
- // })
+ this.visibleFlow = true
}
}
}
--
Gitblit v1.9.3