From 34ac0b016bb7abc5bef68c6a521a3cec0479651c Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Fri, 14 Oct 2022 17:08:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=EF=BC=9A=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E7=94=B3=E8=AF=B7-=E8=83=BD=E5=8A=9B=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=BF=87=E6=9C=9F?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../personalCenter/components/MyApply.vue      | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue
index 2b593d2f..508e8bd2 100644
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/front/src/views/personalCenter/components/MyApply.vue
@@ -48,7 +48,8 @@
           </div>
           <div class="content-body-bottom">
             <div>申请日期：{{ item.createDate || item.startTime }}</div>
-            <div></div>
+            <!-- 西海岸--增加过期时间显示 -->
+            <div v-if="isXiHaiAn">过期时间：{{ item.expireDate || '' }}</div>
           </div>
           <div class="button-box">
             <div class="button" v-if="typeName == '设备申请' && phoneSate.includes(item.state)"
@@ -86,8 +87,10 @@
       </div>
     </div>
     <a-empty v-else />
-    <a-modal bodyStyle="padding:0.1rem 0" v-model:visible="detailsVisible" title="申请详情" style="width: 900px"
-      :footer="null" destroyOnClose="true" :maskClosable="false">
+    <!-- :title="detailModalTitle" -->
+    <a-modal bodyStyle="padding:0.1rem 0" v-model:visible="detailsVisible"
+      style="width: 900px" :footer="null" destroyOnClose="true" :maskClosable="false">
+      <template v-slot:title>{{detailModalTitle}}</template>
       <apply-details :processDefinitionName="processDefinitionName" :businessKey="businessKey"
         :processInstanceId="processInstanceId" :resourceId="resourceId" :refObj="refObj" :showType="showType">
       </apply-details>
@@ -237,9 +240,17 @@ function changeApplyState(item, index) {
   }
 }
 
+const cilckRowData = ref({})
+let detailModalTitle = '申请详情';
 const showDetail = (item) => {
+  cilckRowData.value = item;
   // 西海岸-申请时间过期，提示
   if (isXiHaiAn) {
+    // 西海岸、单兵无人机设备
+    if (item.tbDeviceDTO) {
+      detailModalTitle = item.tbDeviceDTO.name ? item.tbDeviceDTO.name + '申请详情' : '申请详情'
+    }
+    console.log('detailModalTitle------------>', detailModalTitle);
     if (item.expireDate) {
       let diff = moment().diff(moment(item.expireDate), 'seconds')
       if (diff > 0) {
@@ -251,7 +262,6 @@ const showDetail = (item) => {
     getByApplyFlag(item.applyFlag).then((res) => {
       if (res.data.code == 0) {
         refObj.value = res.data.data
-
         detailsVisible.value = true
         processDefinitionName.value = item.processDefinitionName
         businessKey.value = item.businessKey