From b2e8e233d59d107615a8336dce9da36f1f8bcde0 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 03 十二月 2024 16:46:47 +0800
Subject: [PATCH] ll

---
 admin/src/views/Inspection/components/taskDetail.vue |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/admin/src/views/Inspection/components/taskDetail.vue b/admin/src/views/Inspection/components/taskDetail.vue
index 79fd9ca..54b30a5 100644
--- a/admin/src/views/Inspection/components/taskDetail.vue
+++ b/admin/src/views/Inspection/components/taskDetail.vue
@@ -1,6 +1,6 @@
 <template>
   <GlobalWindow title="宸℃浠诲姟璇︽儏" :showConfirm="false" :visible.sync="isShowModal">
-    <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" />
+    <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getDetail(1)" @clear="clear" />
     <el-table v-loading="loading" :data="list" stripe>
       <el-table-column prop="pointName" label="宸℃鐐瑰悕绉�" min-width="100" show-overflow-tooltip />
       <el-table-column prop="" label="鐘舵��" min-width="100" show-overflow-tooltip>
@@ -9,7 +9,7 @@
           <span v-if="row.status == 1">宸插贰妫�</span>
         </template>
       </el-table-column>
-      <el-table-column prop="editor" label="宸℃浜�" min-width="100" show-overflow-tooltip />
+      <el-table-column prop="realname" label="宸℃浜�" min-width="100" show-overflow-tooltip />
       <el-table-column prop="editDate" label="宸℃鏃堕棿" min-width="100" show-overflow-tooltip />
       <el-table-column prop="" label="宸℃缁撴灉" min-width="100" show-overflow-tooltip>
         <template v-slot="{ row }">
@@ -30,6 +30,7 @@
 import QueryForm from '@/components/common/QueryForm'
 import Pagination from '@/components/common/Pagination'
 import { getDetail } from '@/api/Inspection/ywPatrolTask'
+import dayjs from 'dayjs'
 export default {
   components: { GlobalWindow, QueryForm, Pagination },
   data() {
@@ -41,6 +42,7 @@
         page: 1,
         total: 0
       },
+      loading:false,
       filters: {},
       list: [],
       total: 0,
@@ -82,11 +84,11 @@
         this.loading = false
         this.list = res.records || []
         this.pagination.total = res.total
-        this.list.forEach(item => {
-          item.inTypeTemp = item.inType == 0 ? '鏁存墭鐩�' : '浠剁儫'
-          item.taskOrigin = 'WMS鑾峰彇'
-          item.workTime = dayjs.duration(item.param3, 'seconds').format('H鏃秏鍒唖绉�')
-        })
+        // this.list.forEach(item => {
+        //   item.inTypeTemp = item.inType == 0 ? '鏁存墭鐩�' : '浠剁儫'
+        //   item.taskOrigin = 'WMS鑾峰彇'
+        //   item.workTime = dayjs.duration(item.param3, 'seconds').format('H鏃秏鍒唖绉�')
+        // })
         this.pagination.total = res.total || 0
       }, () => {
         this.loading = false

--
Gitblit v1.9.3