From 6591f311ef912f2087e0822677753fd61476bd84 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Sun, 16 Feb 2020 17:03:37 +0800
Subject: [PATCH] =?UTF-8?q?:heavy=5Fplus=5Fsign:=20=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E6=B7=BB=E5=8A=A0=E9=80=9A?=
 =?UTF-8?q?=E7=94=A8=E3=80=81=E5=AE=9A=E5=88=B6=E6=B5=81=E7=A8=8B=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/flow/manager.vue | 38 ++++++++++++++++++++++++++------------
 src/views/work/start.vue   |  2 +-
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/views/flow/manager.vue b/src/views/flow/manager.vue
index 21c842e..b653b02 100644
--- a/src/views/flow/manager.vue
+++ b/src/views/flow/manager.vue
@@ -15,13 +15,10 @@
                @refresh-change="refreshChange"
                @on-load="onLoad">
       <template slot="menuLeft">
-        <el-button type="danger"
-                   size="small"
-                   icon="el-icon-delete"
-                   v-if="permission.flow_manager_remove"
-                   plain
-                   @click="handleDelete">删 除
-        </el-button>
+        <el-radio-group v-model="mode" size="small">
+          <el-radio-button label="1">通用流程</el-radio-button>
+          <el-radio-button label="2">定制流程</el-radio-button>
+        </el-radio-group>
       </template>
       <template slot-scope="scope" slot="menu">
         <el-button type="text"
@@ -46,6 +43,10 @@
                    @click.stop="handleSlotDelete(scope.row,scope.index)">删除
         </el-button>
       </template>
+      <template slot-scope="{row}"
+                slot="tenantId">
+        <el-tag>{{row.tenantId===''?'通用':row.tenantId}}</el-tag>
+      </template>
       <template slot-scope="{row}"
                 slot="version">
         <el-tag>v{{row.version}}</el-tag>
@@ -117,6 +118,7 @@
     data() {
       return {
         form: {},
+        mode: '1',
         selectionId: '',
         selectionList: [],
         query: {},
@@ -153,6 +155,12 @@
           dialogWidth: 900,
           menuWidth: 150,
           column: [
+            {
+              label: '租户编号',
+              prop: 'tenantId',
+              slot: true,
+              width: 120,
+            },
             {
               label: '流程主键',
               prop: 'id',
@@ -205,6 +213,11 @@
         data: []
       };
     },
+    watch: {
+      'mode'() {
+        this.onLoad(this.page);
+      }
+    },
     computed: {
       ...mapGetters(["permission"]),
       permissionList() {
@@ -318,10 +331,10 @@
         this.flowUrl = `/api/blade-flow/process/resource-view?processDefinitionId=${row.id}`;
         this.flowBox = true;
       },
-      currentChange(currentPage){
+      currentChange(currentPage) {
         this.page.currentPage = currentPage;
       },
-      sizeChange(pageSize){
+      sizeChange(pageSize) {
         this.page.pageSize = pageSize;
       },
       refreshChange() {
@@ -330,8 +343,9 @@
       onLoad(page, params = {}) {
         const values = {
           ...params,
-          category: (params.category) ? flowCategory(params.category) : null
-        }
+          category: (params.category) ? flowCategory(params.category) : null,
+          mode: this.mode
+        };
         this.loading = true;
         managerList(page.currentPage, page.pageSize, Object.assign(values, this.query)).then(res => {
           const data = res.data.data;
@@ -348,6 +362,6 @@
 <style>
   .none-border {
     border: 0;
-    background-color: transparent!important;
+    background-color: transparent !important;
   }
 </style>
diff --git a/src/views/work/start.vue b/src/views/work/start.vue
index 53419a6..6360a7a 100644
--- a/src/views/work/start.vue
+++ b/src/views/work/start.vue
@@ -118,7 +118,7 @@
               label: '租户编号',
               prop: 'tenantId',
               slot: true,
-              width: 150,
+              width: 120,
             },
             {
               label: "流程分类",