2 İşlemeler cb40dbab5b ... fcd023af83

Yazar SHA1 Mesaj Tarih
  闪电 fcd023af83 Merge branch 'master' of http://39.164.159.226:3000/hnsh-smart-steward/smart-steward-mobile 2 gün önce
  闪电 6083575378 fix: 详情 2 gün önce

+ 5 - 3
src/components/AttachmentList.vue

@@ -37,7 +37,7 @@ function getFileName(url: string, index: number): string {
37 37
  * @returns 是否为图片
38 38
  */
39 39
 function isImage(fileName: string): boolean {
40
-  const extension = fileName.split('.').pop()?.toLowerCase()
40
+  const extension = fileName.split('.').pop()?.toLowerCase().split('?')[0]
41 41
   return extension ? imageExtensions.includes(extension) : false
42 42
 }
43 43
 
@@ -172,9 +172,11 @@ function handleFileDownload(url: string, fileName: string) {
172 172
   border-radius: 12rpx;
173 173
   overflow: hidden;
174 174
   box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
175
-  transition: transform 0.3s, box-shadow 0.3s;
175
+  transition:
176
+    transform 0.3s,
177
+    box-shadow 0.3s;
176 178
   flex-shrink: 0;
177
-  
179
+
178 180
   &:hover {
179 181
     transform: translateY(-4rpx);
180 182
     box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.15);

src/pages/schedule/details/deal/index2.vue → src/pages/schedule/details/deal/tank-water.vue


+ 17 - 6
src/pages/schedule/details/index.vue

@@ -53,6 +53,7 @@ async function dealConfirmTaskEvent() {
53 53
   wotMessage.confirm({
54 54
     msg: `确认完成任务 ${taskInfo.value.taskName} 吗?`,
55 55
     title: '确认完成',
56
+    zIndex: 101,
56 57
   }).then(async () => {
57 58
     try {
58 59
       await confirmDoneTask(taskInfo.value.id || 0)
@@ -235,6 +236,7 @@ const buttons = ref({
235 236
   deal: false,
236 237
   transfer: false,
237 238
   close: false,
239
+  details: false,
238 240
 })
239 241
 
240 242
 async function init() {
@@ -270,6 +272,9 @@ async function init() {
270 272
       }
271 273
     }
272 274
   }
275
+  else if (taskInfo.value.status === 3 && ['check', 'form'].includes(taskInfo.value.formType)) {
276
+    buttons.value.details = true
277
+  }
273 278
 
274 279
   // 假设从接口返回数据中获取taskOther和taskResult
275 280
   taskOther.value.taskTypeName = taskInfo.value?.formTypeName || '-'
@@ -499,7 +504,7 @@ onMounted(async () => {
499 504
             任务类型
500 505
           </view>
501 506
           <view class="guide-value">
502
-            {{ taskInfo.subFormTypeName || taskOther.taskTypeName || '-' }}
507
+            {{ taskInfo.taskTypeName || '-' }}
503 508
           </view>
504 509
         </view>
505 510
         <view class="guide-item">
@@ -563,19 +568,26 @@ onMounted(async () => {
563 568
             {{ taskInfo.completeTime || taskInfo.cancelTime || '-' }}
564 569
           </view>
565 570
         </view>
566
-        <view v-if="taskResult.files && taskResult.files.length > 0" class="guide-item attachment-guide-item">
571
+        <view v-if="taskInfo.attachmentsUrl && taskInfo.attachmentsUrl.length > 0" class="guide-item attachment-guide-item">
567 572
           <view class="guide-label">
568 573
             处理附件
569 574
           </view>
570 575
           <view class="guide-value">
571 576
             <!-- 使用附件列表组件显示附件 -->
572 577
             <AttachmentList
573
-              :files="taskResult.files"
574
-              :file-names="taskResult.fileNames"
578
+              :files="taskInfo.attachmentsUrl"
575 579
               :size="30"
576 580
             />
577 581
           </view>
578 582
         </view>
583
+        <view v-if="taskInfo.handleContent" class="guide-item">
584
+          <view class="guide-label">
585
+            处理结果
586
+          </view>
587
+          <view class="guide-value">
588
+            {{ taskInfo.handleContent || '-' }}
589
+          </view>
590
+        </view>
579 591
       </view>
580 592
     </view>
581 593
 
@@ -632,9 +644,8 @@ onMounted(async () => {
632 644
     </view>
633 645
 
634 646
     <!-- 查看详情按钮 -->
635
-    <view class="view-detail-container">
647
+    <view v-if="buttons.details" class="view-detail-container">
636 648
       <wd-button
637
-        v-if="[3].includes(taskInfo.status)"
638 649
         type="primary"
639 650
         class="view-detail-btn"
640 651
         @click="goDetail"