From 61367639ffc5a6cf2e271454af42b35912ca8e43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Mon, 24 Oct 2022 19:01:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sys/user.vue     |   6 +-
 src/views/vm/visit.vue     |   1 +
 src/views/wf/allwork.vue   |  20 +-
 src/views/wf/ccwork.vue    | 221 +++++++++++---------
 src/views/wf/dutywork.vue  | 329 +++++++++++++++++-------------
 src/views/wf/ownerwork.vue | 405 +++++++++++++++++++++----------------
 src/views/wf/worked.vue    | 221 +++++++++++---------
 7 files changed, 694 insertions(+), 509 deletions(-)

diff --git a/src/views/sys/user.vue b/src/views/sys/user.vue
index 5c3b4d63..4fe29dea 100644
--- a/src/views/sys/user.vue
+++ b/src/views/sys/user.vue
@@ -223,7 +223,7 @@
     v-if="dialog.save"
     ref="saveDialog"
     @success="handleSaveSuccess"
-    @closed="dialog.save = false"
+    @closed="settingClose"
   ></save-dialog>
 </template>
 
@@ -316,6 +316,10 @@ export default {
     this.getGroup();
   },
   methods: {
+    settingClose(){
+      this.dialog.save = false;
+      this.$refs.table.refresh();
+    },
     //加载树数据
     async getGroup() {
       let res = await this.$API.system.dept.list.req({ page: 0 });
diff --git a/src/views/vm/visit.vue b/src/views/vm/visit.vue
index 52d8ed0d..20f7f186 100644
--- a/src/views/vm/visit.vue
+++ b/src/views/vm/visit.vue
@@ -170,6 +170,7 @@
               >查看
             </el-button>
             <el-button
+              v-if="scope.row.state == 10"
               link
               type="danger"
               size="small"
diff --git a/src/views/wf/allwork.vue b/src/views/wf/allwork.vue
index ccfcb307..1ebc65a5 100644
--- a/src/views/wf/allwork.vue
+++ b/src/views/wf/allwork.vue
@@ -1,4 +1,5 @@
 <template>
+<el-container>
   <el-header>
     <div class="left-panel">
       <el-select
@@ -17,7 +18,7 @@
       </el-select>
         <el-select
         v-model="query.script_run_last_result"
-        placeholder="执行状态"
+        placeholder="任务执行状态"
         @change="handleQuery"
         clearable
         style="margin-left: 2px"
@@ -42,7 +43,6 @@
       />
     </div>
   </el-header>
-  <el-container>
     <el-main class="nopadding">
       <scTable
         ref="table"
@@ -52,12 +52,12 @@
         stripe
         highlightCurrentRow
       >
-        <el-table-column label="ID" prop="id" width="180"></el-table-column>
         <el-table-column label="流水号" prop="sn" width="180"></el-table-column>
         <el-table-column
           label="工单标题"
           prop="title"
           width="180"
+          :show-overflow-tooltip="true"
         ></el-table-column>
 
         <el-table-column label="工作流" prop="title">
@@ -92,9 +92,17 @@
             >
           </template>
         </el-table-column>
-        <el-table-column label="处理人类型">
-          <template #default="scope">
-            {{ participant_[scope.row.participant_type] }}
+        <el-table-column label="可处理人" :show-overflow-tooltip="true">
+           <template #default="scope">
+            <span v-if="scope.row.participant_type==1">
+              {{ scope.row.participant_ .name}}
+            </span>
+            <span v-else-if="scope.row.participant_type==2">
+              <span v-for="item in scope.row.participant_" :key="item.id">{{ item.name}}/</span>
+            </span>
+            <span v-else>
+              无
+            </span>
           </template>
         </el-table-column>
         <el-table-column
diff --git a/src/views/wf/ccwork.vue b/src/views/wf/ccwork.vue
index 68286e17..c0cbe350 100644
--- a/src/views/wf/ccwork.vue
+++ b/src/views/wf/ccwork.vue
@@ -1,100 +1,135 @@
 <template>
-	<el-container>
-		<el-main class="nopadding">
-			<scTable
-				ref="table"
-				:apiObj = "apiObj"
-				:params = "params"
-				row-key="id"
-				stripe
-				highlightCurrentRow
-				hidePagination
-			>
-				<el-table-column label="ID" prop="id" width="180"></el-table-column>
-				<el-table-column label="流水号" prop="sn" width="180"></el-table-column>
-				<el-table-column label="工单标题" prop="title" width="180"></el-table-column>
-				
-				<el-table-column label="工作流" prop="title">
-					<template #default="scope">
-						{{ scope.row.workflow_.name }}
-					</template>
-				</el-table-column>
-				<el-table-column label="所在节点">
-					<template #default="scope">
-						{{ scope.row.state_.name }}
-					</template>
-				</el-table-column>
-				<el-table-column label="进行状态" prop="sort">
-					<template #default="scope">
-						<el-tag
-								:type="scope.row.act_state===0?'':scope.row.act_state===1?'':scope.row.act_state===2?'danger':scope.row.act_state===3?'danger':scope.row.act_state===5?'danger':scope.row.act_state===4?'success':''"
-						>{{act_states[scope.row.act_state]}}</el-tag>
-					</template>
-				</el-table-column>
-				<el-table-column label="处理人类型">
-					<template #default="scope">
-						{{ participant_[scope.row.participant_type] }}
-					</template>
-				</el-table-column>
-				<el-table-column label="创建时间" prop="create_time" width="150"></el-table-column>
-				<el-table-column label="操作" fixed="right" align="center" width="100">
-					<template #default="scope">
-						<el-button text size="small" type="primary" @click="handleShow(scope.row)">查看详情</el-button>
-					</template>
-				</el-table-column>
-			</scTable>
-		</el-main>
-	</el-container>
+  <el-container>
+    <el-main class="nopadding">
+      <scTable
+        ref="table"
+        :apiObj="apiObj"
+        :params="params"
+        row-key="id"
+        stripe
+        highlightCurrentRow
+      >
+        <el-table-column label="流水号" prop="sn" width="180"></el-table-column>
+        <el-table-column
+          label="工单标题"
+          prop="title"
+          width="180"
+		  :show-overflow-tooltip="true"
+        ></el-table-column>
+
+        <el-table-column label="工作流" prop="title">
+          <template #default="scope">
+            {{ scope.row.workflow_.name }}
+          </template>
+        </el-table-column>
+        <el-table-column label="所在节点">
+          <template #default="scope">
+            {{ scope.row.state_.name }}
+          </template>
+        </el-table-column>
+        <el-table-column label="进行状态" prop="sort">
+          <template #default="scope">
+            <el-tag
+              :type="
+                scope.row.act_state === 0
+                  ? ''
+                  : scope.row.act_state === 1
+                  ? ''
+                  : scope.row.act_state === 2
+                  ? 'danger'
+                  : scope.row.act_state === 3
+                  ? 'danger'
+                  : scope.row.act_state === 5
+                  ? 'danger'
+                  : scope.row.act_state === 4
+                  ? 'success'
+                  : ''
+              "
+              >{{ act_states[scope.row.act_state] }}</el-tag
+            >
+          </template>
+        </el-table-column>
+        <el-table-column label="可处理人" :show-overflow-tooltip="true">
+                     <template #default="scope">
+            <span v-if="scope.row.participant_type==1">
+              {{ scope.row.participant_ .name}}
+            </span>
+            <span v-else-if="scope.row.participant_type==2">
+              <span v-for="item in scope.row.participant_" :key="item.id">{{ item.name}}/</span>
+            </span>
+            <span v-else>
+              无
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="创建时间"
+          prop="create_time"
+          width="150"
+        ></el-table-column>
+        <el-table-column label="操作" fixed="right" align="center" width="100">
+          <template #default="scope">
+            <el-button
+              text
+              size="small"
+              type="primary"
+              @click="handleShow(scope.row)"
+              >查看</el-button
+            >
+          </template>
+        </el-table-column>
+      </scTable>
+    </el-main>
+  </el-container>
 </template>
 
 <script>
-	export default {
-		name: "state",
-		data() {
-			return {
-				apiObj: this.$API.wf.ticket.list,
-				params: {"category": "cc"},
-				act_states: {
-					0: "草稿中",
-					1: "进行中",
-					2: "被退回",
-					3: "被撤回",
-					4: "已完成",
-					5: "已关闭",
-				},
-				participant_: {
-					0: "无处理人",
-					1: "个人",
-					2: "多人",
-				},
-			};
-		},
-		mounted() {
-		},
-		methods: {
-			handleShow(row) {
-				let cateType = row.workflow_.key;
-				let projectId = null;
-				if (cateType === 'visit') {
-					projectId = row.ticket_data.visit;
-				} else if (cateType === 'rpj') {
-					projectId = row.ticket_data.rpj;
-				} else if(cateType.indexOf('opl_')!=-1){
-					projectId = row.ticket_data.opl;
-					cateType = 'opl'
-				}
-				this.$router.push({
-					path: "ticketdetail",
-					query: {
-						id: row.id,
-						type: 'show',
-						projectId: projectId,
-						catetype: cateType,
-					},
-				});
-			},
-		},
-	};
+export default {
+  name: "state",
+  data() {
+    return {
+      apiObj: this.$API.wf.ticket.list,
+      params: { category: "cc" },
+      act_states: {
+        0: "草稿中",
+        1: "进行中",
+        2: "被退回",
+        3: "被撤回",
+        4: "已完成",
+        5: "已关闭",
+      },
+      participant_: {
+        0: "无处理人",
+        1: "个人",
+        2: "多人",
+      },
+    };
+  },
+  mounted() {},
+  methods: {
+    handleShow(row) {
+      let cateType = row.workflow_.key;
+      let projectId = null;
+      if (cateType === "visit") {
+        projectId = row.ticket_data.visit;
+      } else if (cateType === "rpj") {
+        projectId = row.ticket_data.rpj;
+      } else if (cateType.indexOf("opl_") != -1) {
+        projectId = row.ticket_data.opl;
+        cateType = "opl";
+      }
+      this.$router.push({
+        path: "ticketdetail",
+        query: {
+          id: row.id,
+          type: "show",
+          projectId: projectId,
+          catetype: cateType,
+        },
+      });
+    },
+  },
+};
 </script>
 
 <style scoped>
diff --git a/src/views/wf/dutywork.vue b/src/views/wf/dutywork.vue
index 554916d0..3a66ab83 100644
--- a/src/views/wf/dutywork.vue
+++ b/src/views/wf/dutywork.vue
@@ -1,153 +1,192 @@
 <template>
-	<el-container>
-		<el-main class="nopadding">
-			<scTable
-				ref="table"
-				:apiObj="apiObj"
-				:params="params"
-				row-key="id"
-				stripe
-				highlightCurrentRow
-				hidePagination
-			>
-				<el-table-column label="ID" prop="id" width="180"></el-table-column>
-				<el-table-column label="流水号" prop="sn" width="180"></el-table-column>
-				<el-table-column label="工单标题" prop="title" width="180"></el-table-column>
-				
-				<el-table-column label="工作流" prop="title">
-					<template #default="scope">
-						{{ scope.row.workflow_.name }}
-					</template>
-				</el-table-column>
-				<el-table-column label="所在节点">
-					<template #default="scope">
-						{{ scope.row.state_.name }}
-					</template>
-				</el-table-column>
-				<el-table-column label="进行状态" prop="sort">
-					<template #default="scope">
-						<el-tag
-								:type="scope.row.act_state===0?'':scope.row.act_state===1?'':scope.row.act_state===2?'danger':scope.row.act_state===3?'danger':scope.row.act_state===5?'danger':scope.row.act_state===4?'success':''"
-						>{{act_states[scope.row.act_state]}}</el-tag>
-					</template>
-				</el-table-column>
-				<el-table-column label="处理人类型">
-					<template #default="scope">
-						{{ participant_[scope.row.participant_type] }}
-					</template>
-				</el-table-column>
-				<el-table-column label="创建时间" prop="create_time" width="150"></el-table-column>
-				<el-table-column label="操作" align="center">
-					<template #default="scope">
-						<el-button
-							link
-							size="small"
-							v-if="(scope.row.act_state===1||scope.row.act_state===3)&&scope.row.state_.type===0"
-							type="primary"
-							@click="handleDetail(scope.row)"
-						>
-							处理
-						</el-button>
-						<el-button v-if="scope.row.state_.distribute_type===1&&scope.row.participant_type===2"
-								   link type="success" size="small" @click="handleAccept(scope.row)">
-							接单
-						</el-button>
-						<el-button
-							type="success"
-							link
-							size="small"
-							@click="handleLogs(scope.row)"
-						>
-							工单日志
-						</el-button>
-					</template>
-				</el-table-column>
-			</scTable>
-		</el-main>
-	</el-container>
-	<el-dialog v-model="limitedFlowLogs" title="工单日志">
-		<ticket-log ref="ticketLogs" :ticket="ticketId"></ticket-log>
-	</el-dialog>
+  <el-container>
+    <el-main class="nopadding">
+      <scTable
+        ref="table"
+        :apiObj="apiObj"
+        :params="params"
+        row-key="id"
+        stripe
+        highlightCurrentRow
+      >
+        <el-table-column label="流水号" prop="sn" width="180"></el-table-column>
+        <el-table-column
+          label="工单标题"
+          prop="title"
+          width="180"
+		  :show-overflow-tooltip="true"
+        ></el-table-column>
+
+        <el-table-column label="工作流" prop="title">
+          <template #default="scope">
+            {{ scope.row.workflow_.name }}
+          </template>
+        </el-table-column>
+        <el-table-column label="所在节点">
+          <template #default="scope">
+            {{ scope.row.state_.name }}
+          </template>
+        </el-table-column>
+        <el-table-column label="进行状态" prop="sort">
+          <template #default="scope">
+            <el-tag
+              :type="
+                scope.row.act_state === 0
+                  ? ''
+                  : scope.row.act_state === 1
+                  ? ''
+                  : scope.row.act_state === 2
+                  ? 'danger'
+                  : scope.row.act_state === 3
+                  ? 'danger'
+                  : scope.row.act_state === 5
+                  ? 'danger'
+                  : scope.row.act_state === 4
+                  ? 'success'
+                  : ''
+              "
+              >{{ act_states[scope.row.act_state] }}</el-tag
+            >
+          </template>
+        </el-table-column>
+        <el-table-column label="可处理人" :show-overflow-tooltip="true">
+                     <template #default="scope">
+            <span v-if="scope.row.participant_type==1">
+              {{ scope.row.participant_ .name}}
+            </span>
+            <span v-else-if="scope.row.participant_type==2">
+              <span v-for="item in scope.row.participant_" :key="item.id">{{ item.name}}/</span>
+            </span>
+            <span v-else>
+              无
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="创建时间"
+          prop="create_time"
+          width="150"
+        ></el-table-column>
+        <el-table-column label="操作" align="center">
+          <template #default="scope">
+            <el-button
+              link
+              size="small"
+              v-if="
+                (scope.row.act_state === 1 || scope.row.act_state === 3) &&
+                scope.row.state_.type === 0
+              "
+              type="primary"
+              @click="handleDetail(scope.row)"
+            >
+              处理
+            </el-button>
+            <el-button
+              v-if="
+                scope.row.state_.distribute_type === 1 &&
+                scope.row.participant_type === 2
+              "
+              link
+              type="success"
+              size="small"
+              @click="handleAccept(scope.row)"
+            >
+              接单
+            </el-button>
+            <el-button
+              type="success"
+              link
+              size="small"
+              @click="handleLogs(scope.row)"
+            >
+              工单日志
+            </el-button>
+          </template>
+        </el-table-column>
+      </scTable>
+    </el-main>
+  </el-container>
+  <el-dialog v-model="limitedFlowLogs" title="工单日志">
+    <ticket-log ref="ticketLogs" :ticket="ticketId"></ticket-log>
+  </el-dialog>
 </template>
 
 <script>
-	import ticketLog from "./details.vue";
+import ticketLog from "./details.vue";
 
-	export default {
-		components: {
-			ticketLog,
-		},
-		name: "state",
-		data() {
-			return {
-				apiObj: this.$API.wf.ticket.list,
-				params: {"category": "duty"},
-				act_states: {
-					0: "草稿中",
-					1: "进行中",
-					2: "被退回",
-					3: "被撤回",
-					4: "已完成",
-					5: "已关闭",
-				},
-				participant_: {
-					0: "无处理人",
-					1: "个人",
-					2: "多人",
-				},
-				floeLogs: [],
-				ticketId: '',
-				limitedFlowLogs: false,
-			};
-		},
-		mounted() {
-		},
-		methods: {
-			//处理
-			handleDetail(row) {
-				let cateType = row.workflow_.key;
-				let projectId = null;
-				if (cateType === 'visit') {
-					projectId = row.ticket_data.visit;
-				} else if (cateType === 'rpj') {
-					projectId = row.ticket_data.rpj;
-				} else if(cateType.indexOf('opl_')!=-1){
-					projectId = row.ticket_data.opl;
-					cateType = 'opl'
-				}
-				this.$router.push({
-					path: "ticketdetail",
-					query: {
-						id: row.id,
-						projectId: projectId,
-						catetype: cateType,
-					},
-				});
-			},
-			//获取日志
-			handleLogs(row) {
-				let that = this;
-				let id = row.id;
-				this.ticketId = row.id;
-				that.limitedFlowLogs = true;
-				that.$API.wf.ticket.ticketFlow.req({ticket: id}).then(res => {
-					if (res.err_msg) {
-
-					} else {
-						that.floeLogs = res.results;
-					}
-				})
-			},
-			handleAccept(row) {
-				this.$API.wf.ticket.ticketAccept.req(row.id, {}).then(res => {
-					if (res.err_msg) {
-					} else {
-						this.$refs.table.refresh()
-					}
-				})
-			},
-		},
-	};
+export default {
+  components: {
+    ticketLog,
+  },
+  name: "state",
+  data() {
+    return {
+      apiObj: this.$API.wf.ticket.list,
+      params: { category: "duty" },
+      act_states: {
+        0: "草稿中",
+        1: "进行中",
+        2: "被退回",
+        3: "被撤回",
+        4: "已完成",
+        5: "已关闭",
+      },
+      participant_: {
+        0: "无处理人",
+        1: "个人",
+        2: "多人",
+      },
+      floeLogs: [],
+      ticketId: "",
+      limitedFlowLogs: false,
+    };
+  },
+  mounted() {},
+  methods: {
+    //处理
+    handleDetail(row) {
+      let cateType = row.workflow_.key;
+      let projectId = null;
+      if (cateType === "visit") {
+        projectId = row.ticket_data.visit;
+      } else if (cateType === "rpj") {
+        projectId = row.ticket_data.rpj;
+      } else if (cateType.indexOf("opl_") != -1) {
+        projectId = row.ticket_data.opl;
+        cateType = "opl";
+      }
+      this.$router.push({
+        path: "ticketdetail",
+        query: {
+          id: row.id,
+          projectId: projectId,
+          catetype: cateType,
+        },
+      });
+    },
+    //获取日志
+    handleLogs(row) {
+      let that = this;
+      let id = row.id;
+      this.ticketId = row.id;
+      that.limitedFlowLogs = true;
+      that.$API.wf.ticket.ticketFlow.req({ ticket: id }).then((res) => {
+        if (res.err_msg) {
+        } else {
+          that.floeLogs = res.results;
+        }
+      });
+    },
+    handleAccept(row) {
+      this.$API.wf.ticket.ticketAccept.req(row.id, {}).then((res) => {
+        if (res.err_msg) {
+        } else {
+          this.$refs.table.refresh();
+        }
+      });
+    },
+  },
+};
 </script>
 
 <style scoped>
diff --git a/src/views/wf/ownerwork.vue b/src/views/wf/ownerwork.vue
index 3cd9cead..76a91101 100644
--- a/src/views/wf/ownerwork.vue
+++ b/src/views/wf/ownerwork.vue
@@ -1,178 +1,241 @@
 <template>
-	<el-container>
-		<el-main class="nopadding">
-			<scTable
-				ref="table"
-				:apiObj="apiObj"
-				:params="params"
-				row-key="id"
-				stripe
-				highlightCurrentRow
-				hidePagination
-			>
-				<el-table-column label="ID" prop="id" width="180"></el-table-column>
-				<el-table-column label="流水号" prop="sn" width="180"></el-table-column>
-				<el-table-column label="工单标题" prop="title" width="180"></el-table-column>
-				
-				<el-table-column label="工作流" prop="title">
-					<template #default="scope">
-						{{ scope.row.workflow_.name }}
-					</template>
-				</el-table-column>
-				<el-table-column label="所在节点">
-					<template #default="scope">
-						{{ scope.row.state_.name }}
-					</template>
-				</el-table-column>
-				<el-table-column label="进行状态" prop="sort">
-					<template #default="scope">
-						<el-tag
-								:type="scope.row.act_state===0?'':scope.row.act_state===1?'':scope.row.act_state===2?'danger':scope.row.act_state===3?'danger':scope.row.act_state===5?'danger':scope.row.act_state===4?'success':''"
-						>{{act_states[scope.row.act_state]}}</el-tag>
-					</template>
-				</el-table-column>
-				<el-table-column label="处理人类型">
-					<template #default="scope">
-						{{ participant_[scope.row.participant_type] }}
-					</template>
-				</el-table-column>
-				<el-table-column label="创建时间" prop="create_time" width="150"></el-table-column>
-				<el-table-column label="操作" fixed="right" align="center" width="160">
-					<template #default="scope">
-						<el-button text size="small" type="primary" @click="handleShow(scope.row)">查看</el-button>
-						<!--创建人在初始状态-->
-						<el-button
-							v-if="scope.row.state_.type===1&&userId===scope.row.create_by"
-							type="danger"
-							size="small" 
-							link
-							@click="handleClose(scope,'2')"
-						>
-							关闭
-						</el-button>
-						<!--如果state_.retreat/state_.type==1处于草稿状态 -->
-						<el-button
-							v-if="scope.row.state_.enable_retreat&&userId===scope.row.create_by&&scope.row.state_.type!==1"
-							type="danger"
-							@click="handleClose(scope,'1')"
-							size="small" 
-							link
-						>
-							撤回
-						</el-button>
-					</template>
-				</el-table-column>
-			</scTable>
-		</el-main>
-		<el-dialog v-model="limitedRetreat" :title="handleTitle">
-			<el-form ref="Form" :model="handleForm" label-width="100px" label-position="right">
-				<el-form-item :label="handleLabel">
-					<el-input type="textarea" :rows="3" v-model="handleForm.suggestion" placeholder="原因"/>
-				</el-form-item>
-			</el-form>
-			<div style="text-align: center">
-				<el-button class="filter-item" type="" @click="handleCancel">取消</el-button>
-				<el-button class="filter-item" type="primary" @click="handleSubmit">确定</el-button>
-			</div>
-		</el-dialog>
-	</el-container>
+  <el-container>
+    <el-main class="nopadding">
+      <scTable
+        ref="table"
+        :apiObj="apiObj"
+        :params="params"
+        row-key="id"
+        stripe
+        highlightCurrentRow
+        hidePagination
+      >
+        <el-table-column label="流水号" prop="sn" width="180"></el-table-column>
+        <el-table-column
+          label="工单标题"
+          prop="title"
+          width="180"
+		  :show-overflow-tooltip="true"
+        ></el-table-column>
+
+        <el-table-column label="工作流" prop="title">
+          <template #default="scope">
+            {{ scope.row.workflow_.name }}
+          </template>
+        </el-table-column>
+        <el-table-column label="所在节点">
+          <template #default="scope">
+            {{ scope.row.state_.name }}
+          </template>
+        </el-table-column>
+        <el-table-column label="进行状态" prop="sort">
+          <template #default="scope">
+            <el-tag
+              :type="
+                scope.row.act_state === 0
+                  ? ''
+                  : scope.row.act_state === 1
+                  ? ''
+                  : scope.row.act_state === 2
+                  ? 'danger'
+                  : scope.row.act_state === 3
+                  ? 'danger'
+                  : scope.row.act_state === 5
+                  ? 'danger'
+                  : scope.row.act_state === 4
+                  ? 'success'
+                  : ''
+              "
+              >{{ act_states[scope.row.act_state] }}</el-tag
+            >
+          </template>
+        </el-table-column>
+        <el-table-column label="可处理人" :show-overflow-tooltip="true">
+                     <template #default="scope">
+            <span v-if="scope.row.participant_type==1">
+              {{ scope.row.participant_ .name}}
+            </span>
+            <span v-else-if="scope.row.participant_type==2">
+              <span v-for="item in scope.row.participant_" :key="item.id">{{ item.name}}/</span>
+            </span>
+            <span v-else>
+              无
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="创建时间"
+          prop="create_time"
+          width="150"
+        ></el-table-column>
+        <el-table-column label="操作" fixed="right" align="center" width="160">
+          <template #default="scope">
+            <el-button
+              text
+              size="small"
+              type="primary"
+              @click="handleShow(scope.row)"
+              >查看</el-button
+            >
+            <!--创建人在初始状态-->
+            <el-button
+              v-if="
+                scope.row.state_.type === 1 && userId === scope.row.create_by
+              "
+              type="danger"
+              size="small"
+              link
+              @click="handleClose(scope, '2')"
+            >
+              关闭
+            </el-button>
+            <!--如果state_.retreat/state_.type==1处于草稿状态 -->
+            <el-button
+              v-if="
+                scope.row.state_.enable_retreat &&
+                userId === scope.row.create_by &&
+                scope.row.state_.type !== 1
+              "
+              type="danger"
+              @click="handleClose(scope, '1')"
+              size="small"
+              link
+            >
+              撤回
+            </el-button>
+          </template>
+        </el-table-column>
+      </scTable>
+    </el-main>
+    <el-dialog v-model="limitedRetreat" :title="handleTitle">
+      <el-form
+        ref="Form"
+        :model="handleForm"
+        label-width="100px"
+        label-position="right"
+      >
+        <el-form-item :label="handleLabel">
+          <el-input
+            type="textarea"
+            :rows="3"
+            v-model="handleForm.suggestion"
+            placeholder="原因"
+          />
+        </el-form-item>
+      </el-form>
+      <div style="text-align: center">
+        <el-button class="filter-item" type="" @click="handleCancel"
+          >取消</el-button
+        >
+        <el-button class="filter-item" type="primary" @click="handleSubmit"
+          >确定</el-button
+        >
+      </div>
+    </el-dialog>
+  </el-container>
 </template>
 
 <script>
-	export default {
-		name: "state",
-		data() {
-			return {
-				apiObj: this.$API.wf.ticket.list,
-				params: {"category": "owner"},
-				userId: this.$TOOL.data.get("USER_INFO").id,
-				act_states: {
-					0: "草稿中",
-					1: "进行中",
-					2: "被退回",
-					3: "被撤回",
-					4: "已完成",
-					5: "已关闭",
-				},
-				participant_: {
-					0: "无处理人",
-					1: "个人",
-					2: "多人",
-				},
-				handleForm: {
-					suggestion: '',
-				},
-				handleLabel: '撤回原因',
-				handleTitle: '撤回工单',
-				ticketId: null,
-				limitedRetreat: false,
-			};
-		},
-		mounted() {
-		},
-		methods: {
-			handleShow(row) {
-				let cateType = row.workflow_.key;
-				let projectId = null;
-				if (cateType === 'visit') {
-					projectId = row.ticket_data.visit;
-				} else if (cateType === 'rpj') {
-					projectId = row.ticket_data.rpj;
-				} else if(cateType.indexOf('opl_')!=-1){
-					projectId = row.ticket_data.opl;
-					cateType = 'opl'
-				}
-				this.$router.push({
-					path: "ticketdetail",
-					query: {
-						id: row.id,
-						type: "show",
-						projectId: projectId,
-						catetype: cateType,
-					},
-				});
-			},
-			handleClose(scope, index) {
-				if (index === '1') {
-					this.handleTitle = '撤回工单';
-					this.handleLabel = '撤回原因';
-				} else {
-					this.handleTitle = '关闭工单';
-					this.handleLabel = '关闭原因';
-				}
-				this.limitedRetreat = true;
-				this.ticketId = scope.row.id;
-			},
-			handleCancel() {
-				this.limitedRetreat = false;
-			},
-			handleSubmit() {
-				let res = '';
-				let that = this;
-				that.$confirm('确认' + that.handleTitle + '吗?', "温馨提示", {
-					confirmButtonText: "确认",
-					cancelButtonText: "取消",
-					type: "warning",
-				})
-					.then(async () => {
-						if (that.handleTitle === '撤回工单') {
-							res = that.$API.wf.ticket.ticketRetreat.req(that.ticketId, that.handleForm);
-						} else {
-							res = that.$API.wf.ticket.ticketClose.req(that.ticketId, that.handleForm);
-						}
-						if (res.err_msg) {
-							that.$refs.table.refresh()
-						} else {
-							that.limitedRetreat = false;
-							that.$refs.table.refresh()
-						}
-					})
-					.catch((err) => {
-						console.error(err);
-					});
-			},
-		},
-	};
+export default {
+  name: "state",
+  data() {
+    return {
+      apiObj: this.$API.wf.ticket.list,
+      params: { category: "owner" },
+      userId: this.$TOOL.data.get("USER_INFO").id,
+      act_states: {
+        0: "草稿中",
+        1: "进行中",
+        2: "被退回",
+        3: "被撤回",
+        4: "已完成",
+        5: "已关闭",
+      },
+      participant_: {
+        0: "无处理人",
+        1: "个人",
+        2: "多人",
+      },
+      handleForm: {
+        suggestion: "",
+      },
+      handleLabel: "撤回原因",
+      handleTitle: "撤回工单",
+      ticketId: null,
+      limitedRetreat: false,
+    };
+  },
+  mounted() {},
+  methods: {
+    handleShow(row) {
+      let cateType = row.workflow_.key;
+      let projectId = null;
+      if (cateType === "visit") {
+        projectId = row.ticket_data.visit;
+      } else if (cateType === "rpj") {
+        projectId = row.ticket_data.rpj;
+      } else if (cateType.indexOf("opl_") != -1) {
+        projectId = row.ticket_data.opl;
+        cateType = "opl";
+      }
+      this.$router.push({
+        path: "ticketdetail",
+        query: {
+          id: row.id,
+          type: "show",
+          projectId: projectId,
+          catetype: cateType,
+        },
+      });
+    },
+    handleClose(scope, index) {
+      if (index === "1") {
+        this.handleTitle = "撤回工单";
+        this.handleLabel = "撤回原因";
+      } else {
+        this.handleTitle = "关闭工单";
+        this.handleLabel = "关闭原因";
+      }
+      this.limitedRetreat = true;
+      this.ticketId = scope.row.id;
+    },
+    handleCancel() {
+      this.limitedRetreat = false;
+    },
+    handleSubmit() {
+      let res = "";
+      let that = this;
+      that
+        .$confirm("确认" + that.handleTitle + "吗?", "温馨提示", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(async () => {
+          if (that.handleTitle === "撤回工单") {
+            res = that.$API.wf.ticket.ticketRetreat.req(
+              that.ticketId,
+              that.handleForm
+            );
+          } else {
+            res = that.$API.wf.ticket.ticketClose.req(
+              that.ticketId,
+              that.handleForm
+            );
+          }
+          if (res.err_msg) {
+            that.$refs.table.refresh();
+          } else {
+            that.limitedRetreat = false;
+            that.$refs.table.refresh();
+          }
+        })
+        .catch((err) => {
+          console.error(err);
+        });
+    },
+  },
+};
 </script>
 
 <style scoped>
diff --git a/src/views/wf/worked.vue b/src/views/wf/worked.vue
index aa431b33..e42b278b 100644
--- a/src/views/wf/worked.vue
+++ b/src/views/wf/worked.vue
@@ -1,100 +1,135 @@
 <template>
-	<el-container>
-		<el-main class="nopadding">
-			<scTable
-				ref="table"
-				:apiObj="apiObj"
-				:params="params"
-				row-key="id"
-				stripe
-				highlightCurrentRow
-				hidePagination
-			>
-				<el-table-column label="ID" prop="id" width="180"></el-table-column>
-				<el-table-column label="流水号" prop="sn" width="180"></el-table-column>
-				<el-table-column label="工单标题" prop="title" width="180"></el-table-column>
-				
-				<el-table-column label="工作流" prop="title">
-					<template #default="scope">
-						{{ scope.row.workflow_.name }}
-					</template>
-				</el-table-column>
-				<el-table-column label="所在节点">
-					<template #default="scope">
-						{{ scope.row.state_.name }}
-					</template>
-				</el-table-column>
-				<el-table-column label="进行状态" prop="sort">
-					<template #default="scope">
-						<el-tag
-								:type="scope.row.act_state===0?'':scope.row.act_state===1?'':scope.row.act_state===2?'danger':scope.row.act_state===3?'danger':scope.row.act_state===5?'danger':scope.row.act_state===4?'success':''"
-						>{{act_states[scope.row.act_state]}}</el-tag>
-					</template>
-				</el-table-column>
-				<el-table-column label="处理人类型">
-					<template #default="scope">
-						{{ participant_[scope.row.participant_type] }}
-					</template>
-				</el-table-column>
-				<el-table-column label="创建时间" prop="create_time" width="150"></el-table-column>
-				<el-table-column label="操作" fixed="right" align="center" width="100">
-					<template #default="scope">
-						<el-button text size="small" type="primary" @click="handleShow(scope.row)">查看详情</el-button>
-					</template>
-				</el-table-column>
-			</scTable>
-		</el-main>
-	</el-container>
+  <el-container>
+    <el-main class="nopadding">
+      <scTable
+        ref="table"
+        :apiObj="apiObj"
+        :params="params"
+        row-key="id"
+        stripe
+        highlightCurrentRow
+      >
+        <el-table-column label="流水号" prop="sn" width="180"></el-table-column>
+        <el-table-column
+          label="工单标题"
+          prop="title"
+          width="180"
+		  :show-overflow-tooltip="true"
+        ></el-table-column>
+
+        <el-table-column label="工作流" prop="title">
+          <template #default="scope">
+            {{ scope.row.workflow_.name }}
+          </template>
+        </el-table-column>
+        <el-table-column label="所在节点">
+          <template #default="scope">
+            {{ scope.row.state_.name }}
+          </template>
+        </el-table-column>
+        <el-table-column label="进行状态" prop="sort">
+          <template #default="scope">
+            <el-tag
+              :type="
+                scope.row.act_state === 0
+                  ? ''
+                  : scope.row.act_state === 1
+                  ? ''
+                  : scope.row.act_state === 2
+                  ? 'danger'
+                  : scope.row.act_state === 3
+                  ? 'danger'
+                  : scope.row.act_state === 5
+                  ? 'danger'
+                  : scope.row.act_state === 4
+                  ? 'success'
+                  : ''
+              "
+              >{{ act_states[scope.row.act_state] }}</el-tag
+            >
+          </template>
+        </el-table-column>
+        <el-table-column label="可处理人" :show-overflow-tooltip="true">
+                     <template #default="scope">
+            <span v-if="scope.row.participant_type==1">
+              {{ scope.row.participant_ .name}}
+            </span>
+            <span v-else-if="scope.row.participant_type==2">
+              <span v-for="item in scope.row.participant_" :key="item.id">{{ item.name}}/</span>
+            </span>
+            <span v-else>
+              无
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="创建时间"
+          prop="create_time"
+          width="150"
+        ></el-table-column>
+        <el-table-column label="操作" fixed="right" align="center" width="100">
+          <template #default="scope">
+            <el-button
+              text
+              size="small"
+              type="primary"
+              @click="handleShow(scope.row)"
+              >查看</el-button
+            >
+          </template>
+        </el-table-column>
+      </scTable>
+    </el-main>
+  </el-container>
 </template>
 
 <script>
-	export default {
-		name: "state",
-		data() {
-			return {
-				apiObj: this.$API.wf.ticket.list,
-				params: {"category": "worked"},
-				act_states: {
-					0: "草稿中",
-					1: "进行中",
-					2: "被退回",
-					3: "被撤回",
-					4: "已完成",
-					5: "已关闭",
-				},
-				participant_: {
-					0: "无处理人",
-					1: "个人",
-					2: "多人",
-				},
-			};
-		},
-		mounted() {
-		},
-		methods: {
-			handleShow(row) {
-				let cateType = row.workflow_.key;
-				let projectId = null;
-				if (cateType === 'visit') {
-					projectId = row.ticket_data.visit;
-				} else if (cateType === 'rpj') {
-					projectId = row.ticket_data.rpj;
-				} else if(cateType.indexOf('opl_')!=-1){
-					projectId = row.ticket_data.opl;
-					cateType = 'opl'
-				}
-				this.$router.push({
-					path: "ticketdetail",
-					query: {
-						id: row.id,
-						type: "show",
-						projectId: projectId,
-						catetype: cateType,
-					},
-				});
-			},
-		},
-	};
+export default {
+  name: "state",
+  data() {
+    return {
+      apiObj: this.$API.wf.ticket.list,
+      params: { category: "worked" },
+      act_states: {
+        0: "草稿中",
+        1: "进行中",
+        2: "被退回",
+        3: "被撤回",
+        4: "已完成",
+        5: "已关闭",
+      },
+      participant_: {
+        0: "无处理人",
+        1: "个人",
+        2: "多人",
+      },
+    };
+  },
+  mounted() {},
+  methods: {
+    handleShow(row) {
+      let cateType = row.workflow_.key;
+      let projectId = null;
+      if (cateType === "visit") {
+        projectId = row.ticket_data.visit;
+      } else if (cateType === "rpj") {
+        projectId = row.ticket_data.rpj;
+      } else if (cateType.indexOf("opl_") != -1) {
+        projectId = row.ticket_data.opl;
+        cateType = "opl";
+      }
+      this.$router.push({
+        path: "ticketdetail",
+        query: {
+          id: row.id,
+          type: "show",
+          projectId: projectId,
+          catetype: cateType,
+        },
+      });
+    },
+  },
+};
 </script>
 
 <style scoped>