From f3bffa50ca7d050f0fc26df834b52a8a2449e1ca Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 23 Mar 2023 17:14:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=AE=E9=80=9A=E4=BD=9C=E4=B8=9A=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E5=89=8D=E7=85=A7=E7=89=87=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/scOpl/scFire.vue | 41 ++++++++++++++++++++++-----------
 src/style/fix.scss              |  3 ++-
 src/views/opm/opl.vue           | 11 ++++++++-
 src/views/wf/ticketdetail.vue   |  3 ++-
 4 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/src/components/scOpl/scFire.vue b/src/components/scOpl/scFire.vue
index 562f0316..2ce5bd6c 100644
--- a/src/components/scOpl/scFire.vue
+++ b/src/components/scOpl/scFire.vue
@@ -1,6 +1,7 @@
 <template>
 	<!--基本信息!-->
-	<el-main v-loading="mainLoading" style="margin-top: -60px;">
+	<el-main v-loading="mainLoading" style="margin-top: -10px;">
+		<div class="exportBtn" @click="handleExport">导出</div>
 		<div id="exportDiv" class="exportDiv">
 			<p style="font-weight: 600px;font-size: 18px;text-align: center;margin-top: 40px;">{{form.cate_name}}作业许可证<span>（{{ form.number }}）</span></p>
 			<p class="tables-title">作业信息</p>
@@ -96,6 +97,15 @@
 					<el-descriptions-item label="监控状态:" span=2  v-if="form.mtask_uid">
 						<span>进行中</span>
 					</el-descriptions-item>
+					<el-descriptions-item label="作业前照片:" span=2 v-if="form.create_imgs&&form.create_imgs.length>0">
+						<el-image 
+							v-for="item in form.create_imgs_" 
+							:key="item.id"
+							:src="item.path" 
+							style="width: 100px;height: 80px;vertical-align: middle;"
+						></el-image> 
+					</el-descriptions-item>
+
 				</el-descriptions>
 			</el-card>
 			<!-- <p class="tables-title" v-if="ticketDetailState">进度流程</p>
@@ -161,22 +171,25 @@
 				</tr>
 				<tr v-if="logsData.length==0" class="noDataTr"> 无处理日志</tr>
 				<tr class="tableTr" v-for="item in logsData" :key="item.id">
-					<td class="tableTd">{{ item.state_.name }}</td>
-					<td class="tableTd attributeTd">{{ typeOptions[item.intervene_type] }}</td>
-					<td class="tableTd attributeTd">
+					<td class="tableTd" v-if="item.participant_str==null">{{ item.state_.name }}</td>
+					<td class="tableTd attributeTd" v-if="item.participant_str==null">{{ typeOptions[item.intervene_type] }}</td>
+					<td class="tableTd attributeTd" v-if="item.participant_str==null">
 						<span v-if="item.transition_attribute == 1" class="successText">同意</span>
-						<span v-else class="dangerText">拒绝</span>
+						<span v-else-if="item.transition_attribute == 2" class="successText">拒绝</span>
+						<span v-else class="dangerText"></span>
 					</td>
-					<td class="tableTd">{{ item.suggestion }}</td>
-					<td class="tableTd">
+					<td class="tableTd" v-if="item.participant_str==null">{{ item.suggestion }}</td>
+					<td class="tableTd" v-if="item.participant_str==null">
 						<span v-if="item.participant_">{{item.participant_.name}}</span>
 						<span v-if="item.participant_str">{{item.participant_str}}</span>
+						<!-- <el-image :src="item.signature" style="width: 60px"></el-image> -->
+						<!-- <img style="width:60px;vertical-align: bottom;" src="./../../../public/img/signature.jpg"> -->
 					</td>
-					<td class="tableTd">{{ item.update_time }}</td>
+					<td class="tableTd" v-if="item.participant_str==null">{{ item.update_time }}</td>
 				</tr>
 			</table>
 		</div>
-		<div class="exportBtn" @click="handleExport">导出</div>
+		
 	</el-main>
 </template>
 
@@ -419,9 +432,9 @@ td{
 	border-bottom: 1px solid #e4e7ed;
 	border-right: 1px solid #e4e7ed;
 }
-/* .exportDiv{
-	padding-top: 20px;
-} */
+.exportDiv{
+	margin-top: -30px;
+}
 .exportBtn{
     width: 120px;
     height: 40px;
@@ -431,7 +444,7 @@ td{
     background: #438af4;
     font-size: 18px;
     border-radius: 5px;
-	margin-top: 10px;
-    box-shadow: 0 0 9px 0px rgba(0,0,0,.2);
+	cursor: pointer;
+    /* box-shadow: 0 0 9px 0px rgba(0,0,0,.2); */
 }
 </style>
diff --git a/src/style/fix.scss b/src/style/fix.scss
index 336a1c03..801f4524 100644
--- a/src/style/fix.scss
+++ b/src/style/fix.scss
@@ -332,7 +332,8 @@ body .tox-tinymce-aux {
 }
 
 .el-drawer__header {
-	margin-bottom: 16px;
+	margin-bottom: 0;
+	// margin-bottom: 16px;
 }
 
 .el-drawer .el-drawer__body {
diff --git a/src/views/opm/opl.vue b/src/views/opm/opl.vue
index 6cefa9aa..75d106a9 100644
--- a/src/views/opm/opl.vue
+++ b/src/views/opm/opl.vue
@@ -86,7 +86,7 @@
         </el-table-column>
       </scTable>
     </el-card>
-    <el-drawer :size="'50%'" v-model="showLimited">
+    <el-drawer :size="'50%'" v-model="showLimited" class="scOplDrawer" :show-close="showClose" id="scOplDrawer">
       <sc-fire :id="oplId" :wfId="operationId"></sc-fire>
     </el-drawer>
   </el-main>
@@ -103,6 +103,7 @@ export default {
         save: false,
         permission: false,
       },
+      showClose:false,
       mainLoading: false,
       apiObj: [],
       query: {},
@@ -280,3 +281,11 @@ export default {
   },
 };
 </script>
+<style>
+.scOplDrawer{
+  width: 50%;
+}
+#scOplDrawer{
+  width: 50%;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/wf/ticketdetail.vue b/src/views/wf/ticketdetail.vue
index 7098431c..91aa63a2 100644
--- a/src/views/wf/ticketdetail.vue
+++ b/src/views/wf/ticketdetail.vue
@@ -309,6 +309,7 @@
 		},
 		mounted() {
 			debugger;
+			this.submitLoading = false;
 			if (this.cateType === 'visit') {
 				this.getVisit();
 			} else if (this.cateType === 'rpj') {
@@ -445,10 +446,10 @@
 					params.ticket_data.close_dos = this.form.close_dos;
 				}
 				this.$API.wf.ticket.ticketHandle.req(this.ticketId, params).then(res => {
-					this.submitLoading = false;
 					if (res.err_msg) {
 					} else {
 						this.$router.push("dutywork");
+						this.submitLoading = false;
 					}
 				}).catch(e=>{this.submitLoading=false;})
 			},