From 117617a026ffb9fb55b4b13b8ba811a3976bece7 Mon Sep 17 00:00:00 2001
From: "2309368887@qq.com" <2309368887@qq.com>
Date: Fri, 22 Jul 2022 09:00:37 +0800
Subject: [PATCH 1/4] anniuquanxian

---
 src/config/route.js | 53 ++++++++++++++++++++++++++++++---------------
 1 file changed, 36 insertions(+), 17 deletions(-)

diff --git a/src/config/route.js b/src/config/route.js
index 73c34d9b..a7ef3866 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -99,7 +99,7 @@ const routes = [
           "title": "事件详情",
           "icon": "el-icon-menu",
           "hidden": true,
-          "perms": ["eventfrom"]
+          "perms": ["event"]
         },
         "component": "ecm/event_from"
       }
@@ -111,7 +111,7 @@ const routes = [
           "title": "处理作业",
           "icon": "el-icon-menu",
           "hidden": true,
-          "perms": ["eventhandlefrom"]
+          "perms": ["myevent"]
         },
         "component": "ecm/event_handlefrom"
       },
@@ -174,7 +174,8 @@ const routes = [
         "meta": {
           "title": "工作流配置",
           "icon": "el-icon-menu",
-          "hidden": true
+          "hidden": true,
+          "perms": ["workflow"]
         },
         "component": "wf/configuration"
       }
@@ -196,6 +197,7 @@ const routes = [
         "meta": {
           "title": "我创建的",
           "icon": "el-icon-folder-add",
+          "perms": ["ownerwork"]
         },
         "component": "wf/ownerwork"
       }
@@ -207,6 +209,7 @@ const routes = [
         "meta": {
           "title": "待办工单",
           "icon": "el-icon-folder-opened",
+          "perms": ["duty"]
         },
         "component": "wf/dutywork"
       },
@@ -216,6 +219,7 @@ const routes = [
         "meta": {
           "title": "我处理的",
           "icon": "el-icon-expand",
+          "perms": ["worked"]
         },
         "component": "wf/worked"
       },
@@ -225,6 +229,7 @@ const routes = [
         "meta": {
           "title": "抄送我的",
           "icon": "el-icon-edit-pen",
+          "perms": ["ccwork"]
         },
         "component": "wf/ccwork"
       },
@@ -234,7 +239,8 @@ const routes = [
         "meta": {
           "title": "工单详情",
           "icon": "el-icon-menu",
-          "hidden": true
+          "hidden": true,
+          "perms": ["allwork"]
         },
         "component": "wf/visitdetail"
       },
@@ -279,7 +285,8 @@ const routes = [
         "meta": {
           "title": "作业许可证",
           "icon": "el-icon-menu",
-          "hidden": true
+          "hidden": true,
+          "perms": ["operation"]
         },
         "component": "opm/opl"
       },
@@ -289,7 +296,8 @@ const routes = [
         "meta": {
           "title": "动火作业许可证",
           "icon": "el-icon-menu",
-          "hidden": true
+          "hidden": true,
+          "perms": ["operation"]
         },
         "component": "opm/fire"
       },
@@ -299,7 +307,8 @@ const routes = [
         "meta": {
           "title": "有限空间作业许可证",
           "icon": "el-icon-menu",
-          "hidden": true
+          "hidden": true,
+          "perms": ["operation"]
         },
         "component": "opm/space"
       },
@@ -309,7 +318,8 @@ const routes = [
         "meta": {
           "title": "清库作业许可证",
           "icon": "el-icon-menu",
-          "hidden": true
+          "hidden": true,
+          "perms": ["operation"]
         },
         "component": "opm/clear"
       } ,
@@ -319,7 +329,8 @@ const routes = [
         "meta": {
           "title": "高处作业许可证",
           "icon": "el-icon-menu",
-          "hidden": true
+          "hidden": true,
+          "perms": ["operation"]
         },
         "component": "opm/high"
       },
@@ -329,7 +340,8 @@ const routes = [
         "meta": {
           "title": "吊装作业许可证",
           "icon": "el-icon-menu",
-          "hidden": true
+          "hidden": true,
+          "perms": ["operation"]
         },
         "component": "opm/hoisting"
       },
@@ -339,7 +351,8 @@ const routes = [
         "meta": {
           "title": "预热器清堵作业许可证",
           "icon": "el-icon-menu",
-          "hidden": true
+          "hidden": true,
+          "perms": ["operation"]
         },
         "component": "opm/preheat"
       },
@@ -349,7 +362,8 @@ const routes = [
         "meta": {
           "title": "篦冷机清大块作业许可证",
           "icon": "el-icon-menu",
-          "hidden": true
+          "hidden": true,
+          "perms": ["operation"]
         },
         "component": "opm/cooler"
       },
@@ -359,7 +373,8 @@ const routes = [
         "meta": {
           "title": "动土作业许可证",
           "icon": "el-icon-menu",
-          "hidden": true
+          "hidden": true,
+          "perms": ["operation"]
         },
         "component": "opm/soil"
       },
@@ -369,7 +384,8 @@ const routes = [
         "meta": {
           "title": "临时用电作业许可证",
           "icon": "el-icon-menu",
-          "hidden": true
+          "hidden": true,
+          "perms": ["operation"]
         },
         "component": "opm/usecl"
       }
@@ -442,7 +458,7 @@ const routes = [
           "title": "入厂项目相关信息",
           "icon": "el-icon-menu",
           "hidden": true,
-          "perms": ["rpjadd"]
+          "perms": ["rpj"]
         },
         "component": "rpm/rpjadd"
       },
@@ -484,7 +500,8 @@ const routes = [
         "meta": {
           "title": "访客人员",
           "icon": "el-icon-menu",
-          "hidden": true
+          "hidden": true,
+          "perms": ["visit"]
         },
         "component": "vm/people"
       }
@@ -494,7 +511,8 @@ const routes = [
         "meta": {
           "title": "来访项目相关信息",
           "icon": "el-icon-menu",
-          "hidden": true
+          "hidden": true,
+          "perms": ["visit"]
         },
         "component": "vm/vistoradd"
       },
@@ -603,6 +621,7 @@ const routes = [
           "title": "相关证书",
           "icon": "el-icon-menu",
           "hidden": true,
+          "perms": ["employee"]
           
         },
         "component": "hrm/certificate"

From 8df53381551ae421741cdcb13a54b25cffee6e53 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 22 Jul 2022 10:55:15 +0800
Subject: [PATCH 2/4] zuoyepiaoguanbi&role

---
 src/views/sys/role.vue       |  1 +
 src/views/wf/allwork.vue     |  6 ++-
 src/views/wf/dutywork.vue    |  8 ++--
 src/views/wf/visitdetail.vue | 91 ++++++++++++++++++++++++++++++------
 src/views/wf/workflow.vue    | 82 ++++++++++++++++----------------
 5 files changed, 129 insertions(+), 59 deletions(-)

diff --git a/src/views/sys/role.vue b/src/views/sys/role.vue
index 0d7f9a80..4c4314e3 100644
--- a/src/views/sys/role.vue
+++ b/src/views/sys/role.vue
@@ -53,6 +53,7 @@
 						show-checkbox
 						:data="menu.list"
 						:props="menu.props"
+						check-strictly="true"
 						:default-checked-keys="menu.checked"
 						@check="handleChange"
 					></el-tree>
