From 0178d9e48a87629f8b5f5f5075409d9ab6d29d87 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 30 八月 2023 17:24:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/flow/flowPath.vue | 197 +++++++------------------------------------------
1 files changed, 28 insertions(+), 169 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/flow/flowPath.vue b/Source/UBCS-WEB/src/views/flow/flowPath.vue
index 8a034ed..7bfb746 100644
--- a/Source/UBCS-WEB/src/views/flow/flowPath.vue
+++ b/Source/UBCS-WEB/src/views/flow/flowPath.vue
@@ -1,191 +1,50 @@
<template>
<div>
<el-button @click="outerVisible = true">娴佺▼娴嬭瘯</el-button>
- <el-dialog :title="`鎵ц${title}`" width="90%" append-to-body="true" :visible.sync="outerVisible">
- <div class="dialogwarp">
- <div class="dialogwarp_tab">
- <el-card class="dialogwarp_tab_card">
- <el-tabs v-model="activeName" @tab-click="handleClick">
- <el-tab-pane label="涓氬姟鏁版嵁淇℃伅" name="first">
-
- </el-tab-pane>
- <el-tab-pane label="娴佺▼璺熻釜" name="second">
- <avue-crud :data="data" :option="option" ref="crud">
- </avue-crud>
- <div style="padding: 10px 0; width: 100%; height: 100% ">
- <el-image :src="url" flt="fill"></el-image>
- </div>
-
- </el-tab-pane>
- </el-tabs>
- </el-card>
- </div>
- <div class="dialogwarp_card">
- <el-card class="box-card">
- <div slot="header" class="clearfix">
- <span>褰撳墠浠诲姟锛�</span>
- <span>{{ title }}</span>
- </div>
- <div style="width: 100%;">
- <p>璇峰湪涓嬫柟杈撳叆鎮ㄧ殑瀹℃壒鎰忚锛�</p>
- <el-input type="textarea" :rows="4" placeholder="璇疯緭鍏ュ唴瀹�" show-word-limit v-model="opinionVal">
- </el-input>
- </div>
- <div style="width: 100%;">
- <p>瀹℃壒鎰忚闄勪欢锛�</p>
- <el-upload drag action="https://jsonplaceholder.typicode.com/posts/" multiple
- style="width: 100%;">
- <i class="el-icon-upload"></i>
- <div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
- </el-upload>
- </div>
- <div style="width: 100%;">
- <p>宸蹭笂浼犲鎵规枃浠讹細</p>
- <el-card class="box-card">
- <el-table :data="tableData" stripe style="width: 100%">
- <el-table-column prop="date" label="鏂囦欢鍚�">
- </el-table-column>
- <el-table-column prop="name" label="涓婁紶浜� ">
- </el-table-column>
- <el-table-column prop="address" label="鎿嶄綔">
- </el-table-column>
- </el-table>
- </el-card>
- </div>
- <div style="margin-top: 20px;">
- <el-button v-if="!isRefuse" type="primary" size="mini" @click="handelAgree">鍚屾剰</el-button>
- <el-button v-if="!isAgree" type="primary" size="mini" @click="handelRefuse">涓嶅悓鎰�</el-button>
- <el-button v-if="isAgree && !isRefuse" type="primary" size="mini" @click="handelRevert"
- v-for="item in btnList" :key="item">{{ item }}</el-button>
- <el-button v-if="isRefuse" type="primary" size="mini" @click="handelExecute">鎵ц</el-button>
- </div>
- </el-card>
- </div>
- </div>
- </el-dialog>
+ <el-button @click="handleTable">浜哄憳璁剧疆</el-button>
+ <flow-business :visible.sync="outerVisible"></flow-business>
+ <set-personnel :visible.sync="visibleFlow" :parameter="parameter" :parameter-keys="props" ></set-personnel>
</div>
</template>
<script>
+import FlowBusiness from '@/components/template/Business'
+import SetPersonnel from '@/components/template/SetPersonnel'
export default {
+ components: {
+ FlowBusiness,
+ SetPersonnel
+ },
data() {
return {
outerVisible: false,
- destroyClose: true,
- activeName: 'first',
- fits: ['fill', 'contain', 'cover', 'none', 'scale-down'],
- url: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
- title: '涓氬姟娴嬭瘯-鐢宠-鐗╁搧-瀹℃牳',
- data: [
- {
- name: '寮犱笁',
- sex: '鐢�'
- }, {
- name: '鏉庡洓',
- sex: '濂�'
- }, {
- name: '鏉庡洓',
- sex: '濂�'
- }, {
- name: '鏉庡洓',
- sex: '濂�'
+ visibleFlow: false,
+ parameter:{
+ ids:['0000','22222222'],
+ code:'8b5e2017-990f-454a-9c39-4c4eeeb57553',
+ type:'PUBLIC',
+ template:'妯℃澘template',
+ vars:{
+ name:'111',
+ sex:'222'
}
- ],
- btnList: ['杩斿洖1', '杩斿洖1', '杩斿洖1'],
- isAgree: false,
- isRefuse: false,
- opinionVal: '',
- option: {
- menu: false,
- addBtn: false,
- refreshBtn: false,
- columnBtn: false,
- index: true,
- header: false,
- stripe: true,
- indexLabelClassName: '搴忓彿',
- column: [
- { label: '浠诲姟鍚嶇О', prop: 'name', minWidth: 120 },
- { label: '鎵ц鎿嶄綔', prop: 'sex', minWidth: 80 },
- { label: '浠诲姟寮�濮嬫椂闂�', prop: 'sex', minWidth: 140 },
- { label: '瀹℃壒鎰忚', prop: 'sex', minWidth: 220, overHidden: true },
- { label: '鎵ц浜�', prop: 'sex', minWidth: 80 },
- { label: '浠诲姟瀹屾垚鏃堕棿', prop: 'sex', minWidth: 140 },
- { label: '宸蹭笂浼犲鎵规枃浠�', prop: 'sex', minWidth: 220, overHidden: true },
- ]
},
+ props:{
+ flowTemplate:'template',
+ type:'type',
+ ids:'ids',
+ code:'code'
+ }
}
},
methods: {
- closeDialog() {
- this.destroyClose = true
- this.outerVisible = false
- },
- handleClick(tab, event) {
+ handleSave(event) {
console.log(event)
},
- handelAgree() {
- this.isAgree = !this.isAgree
- this.outerVisible = false
- console.log(this.isAgree)
- },
- handelRefuse() {
- if (!this.opinionVal) {
- this.$alert('褰撳鐞嗘柟寮忎负涓嶅悓鎰忔椂锛岄渶瑕佸～鍐欏鎵规剰瑙�', '鎻愮ず淇℃伅', {
- confirmButtonText: '纭畾',
- }).then(() => {
-
- });
- } else {
- this.isRefuse = true
- this.isAgree = true
- this.outerVisible = false
- this.opinionVal = ''
- }
- },
- handelExecute() {
- this.outerVisible = false
- this.isAgree = false
- this.isRefuse = false
- },
- handelRevert() {
- this.outerVisible = false
- this.isAgree = false
+ handleTable(){
+ this.visibleFlow = true
}
}
}
</script>
-<style lang="scss" scoped>
-.dialogwarp {
- display: -webkit-box;
- display: -ms-flexbox;
- display: flex;
- justify-content: space-between;
- height: 70vh;
-
- &_tab {
- width: 79%;
-
-
- &_card {
- width: 100%;
- height: 100%;
- }
- }
-
- &_card {
- // margin-left: 20px;
- width: 20%;
- }
-}
-
-/deep/ .el-upload,
-/deep/ .el-upload-dragger {
- width: 100%;
- height: 120px;
-}
-
-/deep/ .el-upload-dragger .el-icon-upload {
- margin: 15px 0 16px;
-}
-</style>
\ No newline at end of file
+<style lang="scss" scoped></style>
\ No newline at end of file
--
Gitblit v1.9.3