From 5308e9514258d13eedeb4d6b49cacaaee5aeeaad Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 25 Oct 2022 16:29:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wf/details.vue      | 38 ++++++++++----------
 src/views/wf/ticketdetail.vue | 65 ++++++++++++++++++++++-------------
 2 files changed, 60 insertions(+), 43 deletions(-)

diff --git a/src/views/wf/details.vue b/src/views/wf/details.vue
index e7b4d24d..586187f3 100644
--- a/src/views/wf/details.vue
+++ b/src/views/wf/details.vue
@@ -9,36 +9,24 @@
         height="400"
         highlight-current-row
       >
-        <el-table-column label="工单标题" min-width="100">
+        <!-- <el-table-column label="工单标题" min-width="100">
           <template #default="scope">
             <span v-if="scope.row.ticket_data.title">{{
               scope.row.ticket_data.title
             }}</span>
           </template>
-        </el-table-column>
-        <el-table-column label="进行状态" min-width="100">
+        </el-table-column> -->
+        <el-table-column label="进行状态">
           <template #default="scope">
             <span>{{ scope.row.state_.name }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作属性" min-width="100">
-          <template #default="scope">
-            <el-tag type="success" v-if="scope.row.transition_attribute == 1"
-              >同意</el-tag
-            >
-            <el-tag
-              type="success"
-              v-else-if="scope.row.transition_attribute == 2"
-              >拒绝</el-tag
-            >
-          </template>
-        </el-table-column>
-        <el-table-column label="操作类型" min-width="100">
+        <el-table-column label="操作类型">
           <template #default="scope">
             <span>{{ interveneTypeOptions[scope.row.intervene_type] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作人" min-width="100">
+        <el-table-column label="操作人">
           <template #default="scope">
             <el-span v-if="scope.row.participant_">{{
               scope.row.participant_.name
@@ -48,9 +36,21 @@
             }}</el-span>
           </template>
         </el-table-column>
-        <el-table-column label="操作意见" min-width="100" prop="suggestion">
+        <el-table-column label="操作属性">
+          <template #default="scope">
+            <el-tag type="success" v-if="scope.row.transition_attribute == 1"
+              >同意</el-tag
+            >
+            <el-tag
+              type="danger"
+              v-else-if="scope.row.transition_attribute == 2"
+              >拒绝</el-tag
+            >
+          </template>
         </el-table-column>
-        <el-table-column label="更新时间" min-width="100" prop="update_time">
+        <el-table-column label="操作意见" prop="suggestion" :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column label="更新时间" prop="update_time">
         </el-table-column>
       </el-table>
     </el-main>
diff --git a/src/views/wf/ticketdetail.vue b/src/views/wf/ticketdetail.vue
index a1a67f0c..6c93a9f5 100644
--- a/src/views/wf/ticketdetail.vue
+++ b/src/views/wf/ticketdetail.vue
@@ -7,21 +7,37 @@
 					class="ticketRetry"
 					v-if="!ticketDetail.script_run_last_result"
 					@click="reStart"
-					type="primary"
+					type="warning"
 				>
 					重新执行
 				</el-button>
 			</el-card>
-			<el-card style="margin-top: 8px" v-if="cateType==='visit'">
-				<el-descriptions title="来访信息" :column="3">
+			<el-card style="margin-top: 4px">
+				<el-descriptions title="工单信息" :column="3">
 					<el-descriptions-item label="工单流水号:">
 						{{ticketDetail.sn }}
 					</el-descriptions-item>
+					<el-descriptions-item label="所属流程:">
+						<span v-if="ticketDetail.workflow">{{ticketDetail.workflow_.name }}</span>
+					</el-descriptions-item>
+					<el-descriptions-item label="创建时间:">
+						{{ticketDetail.create_time }}
+					</el-descriptions-item>
+					<el-descriptions-item label="工单标题:" :span="3">
+						{{ticketDetail.title }}
+					</el-descriptions-item>
+				</el-descriptions>
+			</el-card>
+			<el-card style="margin-top: 4px" v-if="cateType==='visit'">
+				<el-descriptions title="来访信息" :column="3">
 					<el-descriptions-item label="来访概述:">
 						{{visitDetail.name }}
 					</el-descriptions-item>
-					<el-descriptions-item label="来访单位:">
-						{{visitDetail.company }}
+					<el-descriptions-item label="来访级别:">
+						{{visitDetail.name }}
+					</el-descriptions-item>
+					<el-descriptions-item label="来访事由:">
+						{{purpose_[visitDetail.purpose] }}
 					</el-descriptions-item>
 					<el-descriptions-item label="来访人数:">
 						<el-tag size="small">{{ visitDetail.count_people }}人</el-tag>
@@ -37,25 +53,20 @@
 					<el-descriptions-item label="来访时间:">
 						{{visitDetail.visit_time }}
 					</el-descriptions-item>
-					<el-descriptions-item label="离开时间:">
+					<el-descriptions-item label="离访时间:">
 						{{visitDetail.leave_time }}
 					</el-descriptions-item>
-					<el-descriptions-item label="来访事由:">
-						{{purpose_[visitDetail.purpose] }}
-					</el-descriptions-item>
-					<el-descriptions-item label="来访详述:">
-						{{visitDetail.description }}
-					</el-descriptions-item>
 					<el-descriptions-item label="接待人:" v-if="visitDetail.receptionist_">
 						{{ visitDetail.receptionist_.name }}
 					</el-descriptions-item>
 				</el-descriptions>
+				<div style="text-align: center">
+					<el-link type="primary" @click="showMoreVisit"> 更多信息</el-link>
+				</div>
+				<visit-dialog v-if="visitShow" ref="visitDialog"></visit-dialog>
 			</el-card>
-			<el-card style="margin-top: 8px" v-if="cateType==='rpj'">
+			<el-card style="margin-top: 4px" v-if="cateType==='rpj'">
 				<el-descriptions title="入厂项目" :column="3">
-					<el-descriptions-item label="工单流水号:">
-						{{ticketDetail.sn }}
-					</el-descriptions-item>
 					<el-descriptions-item label="相关方:">
 						{{rpjDetail.rparty_name}}
 					</el-descriptions-item>
@@ -86,11 +97,8 @@
 				</div>
 				<show-dialog v-if="rpjShow" ref="showDialog"></show-dialog>
 			</el-card>
-			<el-card style="margin-top: 8px" v-if="cateType==='opl'">
+			<el-card style="margin-top: 4px" v-if="cateType==='opl'">
 				<el-descriptions title="作业许可证" :column="3">
-					<el-descriptions-item label="工单流水号:">
-						{{ticketDetail.sn }}
-					</el-descriptions-item>
 					<el-descriptions-item label="所属作业:">
 						<span v-if="oplDetail.operation">{{oplDetail.operation_.name }}</span>
 					</el-descriptions-item>
@@ -119,7 +127,7 @@
 				<show-dialog v-if="rpjShow" ref="showDialog"></show-dialog>
 			</el-card>
 
-			<el-card style="margin-top: 8px" v-if="type!=='show'">
+			<el-card style="margin-top: 4px" v-if="type!=='show'">
 				<scTitle title="处理"></scTitle>
 				<el-form :model="form" ref="addForm" label-width="100px" label-position="left">
 					<el-form-item label="作业情况：" v-if="ticketDetail.state_&&ticketDetail.state_.key==='opl_close'">
@@ -166,7 +174,7 @@
 					</div>
 				</div>
 			</el-card>
-			<el-card style="margin-top: 8px" header="处理日志">
+			<el-card style="margin-top: 4px" header="处理日志">
 				<work-details ref="workDetails" :ticket="ticketId"></work-details>
 			</el-card>
 		</el-main>
@@ -202,7 +210,7 @@
 			<el-button class="filter-item" type="primary" @click="deliverNodeHandler('1')">确定</el-button>
 		</div>
 	</el-dialog>
-	<el-drawer :size="'50%'" v-model="showLimited" title="作业许可证详情">
+	<el-drawer :size="'50%'" v-model="showLimited" title="作业许可证详情" :close-on-click-modal="false">
 		<sc-fire :id="projectId"></sc-fire>
 	</el-drawer>
 </template>
@@ -211,12 +219,14 @@
 	import workDetails from "./details.vue";
 	import workStep from "./steps.vue";
 	import showDialog from "../rpm/rpj_show.vue";
+	import visitDialog from "../vm/visit_detial.vue";
 
 	export default {
 		components: {
 			workDetails,
 			workStep,
-			showDialog
+			showDialog,
+			visitDialog
 		},
 		name: "ticketdetail",
 		data() {
@@ -245,6 +255,7 @@
 					target_user: '',
 				},
 				rpjShow: false,
+				visitShow: false,
 				limitedAdd: false,
 				showLimited: false,
 				limitedDeliver: false,
@@ -322,6 +333,12 @@
 					this.$refs.showDialog.open().setData({id: this.projectId});
 				})
 			},
+			showMoreVisit() {
+				this.visitShow = true;
+				this.$nextTick(() => {
+					this.$refs.visitDialog.open('show').setData({id: this.projectId});
+				})
+			},
 			//工单详情
 			getticketItem() {
 				this.mainLoading = true