diff --git a/src/views/wf/allwork.vue b/src/views/wf/allwork.vue
index 05c0a9c8..b9dbd269 100644
--- a/src/views/wf/allwork.vue
+++ b/src/views/wf/allwork.vue
@@ -81,12 +81,13 @@
 			},
 			handleShow(row) {
 				let cateType = row.workflow_.key;
-				let projectId='';
+				let projectId='',operation=null;
 				if(cateType==='visit'){
 					projectId =  row.ticket_data.visit;
 				}else if(cateType==='rparty'){
 					projectId =  row.ticket_data.rpj;
 				}else{
+					operation =  row.ticket_data.operation?row.ticket_data.operation:null;
 					projectId =  row.ticket_data.opl;
 				}
 				this.$router.push({
@@ -95,7 +96,8 @@
 						id: row.id,
 						type: 'show',
 						projectId: projectId,
-						catetype:cateType
+						catetype:cateType,
+						operation:operation
 					},
 				});
 			},
diff --git a/src/views/wf/dutywork.vue b/src/views/wf/dutywork.vue
index 68709e8a..4f594208 100644
--- a/src/views/wf/dutywork.vue
+++ b/src/views/wf/dutywork.vue
@@ -138,21 +138,21 @@
 			},
 			//处理
 			handleDetail(row){
-				debugger;
-				console.log(row)
-				let projectId = '';
+				let projectId='',operation=null;
 				let catetype = row.workflow_.key;
 				if(catetype==='visit'){
 					projectId=row.ticket_data.visit;
 				}else if(catetype==='Fire'){
 					projectId=row.ticket_data.opl;
+					operation =  row.ticket_data.operation?row.ticket_data.operation:null;
 				}
 				this.$router.push({
 					name: "visitdetail",
 					query: {
 						id: row.id,
 						projectId:projectId,
-						catetype:row.workflow_.key
+						catetype:row.workflow_.key,
+						operation:operation
 					},
 				});
 			},
diff --git a/src/views/wf/visitdetail.vue b/src/views/wf/visitdetail.vue
index 5a876853..fee6c798 100644
--- a/src/views/wf/visitdetail.vue
+++ b/src/views/wf/visitdetail.vue
@@ -83,15 +83,17 @@
 					<el-descriptions-item label="工单流水号:">
 						{{ticketDetail.sn }}
 					</el-descriptions-item>
-					<el-descriptions-item label="许可证编号:">
-						{{oplDetail.number }}
+					<el-descriptions-item label="作业名称:">
+						{{oplDetail.name }}
 					</el-descriptions-item>
-					<el-descriptions-item label="许可证类别:">
-						{{oplDetail.cate_name}}
+					<el-descriptions-item label="作业地点:">
+						{{oplDetail.place}}
 					</el-descriptions-item>
-
-					<el-descriptions-item label="级别:">
-						{{oplDetail.level }}
+					<el-descriptions-item label="作业状态:">
+						{{state_[oplDetail.state]}}
+					</el-descriptions-item>
+					<el-descriptions-item label="生产状态:">
+						{{oplDetail.state_work }}
 					</el-descriptions-item>
 					<el-descriptions-item label="开始时间:">
 						{{oplDetail.start_time }}
@@ -101,7 +103,7 @@
 					</el-descriptions-item>
 				</el-descriptions>
 				<div style="text-align: center">
-					<el-link type="primary" @click="showMoreInfo"> 更多信息 </el-link>
+					<el-link type="primary" @click="showMoreInfo"> 作业许可证详情 </el-link>
 				</div>
 				<show-dialog v-if="rpjShow" ref="showDialog"></show-dialog>
 			</el-card>
@@ -126,6 +128,46 @@
 					</div>
 				</div>
 			</el-card>
+			<el-card style="margin-left: 10px; margin-bottom: 10px" v-if="type!=='show'">
+				<scTitle title="作业票关闭"></scTitle>
+				<el-form :model="form" ref="addForm" label-width="100px" label-position="left">
+					<el-form-item label="关闭原因：">
+						<el-select v-model="form.reason" placeholder="选择关闭原因">
+							<el-option
+								v-for="item in reasonOption"
+								:key="item"
+								:label="item"
+								:value="item"
+							/>
+						</el-select>
+					</el-form-item>
+					<el-form-item label="关闭确认：">
+						<el-checkbox-group v-model="form.review">
+							<el-checkbox
+								v-for="(item, index) in reviewOption"
+								:key="index"
+								:label="item"
+							>{{ item }}
+							</el-checkbox>
+						</el-checkbox-group>
+					</el-form-item>
+					<el-form-item label="处理意见">
+						<el-input v-model="form.suggestion" clearable></el-input>
+					</el-form-item>
+				</el-form>
+				<div v-if="ticketDetail.in_add_node" style="text-align: right">
+					<el-button v-if="ticketDetail.in_add_node" class="filter-item" type="primary" @click="addNodeHandler('2')">加签处理</el-button>
+				</div>
+				<div v-else style="display: flex;justify-content: space-between;">
+					<div>
+						<el-button type="primary" @click="addNode">加签</el-button>
+						<el-button v-if="ticketDetail.state_&&ticketDetail.state_.enable_deliver" type="primary" plain @click="deliverNode">转交</el-button>
+					</div>
+					<div>
+						<el-button v-for="item in operationBtn" :key="item.id" class="filter-item" :type="item.attribute_type===2?'danger':'primary'" @click="operationSubmit(item.id)">{{item.name}}</el-button>
+					</div>
+				</div>
+			</el-card>
 			<el-card style="margin-left: 10px;">
 				<work-details ref="workDetails" :ticket="ticketId"></work-details>
 			</el-card>
@@ -161,7 +203,9 @@
 			<el-button class="filter-item" type="primary" @click="deliverNodeHandler('1')">确定</el-button>
 		</div>
 	</el-dialog>
-
+	<el-drawer :size="'50%'" v-model="showLimited" title="作业许可证详情">
+		<sc-fire :id="projectId"></sc-fire>
+	</el-drawer>
 </template>
 
 <script>
@@ -190,7 +234,9 @@
 				employeeLists: [],
 				operationBtn: [],
 				form:{
-					suggestion:''
+					suggestion:'',
+					reason:'',
+					review:'',
 				},
 				addForm:{
 					suggestion:'',
@@ -202,6 +248,7 @@
 				},
 				rpjShow:false,
 				limitedAdd:false,
+				showLimited:false,
 				limitedDeliver:false,
 				limitedUserSelect:false,
 				purpose_: {
@@ -223,6 +270,9 @@
 					40: "进行中",
 					50: "已完成",
 				},
+				reasonOption:['作业正常结束','因计划改变停止作业','因发生异常终止作业','其他'],
+				reviewOption:['现场已清理','人员已清点','火种已熄灭','其他'],
+				// reviewOption:['现场已清理','人员已清点','火种已熄灭','其他'],
 			};
 		},
 		created(){
@@ -230,6 +280,7 @@
 			this.type = this.$route.query.type;
 			this.projectId = this.$route.query.projectId;
 			this.cateType = this.$route.query.catetype;
+			this.operation = this.$route.query.operation;
 
 		},
 		mounted() {
@@ -239,8 +290,11 @@
 			}else if(this.cateType==='rparty'){
 				this.getRpj();
 			}else{
-				debugger;
-				this.getOpl();
+				if(this.operation!==null){
+					this.getOperation();
+				}else{
+					this.getOpl();
+				}
 			}
 			this.getticketItem();
 			this.getBtns();
