Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs

src/views/wf/allwork.vue

@@ -37,9 +37,7 @@
 					<template #default="scope">
 						<el-button type="text" size="small" @click="handleShow(scope.row)">查看详情</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)">接单
-						</el-button>
 					</template>
 				</el-table-column>
 			</scTable>
@@ -101,14 +99,6 @@
 					},
 				});
 			},
-			handleAccept(row) {
-				this.$API.wf.ticket.ticketAccept.req(row.id, {}).then(res => {
-					if (res.err_msg) {
-					} else {
-						this.getList();
-					}
-				})
-			},
 		},
 	};
 </script>

src/views/wf/configuration.vue

@@ -1,6 +1,6 @@
 <template>
 	<el-container>
-		<el-tabs style="width: 100%; height:100%" type="border-card" v-model="activeName" @tab-click="handleClick">
+		<el-tabs style="width: 100%; height:100%" type="border-card" v-model="activeName" id="workflowElTabs" @tab-click="handleClick">
 			<el-tab-pane label="自定义字段" name="customField">
 				<field v-if="activeName==='customField'"></field>
 			</el-tab-pane>
@@ -45,5 +45,14 @@
 		}
 	}
 </script>
+<style>
+	#workflowElTabs > .el-tabs__content{
+		height:calc(100% - 40px);
+	}
+	#workflowElTabs .el-tab-pane{
+		height: calc(100% - 20px);
+
+	}
+</style>
 
 

src/views/wf/dutywork.vue

@@ -36,12 +36,24 @@
 				<el-table-column label="操作" align="center">
 					<template #default="scope">
 						<el-link
-							v-if="(scope.row.act_state===1||scope.row.act_state===3)&&scope.row.participant_type!==2&&scope.row.state_.type===0"
+							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-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)">
+							接单
+						</el-button>
 						<el-link
 							type="success"
 							@click="handleLogs(scope.row)"
@@ -149,6 +161,14 @@
 					}
 				})
 			},
+			handleAccept(row) {
+				this.$API.wf.ticket.ticketAccept.req(row.id, {}).then(res => {
+					if (res.err_msg) {
+					} else {
+						this.getList();
+					}
+				})
+			},
 		},
 	};
 </script>

src/views/wf/state.vue

@@ -42,21 +42,18 @@
           </template>
         </el-table-column>
         <el-table-column label="参与人类型">
-          <template #default="scope">{{
+          <template #default="scope">
-            options_[scope.row.participant_type]
+			  {{options_[scope.row.participant_type]}}</template>
-          }}</template>
         </el-table-column>
 		<el-table-column label="分配方式">
-          <template #default="scope">{{
+          <template #default="scope">
-            options2_[scope.row.distribute_type]
+			  {{options2_[scope.row.distribute_type]}}</template>
-          }}</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="handleEdit(scope.row)"
-              >编辑</el-button
+              >编辑</el-button>
-            >
             <el-popconfirm title="确定删除吗？">
               <template #reference>
                 <el-button link size="small">删除</el-button>

src/views/wf/transform.vue

@@ -11,6 +11,7 @@
 			:data="list" ref="table"
 			row-key="id" stripe highlightCurrentRow hidePagination
 		>
+			<el-table-column label="#" type="index"></el-table-column>
 			<el-table-column label="ID" prop="id"></el-table-column>
 			<el-table-column label="名称" prop="name"></el-table-column>
 			<el-table-column label="定时器（单位秒）" prop="timer"></el-table-column>