@@ -279,13 +333,24 @@
 					this.rpjDetail = res;
 				});
 			},
-			//作业详情
+			//许可证详情
 			getOpl(){
 				this.$API.opm.opl.read.req(this.projectId).then((res) => {
 					debugger;
 					this.oplDetail = res;
 				});
 			},
+			//作业详情
+			getOperation(){
+				debugger;
+				this.$API.opm.operation.read.req(this.operation).then((res) => {
+					debugger;
+					this.oplDetail = res;
+				});
+			},
+			showMoreInfo(){
+				this.showLimited = true;
+			},
 			//加签处理-start
 			addNode(){
 				this.limitedAdd = true;
diff --git a/src/views/wf/workflow.vue b/src/views/wf/workflow.vue
index 6a61086f..606317cd 100644
--- a/src/views/wf/workflow.vue
+++ b/src/views/wf/workflow.vue
@@ -29,9 +29,13 @@
 				<el-table-column label="创建时间" prop="create_time" min-width="150"></el-table-column>
 				<el-table-column label="操作" fixed="right" align="center" width="220">
 					<template #default="scope">
-						<el-button link size="small" type="primary" @click="workflowShow(scope.row)" v-auth="'workflow.update'">配置</el-button>
+						<el-button link size="small" type="primary" @click="workflowShow(scope.row)"
+								   v-auth="'workflow.update'">配置
+						</el-button>
 						<el-divider direction="vertical"></el-divider>
-						<el-button link size="small" type="primary" @click="workflowEdit(scope.row)" v-auth="'workflow.update'">编辑</el-button>
+						<el-button link size="small" type="primary" @click="workflowEdit(scope.row)"
+								   v-auth="'workflow.update'">编辑
+						</el-button>
 						<el-divider direction="vertical"></el-divider>
 						<el-link
 							type="primary"
@@ -54,7 +58,7 @@
 		<div class="svgWrapper">
 			<div class="svgItem">工作流流程图<i class="el-dialog__close el-icon el-icon-close" @click="closeMark"></i></div>
 			<div style="width: 90%;margin: auto;">
-				<svg height=1800 id="mySvg" style="width:100%!important;">
+				<svg :height='mySvgHeight' id="mySvg" style="width:100%!important;">
 				</svg>
 			</div>
 		</div>
@@ -80,7 +84,7 @@
 				></el-input>
 			</el-form-item>
 			<el-form-item label="查看权限校验">
-				<el-switch v-model="addForm.view_permission_check" ></el-switch>
+				<el-switch v-model="addForm.view_permission_check"></el-switch>
 			</el-form-item>
 			<el-form-item label="展现表单字段">
 				<el-transfer
@@ -107,6 +111,7 @@
 <script>
 	import dagreD3 from 'dagre-d3'
 	import * as d3 from 'd3'
+
 	export default {
 		name: 'index',
 		data() {
@@ -118,6 +123,7 @@
 				search: {
 					keyword: null
 				},
+				mySvgHeight: null,
 				editId: null,
 				isSaving: false,
 				limitedVisible: false,
@@ -134,7 +140,7 @@
 					sn_prefix: "",
 					description: "",
 					view_permission_check: true,
-					display_form_str:[],
+					display_form_str: [],
 					title_template: "",
 					content_template: "",
 				},
@@ -163,34 +169,34 @@
 				this.type = 'add';
 				this.limitedVisible = true;
 			},
-			 submitHandle() {
+
+			submitHandle() {
 				let that = this;
 				this.$refs.addForm.validate((valid) => {
 					if (valid) {
 						that.isSaveing = true;
 						that.submit();
-
 					}
 				})
 			},
 
-			async submit(){
+			async submit() {
 				let that = this;
 				let res = null;
-				try{
+				try {
 					if (that.type === 'add') {
-						res =  await that.$API.wf.workflow.create.req(that.addForm)
+						res = await that.$API.wf.workflow.create.req(that.addForm)
 					} else {
-						res =  await that.$API.wf.workflow.update.req(that.editId, that.addForm);
+						res = await that.$API.wf.workflow.update.req(that.editId, that.addForm);
 					}
 					that.isSaveing = false;
 					that.limitedVisible = false;
 					that.$refs.table.refresh();
-				}catch (e) {
+				} catch (e) {
 					that.isSaveing = false;
 				}
-
 			},
+
 			//编辑工作流
 			workflowEdit(row) {
 				this.type = 'edit';
@@ -202,13 +208,13 @@
 			//工作流配置
 			workflowShow(row) {
 				let workflow = sessionStorage.getItem('jinYuWorkflowId');
-				if(workflow){
+				if (workflow) {
 					sessionStorage.removeItem('jinYuWorkflowId');
-					sessionStorage.setItem('jinYuWorkflowId',row.id);
-				}else{
-					sessionStorage.setItem('jinYuWorkflowId',row.id);
+					sessionStorage.setItem('jinYuWorkflowId', row.id);
+				} else {
+					sessionStorage.setItem('jinYuWorkflowId', row.id);
 				}
-				this.$router.push({path:'/wf/configuration'});
+				this.$router.push({path: '/wf/configuration'});
 			},
 
 			//删除工作流
@@ -223,17 +229,21 @@
 					// this.$alert(res.message, "提示", {type: 'error'})
 				}
 			},
+
 			//表格选择后回调事件
 			selectionChange(selection) {
 				this.selection = selection;
 			},
+
 			//搜索
 			upsearch() {
 
 			},
+
 			//根据ID获取树结构
 			filterTree(id) {
 				var target = null;
+
 				function filter(tree) {
 					tree.forEach(item => {
 						if (item.id == id) {
@@ -244,10 +254,10 @@
 						}
 					})
 				}
-
-				filter(this.$refs.table.tableData)
+				filter(this.$refs.table.tableData);
 				return target
 			},
+
 			//本地更新数据
 			handleSaveSuccess(data, type) {
 				if (type == 'add') {
@@ -256,6 +266,7 @@
 					this.$refs.table.refresh()
 				}
 			},
+
 			handleWatch(scope) {
 				debugger;
 				let that = this;
@@ -271,12 +282,11 @@
 						marginy: 20,
 					});
 					//获取state得到节点
-					this.$API.wf.workflow.states.req(workFlow).then((response) => {
+					that.$API.wf.workflow.states.req(workFlow).then((response) => {
 						if (!response.err_msg) {
 							let nodes = response;
 							// 添加节点
 							nodes.forEach((item) => {
-								debugger;
 								g.setNode(item.id, {
 									// 节点标签
 									label: item.name,
@@ -290,20 +300,12 @@
 									ry: 5
 								});
 							});
-							debugger;
-							console.log(g.nodes());
-							g.nodes().forEach(function (v) {
-								debugger;
-								console.log("Node " + v + ": " + JSON.stringify(g.node(v)));
-							});
 							//获取流转得到线  链接关系
-							this.$API.wf.workflow.transitions.req(workFlow).then((res) => {
+							that.$API.wf.workflow.transitions.req(workFlow).then((res) => {
 								if (!res.err_msg) {
 									let transitionList = res;
-									debugger;
 									transitionList.forEach((transition0) => {
 										if (transition0.condition_expression.length > 0) {
-											debugger;
 											g.setNode(transition0.source_state_.id + 100000, {
 												label: "条件表达式",
 												style: "stroke: #000;fill: #afa",
@@ -329,11 +331,8 @@
 												style: "fill:#ffffff;stroke:#c0c1c3;stroke-width:1.5px" // 根据后台数据来改变连线的颜色
 											});
 										}
-									})
-									g.nodes().length - 1
-									g.nodes().forEach(function (v) {
-										console.log("Node " + v + ": " + JSON.stringify(g.node(v)));
 									});
+									g.nodes().length - 1;
 									// 创建渲染器
 									let render = new dagreD3.render();
 									// 选择 svg 并添加一个g元素作为绘图容器.
@@ -341,6 +340,7 @@
 									let svgGroup = svg.append('g');
 									// 在绘图容器上运行渲染器生成流程图.
 									render(d3.select("svg g"), g);
+									that.mySvgHeight = document.getElementsByClassName('nodes')[0].getBoundingClientRect().height + 50;
 								} else {
 								}
 							});
@@ -363,21 +363,23 @@
 		border: 1px solid #dcdfe6;
 		margin-bottom: 10px;
 	}
+
 	::-webkit-scrollbar {
-		width: 15px;
+		width: 10px;
 	}
 
 	::-webkit-scrollbar-track {
 		-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .2);
 		background-color: #fefefe;
-		border-radius: 7px;
+		border-radius: 5px;
 	}
 
 	::-webkit-scrollbar-thumb {
-		border-radius: 7px;
+		border-radius: 5px;
 		-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .5);
 		background-color: #f5f5f5;
 	}
+
 	.svgMark {
 		width: 100%;
 		height: 100%;
@@ -395,8 +397,8 @@
 	.svgWrapper {
 		background: #fff;
 		width: 800px;
-		margin:0  auto;
-		height: 100vh;
+		margin: 5vh auto;
+		height: 90vh;
 		text-align: center;
 		border-radius: 2px;
 		overflow-y: scroll;

From 243e29568e9370a1f0ae232a2aca898dd17ef1da Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 22 Jul 2022 14:02:33 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/model/wf.js          |   8 +-
 src/views/wf/allwork.vue     |  21 ++--
 src/views/wf/ccwork.vue      | 179 +++++++++++++++--------------
 src/views/wf/dutywork.vue    |  68 +++--------
 src/views/wf/ownerwork.vue   |  27 +++--
 src/views/wf/visitdetail.vue | 214 ++++++++++++++++++++---------------
 src/views/wf/worked.vue      |  16 ++-
 src/views/wf/workflow.vue    |   9 +-
 8 files changed, 288 insertions(+), 254 deletions(-)

diff --git a/src/api/model/wf.js b/src/api/model/wf.js
index f6341b5c..4c92fd22 100644
--- a/src/api/model/wf.js
+++ b/src/api/model/wf.js
@@ -176,7 +176,13 @@ export default {
 			req: async function(id){
 				return await http.get( `${config.API_URL}/wf/ticketflow/${id}/`);
 			}
-		}
+		},
+		retryScript: {
+			name: "重试脚本",
+			req: async function(id){
+				return await http.post(`${config.API_URL}/wf/ticket/${id}/retry_script/`);
+			}
+		},
 	},
 	field:{
 		list: {
diff --git a/src/views/wf/allwork.vue b/src/views/wf/allwork.vue
index b9dbd269..3ba1df54 100644
--- a/src/views/wf/allwork.vue
+++ b/src/views/wf/allwork.vue
@@ -51,7 +51,6 @@
 		data() {
 			return {
 				list: [],
-
 				actstate_: {
 					0: "草稿中",
 					1: "进行中",
@@ -81,14 +80,14 @@
 			},
 			handleShow(row) {
 				let cateType = row.workflow_.key;
-				let projectId='',operation=null;
-				if(cateType==='visit'){
-					projectId =  row.ticket_data.visit;
-				}else if(cateType==='rparty'){
-					projectId =  row.ticket_data.rpj;
-				}else{
-					operation =  row.ticket_data.operation?row.ticket_data.operation:null;
-					projectId =  row.ticket_data.opl;
+				let projectId = '', operation = null;
+				if (cateType === 'visit') {
+					projectId = row.ticket_data.visit;
+				} else if (cateType === 'rparty') {
+					projectId = row.ticket_data.rpj;
+				} else {
+					operation = row.ticket_data.operation ? row.ticket_data.operation : null;
+					projectId = row.ticket_data.opl;
 				}
 				this.$router.push({
 					name: "visitdetail",
@@ -96,8 +95,8 @@
 						id: row.id,
 						type: 'show',
 						projectId: projectId,
-						catetype:cateType,
-						operation:operation
+						catetype: cateType,
+						operation: operation
 					},
 				});
 			},
diff --git a/src/views/wf/ccwork.vue b/src/views/wf/ccwork.vue
index f7a80bca..ba37be18 100644
--- a/src/views/wf/ccwork.vue
+++ b/src/views/wf/ccwork.vue
@@ -1,92 +1,103 @@
 <template>
-  <el-container>
-    <el-main class="nopadding">
-      <scTable
-        ref="table"
-        :data="list"
-        row-key="id"
-        stripe
-        highlightCurrentRow
-        hidePagination
-      >
-        <el-table-column label="ID" prop="id"></el-table-column>
-        <el-table-column label="工单标题" prop="title"></el-table-column>
-          <el-table-column label="流水号" prop="sn"></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">
-            {{ actstate_[scope.row.act_state] }}
-          </template>
-        </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">
-            {{ participant_[scope.row.participant_type] }}
-          </template>
-        </el-table-column>
-        <el-table-column label="创建时间" prop="create_time"></el-table-column>
-		  <el-table-column label="操作" fixed="right" align="right" width="120">
-			  <template #default="scope">
-				  <el-button link size="small" @click="handleShow(scope.row)">查看详情</el-button>
-			  </template>
-		  </el-table-column>
-      </scTable>
-    </el-main>
-  </el-container>
+	<el-container>
+		<el-main class="nopadding">
+			<scTable
+				ref="table"
+				:data="list"
+				row-key="id"
+				stripe
+				highlightCurrentRow
+				hidePagination
+			>
+				<el-table-column label="ID" prop="id"></el-table-column>
+				<el-table-column label="工单标题" prop="title"></el-table-column>
+				<el-table-column label="流水号" prop="sn"></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">
+						{{ actstate_[scope.row.act_state] }}
+					</template>
+				</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">
+						{{ participant_[scope.row.participant_type] }}
+					</template>
+				</el-table-column>
+				<el-table-column label="创建时间" prop="create_time"></el-table-column>
+				<el-table-column label="操作" fixed="right" align="right" width="120">
+					<template #default="scope">
+						<el-button link size="small" @click="handleShow(scope.row)">查看详情</el-button>
+					</template>
+				</el-table-column>
+			</scTable>
+		</el-main>
+	</el-container>
 </template>
 
 <script>
-export default {
-  name: "state",
-  data() {
-    return {
-      list:[],
+	export default {
+		name: "state",
+		data() {
+			return {
+				list: [],
 
-      actstate_: {
-        0: "草稿中",
-        1: "进行中",
-        2: "被退回",
-        3: "被撤回",
-        4: "已完成",
-        5: "已关闭",
-      },
-      participant_: {
-        0: "无处理人",
-        1: "个人",
-        2: "多人",
-      },
-    };
-  },
-  mounted() {
-    this.getList();
-  },
-  methods: {
-    async getList() {
-      let res = await this.$API.wf.ticket.list.req({ category: "cc",page:0 });
-      console.log(res);
-      this.list = res;
-    },
-	  handleShow(row) {
-		  this.$router.push({
-			  name: "visitdetail",
-			  query: {
-				  id: row.id,
-				  type: 'show',
-				  projectId: row.ticket_data.visit,
-				  catetype : row.workflow_.key
-			  },
-		  });
-	  },
-  },
-};
+				actstate_: {
+					0: "草稿中",
+					1: "进行中",
+					2: "被退回",
+					3: "被撤回",
+					4: "已完成",
+					5: "已关闭",
+				},
+				participant_: {
+					0: "无处理人",
+					1: "个人",
+					2: "多人",
+				},
+			};
+		},
+		mounted() {
+			this.getList();
+		},
+		methods: {
+			async getList() {
+				let res = await this.$API.wf.ticket.list.req({category: "cc", page: 0});
+				console.log(res);
+				this.list = res;
+			},
+			handleShow(row) {
+				let cateType = row.workflow_.key;
+				let projectId = '', operation = null;
+				if (cateType === 'visit') {
+					projectId = row.ticket_data.visit;
+				} else if (cateType === 'rparty') {
+					projectId = row.ticket_data.rpj;
+				} else {
+					operation = row.ticket_data.operation ? row.ticket_data.operation : null;
+					projectId = row.ticket_data.opl;
+				}
+				this.$router.push({
+					name: "visitdetail",
+					query: {
+						id: row.id,
+						type: 'show',
+						projectId: projectId,
+						catetype: cateType,
+						operation: operation
+					},
+				});
+			},
+		},
+	};
 </script>
 
 <style scoped>
diff --git a/src/views/wf/dutywork.vue b/src/views/wf/dutywork.vue
index 4f594208..f2494775 100644
--- a/src/views/wf/dutywork.vue
+++ b/src/views/wf/dutywork.vue
@@ -42,14 +42,6 @@
 						>
 							处理
 						</el-link>
-						<!--多人处理，直接接单-->
-						<!--<el-link
-							v-if="scope.row.state_.distribute_type===1&&scope.row.participant_type===2"
-							type="primary"
-							@click="handleDetail(scope.row)"
-						>
-							接单
-						</el-link>-->
 						<el-button v-if="scope.row.state_.distribute_type===1&&scope.row.participant_type===2"
 								   type="text" size="small" @click="handleAccept(scope.row)">
 							接单
@@ -68,39 +60,11 @@
 	<el-dialog v-model="limitedFlowLogs" title="工单日志">
 		<ticket-log ref="ticketLogs" :ticket="ticketId"></ticket-log>
 	</el-dialog>
-
-	<!--<el-dialog v-model="limitedFlowLogs" title="工单日志">
-		<el-table
-			:data="floeLogs"
-			fit
-			stripe
-			style="width: 100%;border-top:1px solid #EBEEF5;"
-		>
-			<el-table-column label="工单标题">
-				<template #defalut="scope">
-					<span v-if="scope.row.ticket_data">{{scope.row.ticket_data.title}}</span>
-				</template>
-			</el-table-column>
-			<el-table-column label="进行状态">
-				<template #defalut="scope">
-					<span v-if="scope.row.state_">{{scope.row.state_.name}}</span>
-				</template>
-			</el-table-column>
-			<el-table-column label="操作人">
-				<template #default="scope">
-					<span v-if="scope.row.participant_">{{ scope.row.participant_.name }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column label="操作意见" prop="suggestion">
-			</el-table-column>
-			<el-table-column label="更新时间" prop="update_time">
-			</el-table-column>
-		</el-table>
-	</el-dialog>-->
 </template>
 
 <script>
 	import ticketLog from "./details.vue";
+
 	export default {
 		components: {
 			ticketLog,
@@ -122,9 +86,9 @@
 					1: "个人",
 					2: "多人",
 				},
-				floeLogs:[],
-				ticketId:'',
-				limitedFlowLogs:false,
+				floeLogs: [],
+				ticketId: '',
+				limitedFlowLogs: false,
 			};
 		},
 		mounted() {
@@ -137,22 +101,22 @@
 				this.list = res;
 			},
 			//处理
-			handleDetail(row){
-				let projectId='',operation=null;
+			handleDetail(row) {
+				let projectId = '', operation = null;
 				let catetype = row.workflow_.key;
-				if(catetype==='visit'){
-					projectId=row.ticket_data.visit;
-				}else if(catetype==='Fire'){
-					projectId=row.ticket_data.opl;
-					operation =  row.ticket_data.operation?row.ticket_data.operation:null;
+				if (catetype === 'visit') {
+					projectId = row.ticket_data.visit;
+				} else if (catetype === 'Fire') {
+					projectId = row.ticket_data.opl;
+					operation = row.ticket_data.operation ? row.ticket_data.operation : null;
 				}
 				this.$router.push({
 					name: "visitdetail",
 					query: {
 						id: row.id,
-						projectId:projectId,
-						catetype:row.workflow_.key,
-						operation:operation
+						projectId: projectId,
+						catetype: row.workflow_.key,
+						operation: operation
 					},
 				});
 			},
@@ -162,10 +126,10 @@
 				let id = row.id;
 				this.ticketId = row.id;
 				that.limitedFlowLogs = true;
-				that.$API.wf.ticket.ticketFlow.req({ticket:id}).then(res => {
+				that.$API.wf.ticket.ticketFlow.req({ticket: id}).then(res => {
 					if (res.err_msg) {
 
-					}else{
+					} else {
 						that.floeLogs = res.results;
 					}
 				})
diff --git a/src/views/wf/ownerwork.vue b/src/views/wf/ownerwork.vue
index 1d21d937..98459c88 100644
--- a/src/views/wf/ownerwork.vue
+++ b/src/views/wf/ownerwork.vue
@@ -76,7 +76,7 @@
 		data() {
 			return {
 				list: [],
-				userId:this.$TOOL.data.get("USER_INFO").id,
+				userId: this.$TOOL.data.get("USER_INFO").id,
 				actstate_: {
 					0: "草稿中",
 					1: "进行中",
@@ -95,8 +95,8 @@
 				},
 				handleLabel: '撤回原因',
 				handleTitle: '撤回工单',
-				ticketId:null,
-				limitedRetreat:false,
+				ticketId: null,
+				limitedRetreat: false,
 			};
 		},
 		mounted() {
@@ -105,13 +105,24 @@
 		},
 		methods: {
 			handleShow(row) {
+				let cateType = row.workflow_.key;
+				let projectId = '', operation = null;
+				if (cateType === 'visit') {
+					projectId = row.ticket_data.visit;
+				} else if (cateType === 'rparty') {
+					projectId = row.ticket_data.rpj;
+				} else {
+					operation = row.ticket_data.operation ? row.ticket_data.operation : null;
+					projectId = row.ticket_data.opl;
+				}
 				this.$router.push({
 					name: "visitdetail",
 					query: {
 						id: row.id,
 						type: 'show',
-						projectId: row.ticket_data.visit,
-						catetype:row.workflow_.key
+						projectId: projectId,
+						catetype: cateType,
+						operation: operation
 					},
 				});
 			},
@@ -137,7 +148,7 @@
 			handleSubmit() {
 				let res = '';
 				let that = this;
-				that.$confirm('确认'+that.handleTitle+'吗?', "温馨提示", {
+				that.$confirm('确认' + that.handleTitle + '吗?', "温馨提示", {
 					confirmButtonText: "确认",
 					cancelButtonText: "取消",
 					type: "warning",
@@ -148,9 +159,9 @@
 						} else {
 							res = that.$API.wf.ticket.ticketClose.req(that.ticketId, that.handleForm);
 						}
-						if(res.err_msg){
+						if (res.err_msg) {
 							that.getList();
-						}else{
+						} else {
 							that.limitedRetreat = false;
 							that.getList();
 						}
diff --git a/src/views/wf/visitdetail.vue b/src/views/wf/visitdetail.vue
index fee6c798..1e664aca 100644
--- a/src/views/wf/visitdetail.vue
+++ b/src/views/wf/visitdetail.vue
@@ -1,8 +1,16 @@
 <template>
 	<el-container>
 		<el-main class="nopadding">
-			<el-card style="margin-bottom: 10px">
+			<el-card style="margin-bottom: 10px;position: relative">
 				<work-step ref="workStep"></work-step>
+				<el-button
+					class="ticketRetry"
+					v-if="type!=='show'&&ticketDetail.state_&&ticketDetail.state_.name==='任务执行'"
+					@click="reStart"
+					type="primary"
+				>
+					重新执行
+				</el-button>
 			</el-card>
 			<el-card style="margin-left: 10px; margin-bottom: 10px" v-if="cateType==='visit'">
 				<el-descriptions title="来访信息" :column="3">
@@ -74,7 +82,7 @@
 					</el-descriptions-item>
 				</el-descriptions>
 				<div style="text-align: center">
-					<el-link type="primary" @click="showMore"> 更多信息 </el-link>
+					<el-link type="primary" @click="showMore"> 更多信息</el-link>
 				</div>
 				<show-dialog v-if="rpjShow" ref="showDialog"></show-dialog>
 			</el-card>
@@ -103,7 +111,7 @@
 					</el-descriptions-item>
 				</el-descriptions>
 				<div style="text-align: center">
-					<el-link type="primary" @click="showMoreInfo"> 作业许可证详情 </el-link>
+					<el-link type="primary" @click="showMoreInfo"> 作业许可证详情</el-link>
 				</div>
 				<show-dialog v-if="rpjShow" ref="showDialog"></show-dialog>
 			</el-card>
@@ -111,43 +119,23 @@
 			<el-card style="margin-left: 10px; margin-bottom: 10px" v-if="type!=='show'">
 				<scTitle title="处理"></scTitle>
 				<el-form :model="form" ref="addForm" label-width="100px" label-position="left">
-					<el-form-item label="处理意见">
-						<el-input v-model="form.suggestion" clearable></el-input>
-					</el-form-item>
-				</el-form>
-				<div v-if="ticketDetail.in_add_node" style="text-align: right">
-					<el-button v-if="ticketDetail.in_add_node" class="filter-item" type="primary" @click="addNodeHandler('2')">加签处理</el-button>
-				</div>
-				<div v-else style="display: flex;justify-content: space-between;">
-					<div>
-						<el-button type="primary" @click="addNode">加签</el-button>
-						<el-button v-if="ticketDetail.state_&&ticketDetail.state_.enable_deliver" type="primary" plain @click="deliverNode">转交</el-button>
-					</div>
-					<div>
-						<el-button v-for="item in operationBtn" :key="item.id" class="filter-item" :type="item.attribute_type===2?'danger':'primary'" @click="operationSubmit(item.id)">{{item.name}}</el-button>
-					</div>
-				</div>
-			</el-card>
-			<el-card style="margin-left: 10px; margin-bottom: 10px" v-if="type!=='show'">
-				<scTitle title="作业票关闭"></scTitle>
-				<el-form :model="form" ref="addForm" label-width="100px" label-position="left">
-					<el-form-item label="关闭原因：">
-						<el-select v-model="form.reason" placeholder="选择关闭原因">
+					<el-form-item label="作业情况：" v-if="ticketDetail.state_&&ticketDetail.state_.name==='作业负责人关闭'">
+						<el-select v-model="form.close_note" placeholder="选择关闭原因">
 							<el-option
-								v-for="item in reasonOption"
-								:key="item"
-								:label="item"
-								:value="item"
+								v-for="item in noteOption"
+								:key="item.id"
+								:label="item.name"
+								:value="item.id"
 							/>
 						</el-select>
 					</el-form-item>
-					<el-form-item label="关闭确认：">
-						<el-checkbox-group v-model="form.review">
+					<el-form-item label="关闭处理：" v-if="ticketDetail.state_&&ticketDetail.state_.name==='作业负责人关闭'">
+						<el-checkbox-group v-model="form.close_dos">
 							<el-checkbox
-								v-for="(item, index) in reviewOption"
+								v-for="(item, index) in dosOption"
 								:key="index"
-								:label="item"
-							>{{ item }}
+								:label="item.id"
+							>{{ item.name }}
 							</el-checkbox>
 						</el-checkbox-group>
 					</el-form-item>
@@ -156,15 +144,22 @@
 					</el-form-item>
 				</el-form>
 				<div v-if="ticketDetail.in_add_node" style="text-align: right">
-					<el-button v-if="ticketDetail.in_add_node" class="filter-item" type="primary" @click="addNodeHandler('2')">加签处理</el-button>
+					<el-button v-if="ticketDetail.in_add_node" class="filter-item" type="primary"
+							   @click="addNodeHandler('2')">加签处理
+					</el-button>
 				</div>
 				<div v-else style="display: flex;justify-content: space-between;">
 					<div>
 						<el-button type="primary" @click="addNode">加签</el-button>
-						<el-button v-if="ticketDetail.state_&&ticketDetail.state_.enable_deliver" type="primary" plain @click="deliverNode">转交</el-button>
+						<el-button v-if="ticketDetail.state_&&ticketDetail.state_.enable_deliver" type="primary" plain
+								   @click="deliverNode">转交
+						</el-button>
 					</div>
 					<div>
-						<el-button v-for="item in operationBtn" :key="item.id" class="filter-item" :type="item.attribute_type===2?'danger':'primary'" @click="operationSubmit(item.id)">{{item.name}}</el-button>
+						<el-button v-for="item in operationBtn" :key="item.id" class="filter-item"
+								   :type="item.attribute_type===2?'danger':'primary'" @click="operationSubmit(item.id)">
+							{{item.name}}
+						</el-button>
 					</div>
 				</div>
 			</el-card>
@@ -177,7 +172,8 @@
 		<el-form ref="Form" :model="addForm" label-width="100px" label-position="right">
 			<el-form-item label="处理人">
 				<el-input style="width: 50%;" v-model="userName" disabled placeholder="选择处理人"></el-input>
-				<scUserSelect v-model="addForm.toadd_user" :closable="true" :multiple="false" @handlerSubmit="addNodeHandlerSubmit"></scUserSelect>
+				<scUserSelect v-model="addForm.toadd_user" :closable="true" :multiple="false"
+							  @handlerSubmit="addNodeHandlerSubmit"></scUserSelect>
 			</el-form-item>
 			<el-form-item label="加签原因">
 				<el-input type="textarea" :rows="3" v-model="addForm.suggestion" placeholder="加签原因"/>
@@ -233,24 +229,24 @@
 				visitDetail: [],
 				employeeLists: [],
 				operationBtn: [],
-				form:{
-					suggestion:'',
-					reason:'',
-					review:'',
+				form: {
+					suggestion: '',
+					close_note: '',
+					close_dos: [],
 				},
-				addForm:{
-					suggestion:'',
-					toadd_user:'',
+				addForm: {
+					suggestion: '',
+					toadd_user: '',
 				},
-				deliverForm:{
-					suggestion:'',
-					target_user:'',
+				deliverForm: {
+					suggestion: '',
+					target_user: '',
 				},
-				rpjShow:false,
-				limitedAdd:false,
-				showLimited:false,
-				limitedDeliver:false,
-				limitedUserSelect:false,
+				rpjShow: false,
+				limitedAdd: false,
+				showLimited: false,
+				limitedDeliver: false,
+				limitedUserSelect: false,
 				purpose_: {
 					10: "参观",
 					20: "拜访",
@@ -270,12 +266,16 @@
 					40: "进行中",
 					50: "已完成",
 				},
-				reasonOption:['作业正常结束','因计划改变停止作业','因发生异常终止作业','其他'],
-				reviewOption:['现场已清理','人员已清点','火种已熄灭','其他'],
-				// reviewOption:['现场已清理','人员已清点','火种已熄灭','其他'],
+				noteOption: [
+					{id: 10, name: '作业正常结束'},
+					{id: 20, name: '因计划改变停止作业'},
+					{id: 30, name: '因发生异常终止作业'},
+					{id: 40, name: '其他'},
+				],
+				dosOption: [],
 			};
 		},
-		created(){
+		created() {
 			this.ticketId = this.$route.query.id;
 			this.type = this.$route.query.type;
 			this.projectId = this.$route.query.projectId;
@@ -285,25 +285,37 @@
 		},
 		mounted() {
 			debugger;
-			if(this.cateType==='visit'){
+			if (this.cateType === 'visit') {
 				this.getVisit();
-			}else if(this.cateType==='rparty'){
+			} else if (this.cateType === 'rparty') {
 				this.getRpj();
-			}else{
-				if(this.operation!==null){
+			} else {
+				if (this.operation !== null) {
 					this.getOperation();
-				}else{
+				} else {
 					this.getOpl();
 				}
+				this.getCloseDos();
 			}
 			this.getticketItem();
 			this.getBtns();
 		},
 		methods: {
-			showMore(){
+			//关闭工作
+			getCloseDos() {
+				this.$API.system.dict.list
+					.req({page: 0, type__code: "close_options"})
+					.then((res) => {
+						let dosOption = res.filter(item => {
+							return item.is_used
+						});
+						this.dosOption = dosOption.slice(0, 3)
+					});
+			},
+			showMore() {
 				this.rpjShow = true;
-				this.$nextTick(()=>{
-					this.$refs.showDialog.open().setData({id:this.projectId});
+				this.$nextTick(() => {
+					this.$refs.showDialog.open().setData({id: this.projectId});
 				})
 			},
 			//工单详情
@@ -313,8 +325,8 @@
 				});
 			},
 			//获取应有的流转
-			getBtns(){
-				this.$API.wf.ticket.ticketTransitions.req(this.ticketId).then(res=>{
+			getBtns() {
+				this.$API.wf.ticket.ticketTransitions.req(this.ticketId).then(res => {
 					this.operationBtn = res;
 				})
 			},
@@ -327,68 +339,70 @@
 			},
 
 			//入厂项目详情
-			getRpj(){
+			getRpj() {
 				this.$API.rpm.rpj.item.req(this.projectId).then((res) => {
 					debugger;
 					this.rpjDetail = res;
 				});
 			},
 			//许可证详情
-			getOpl(){
+			getOpl() {
 				this.$API.opm.opl.read.req(this.projectId).then((res) => {
 					debugger;
 					this.oplDetail = res;
 				});
 			},
 			//作业详情
-			getOperation(){
+			getOperation() {
 				debugger;
 				this.$API.opm.operation.read.req(this.operation).then((res) => {
 					debugger;
 					this.oplDetail = res;
 				});
 			},
-			showMoreInfo(){
+			showMoreInfo() {
 				this.showLimited = true;
 			},
 			//加签处理-start
-			addNode(){
+			addNode() {
 				this.limitedAdd = true;
 			},
-			addCancel(){
+			addCancel() {
 				this.limitedAdd = false;
 			},
 			addNodeHandlerSubmit(data) {
-				this.addForm.toadd_user=data.id;
-				this.userName=data.name;
+				this.addForm.toadd_user = data.id;
+				this.userName = data.name;
 			},
-			addNodeHandler(index){
+			addNodeHandler(index) {
 				let res = null;
-				if(index==='1'){
-					res = this.$API.wf.ticket.addNode.req(this.ticketId,this.addForm);
-				}else{
-					res = this.$API.wf.ticket.addNodeEnd.req(this.ticketId,this.form);
+				if (index === '1') {
+					res = this.$API.wf.ticket.addNode.req(this.ticketId, this.addForm);
+				} else {
+					res = this.$API.wf.ticket.addNodeEnd.req(this.ticketId, this.form);
 				}
-				if(res.err_msg){}else{
+				if (res.err_msg) {
+				} else {
 					this.limitedAdd = false;
 					this.$router.push("dutywork");
 				}
 			},
 			//加签处理-end
 			//转交处理-start
-			deliverNode(){
+			deliverNode() {
 				this.limitedDeliver = true;
 			},
-			deliverCancel(){
+			deliverCancel() {
 				this.limitedDeliver = false;
 			},
 			deliverHandlerSubmit(data) {
-				this.deliverForm.target_user=data.id;
-				this.userName=data.name;
+				this.deliverForm.target_user = data.id;
+				this.userName = data.name;
 			},
-			deliverNodeHandler(){
-				this.$API.wf.ticket.ticketDeliver.req(this.ticketId,this.deliverForm).then(res=>{
-					if(res.err_msg){}else{
+			deliverNodeHandler() {
+				this.$API.wf.ticket.ticketDeliver.req(this.ticketId, this.deliverForm).then(res => {
+					if (res.err_msg) {
+					} else {
 						this.limitedDeliver = false;
 						this.$router.push("dutywork");
 					}
@@ -396,20 +410,38 @@
 			},
 			//转交处理-end
 			//流转按钮触发
-			operationSubmit(id){
+			operationSubmit(id) {
 				let params = new Object();
 				params.transition = id;
 				params.ticket_data = {};
 				params.suggestion = this.form.suggestion;
-				this.$API.wf.ticket.ticketHandle.req(this.ticketId,params).then(res=>{
-					if(res.err_msg){}else{
+				if (this.ticketDetail.state_.name === '作业负责人关闭') {
+					params.ticket_data.close_note = this.form.close_note;
+					params.ticket_data.close_dos = this.form.close_dos;
+				}
+				this.$API.wf.ticket.ticketHandle.req(this.ticketId, params).then(res => {
+					if (res.err_msg) {
+					} else {
 						this.$router.push("dutywork");
 					}
 				})
 			},
+			reStart() {
+				this.$API.wf.ticket.retryScript.req(this.ticketId).then(res => {
+					if (res.err_msg) {
+					} else {
+						this.$router.push("dutywork");
+					}
+				});
+			},
 		},
 	};
 </script>
 
 <style scoped>
+	.ticketRetry {
+		right: 20px;
+		top: 30px;
+		position: absolute;
+	}
 </style>
diff --git a/src/views/wf/worked.vue b/src/views/wf/worked.vue
index 00c843d1..3ff92586 100644
--- a/src/views/wf/worked.vue
+++ b/src/views/wf/worked.vue
@@ -49,7 +49,6 @@
 		data() {
 			return {
 				list: [],
-
 				actstate_: {
 					0: "草稿中",
 					1: "进行中",
@@ -75,13 +74,24 @@
 				this.list = res;
 			},
 			handleShow(row) {
+				let cateType = row.workflow_.key;
+				let projectId = '', operation = null;
+				if (cateType === 'visit') {
+					projectId = row.ticket_data.visit;
+				} else if (cateType === 'rparty') {
+					projectId = row.ticket_data.rpj;
+				} else {
+					operation = row.ticket_data.operation ? row.ticket_data.operation : null;
+					projectId = row.ticket_data.opl;
+				}
 				this.$router.push({
 					name: "visitdetail",
 					query: {
 						id: row.id,
 						type: 'show',
-						projectId: row.ticket_data.visit,
-						catetype: row.workflow_.key
+						projectId: projectId,
+						catetype: cateType,
+						operation: operation
 					},
 				});
 			},
diff --git a/src/views/wf/workflow.vue b/src/views/wf/workflow.vue
index 606317cd..e1060a65 100644
--- a/src/views/wf/workflow.vue
+++ b/src/views/wf/workflow.vue
@@ -17,9 +17,9 @@
 			<scTable ref="table" :apiObj="apiObj" row-key="id">
 				<el-table-column label="#" type="index"></el-table-column>
 				<el-table-column label="ID" prop="id" min-width="120"></el-table-column>
-				<el-table-column label="工作流名称" prop="name" min-width="250"></el-table-column>
-				<el-table-column label="标识" prop="key" min-width="250"></el-table-column>
-				<el-table-column label="工单查看权限校验" prop="view_permission_check" min-width="150">
+				<el-table-column label="工作流名称" prop="name" min-width="200"></el-table-column>
+				<el-table-column label="标识" prop="key" min-width="100"></el-table-column>
+				<el-table-column label="工单查看权限校验" prop="view_permission_check" min-width="120">
 					<template #default="scope">
 						<span v-if="scope.row.view_permission_check">是</span>
 						<span v-else>否</span>
@@ -27,7 +27,7 @@
 				</el-table-column>
 				<el-table-column label="工作流描述" prop="description" min-width="150"></el-table-column>
 				<el-table-column label="创建时间" prop="create_time" min-width="150"></el-table-column>
-				<el-table-column label="操作" fixed="right" align="center" width="220">
+				<el-table-column label="操作" fixed="right" align="center" width="250">
 					<template #default="scope">
 						<el-button link size="small" type="primary" @click="workflowShow(scope.row)"
 								   v-auth="'workflow.update'">配置
@@ -254,6 +254,7 @@
 						}
 					})
 				}
+
 				filter(this.$refs.table.tableData);
 				return target
 			},

From 03842ca8e954630abe0a7295eafb2f01a828bbdc Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 22 Jul 2022 14:12:44 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=8C=89=E9=92=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/opm/operation.vue | 2 +-
 src/views/wf/allwork.vue    | 2 +-
 src/views/wf/ccwork.vue     | 4 ++--
 src/views/wf/dutywork.vue   | 5 +++--
 src/views/wf/ownerwork.vue  | 2 +-
 src/views/wf/worked.vue     | 4 ++--
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/views/opm/operation.vue b/src/views/opm/operation.vue
index f3b03f45..468f44b4 100644
--- a/src/views/opm/operation.vue
+++ b/src/views/opm/operation.vue
@@ -97,7 +97,7 @@
 					prop="create_time"
 					width="180"
 				></el-table-column>
-				<el-table-column label="操作" fixed="right" align="left" width="170">
+				<el-table-column label="操作" fixed="right" align="center" width="170">
 					<template #default="scope">
 						<el-button-group>
 							<el-button
diff --git a/src/views/wf/allwork.vue b/src/views/wf/allwork.vue
index 3ba1df54..b6f53b66 100644
--- a/src/views/wf/allwork.vue
+++ b/src/views/wf/allwork.vue
@@ -33,7 +33,7 @@
 					</template>
 				</el-table-column>
 				<el-table-column label="创建时间" prop="create_time"></el-table-column>
-				<el-table-column label="操作" fixed="right" align="right" width="120">
+				<el-table-column label="操作" fixed="right" align="center" width="120">
 					<template #default="scope">
 						<el-button type="text" size="small" @click="handleShow(scope.row)">查看详情</el-button>
 						<!--多人且主动接单-->
diff --git a/src/views/wf/ccwork.vue b/src/views/wf/ccwork.vue
index ba37be18..208084a6 100644
--- a/src/views/wf/ccwork.vue
+++ b/src/views/wf/ccwork.vue
@@ -33,9 +33,9 @@
 					</template>
 				</el-table-column>
 				<el-table-column label="创建时间" prop="create_time"></el-table-column>
-				<el-table-column label="操作" fixed="right" align="right" width="120">
+				<el-table-column label="操作" fixed="right" align="center" width="100">
 					<template #default="scope">
-						<el-button link size="small" @click="handleShow(scope.row)">查看详情</el-button>
+						<el-button text size="small" type="primary" @click="handleShow(scope.row)">查看详情</el-button>
 					</template>
 				</el-table-column>
 			</scTable>
diff --git a/src/views/wf/dutywork.vue b/src/views/wf/dutywork.vue
index f2494775..0e788e82 100644
--- a/src/views/wf/dutywork.vue
+++ b/src/views/wf/dutywork.vue
@@ -35,13 +35,14 @@
 				<el-table-column label="创建时间" prop="create_time"></el-table-column>
 				<el-table-column label="操作" align="center">
 					<template #default="scope">
-						<el-link
+						<el-button
+							text
 							v-if="(scope.row.act_state===1||scope.row.act_state===3)&&scope.row.state_.type===0"
 							type="primary"
 							@click="handleDetail(scope.row)"
 						>
 							处理
-						</el-link>
+						</el-button>
 						<el-button v-if="scope.row.state_.distribute_type===1&&scope.row.participant_type===2"
 								   type="text" size="small" @click="handleAccept(scope.row)">
 							接单
diff --git a/src/views/wf/ownerwork.vue b/src/views/wf/ownerwork.vue
index 98459c88..121247cd 100644
--- a/src/views/wf/ownerwork.vue
+++ b/src/views/wf/ownerwork.vue
@@ -35,7 +35,7 @@
 				<el-table-column label="创建时间" prop="create_time"></el-table-column>
 				<el-table-column label="操作" fixed="right" align="center" width="160">
 					<template #default="scope">
-						<el-button link size="small" @click="handleShow(scope.row)">查看详情</el-button>
+						<el-button text size="small" type="primary" @click="handleShow(scope.row)">查看详情</el-button>
 						<!--创建人在初始状态-->
 						<el-link
 							v-if="scope.row.state_.type===1&&userId===scope.row.create_by"
diff --git a/src/views/wf/worked.vue b/src/views/wf/worked.vue
index 3ff92586..5a53e74d 100644
--- a/src/views/wf/worked.vue
+++ b/src/views/wf/worked.vue
@@ -33,9 +33,9 @@
 					</template>
 				</el-table-column>
 				<el-table-column label="创建时间" prop="create_time"></el-table-column>
-				<el-table-column label="操作" fixed="right" align="right" width="120">
+				<el-table-column label="操作" fixed="right" align="center" width="100">
 					<template #default="scope">
-						<el-button link size="small" @click="handleShow(scope.row)">查看详情</el-button>
+						<el-button text size="small" type="primary" @click="handleShow(scope.row)">查看详情</el-button>
 					</template>
 				</el-table-column>
 			</scTable>