From 34c72cf67f65ea481c9355a2edbb9835b2a3bdac Mon Sep 17 00:00:00 2001
From: chenze <1824191732@qq.com>
Date: Fri, 30 Aug 2024 01:14:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=AF=B9=E5=BA=94bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/RepairList.vue               | 10 ++++++----
 src/views/admin/RepairView.vue               | 13 +++++--------
 src/views/admin/modules/RepairModal.vue      |  8 ++++++--
 src/views/admin/repair/MeesageNoticeList.vue | 18 +-----------------
 4 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/src/views/admin/RepairList.vue b/src/views/admin/RepairList.vue
index 6891ad5..fa78bbf 100644
--- a/src/views/admin/RepairList.vue
+++ b/src/views/admin/RepairList.vue
@@ -203,13 +203,13 @@ export default {
       }
       ],
       evalOptions: [{
-        value: '1',
+        value: 1,
         label: '好评'
       }, {
-        value: '2',
+        value: 2,
         label: '中评'
       }, {
-        value: '3',
+        value: 3,
         label: '差评'
       }
       ],
@@ -314,7 +314,9 @@ export default {
   },
   created () {
     console.log('this.$route.query', this.$route.query.evalService)
-    this.queryParam.evalService = this.$route.query.evalService
+    if (this.$route.query.evalService != null) {
+      this.queryParam.evalService = this.$route.query.evalService
+    }
     this.queryParam.timeout = this.$route.query.timeout
     this.selectRepairList()
     this.selectType()
diff --git a/src/views/admin/RepairView.vue b/src/views/admin/RepairView.vue
index 15f6b84..da06d1f 100644
--- a/src/views/admin/RepairView.vue
+++ b/src/views/admin/RepairView.vue
@@ -75,22 +75,19 @@
     <a-card style="margin-top: 10px" :bordered="false" title="报修信息">
       <a-descriptions>
         <a-descriptions-item label="维修单号">{{ mdl.sn }}</a-descriptions-item>
-        <a-descriptions-item label="工单名称">{{ mdl.repairName }}</a-descriptions-item>
         <a-descriptions-item label="设备类型">{{ mdl.typeName }}</a-descriptions-item>
         <a-descriptions-item label="设备名称">{{ mdl.deviceName }}</a-descriptions-item>
         <a-descriptions-item label="发起人">{{ mdl.name }}</a-descriptions-item>
         <a-descriptions-item label="电话">{{ mdl.phone }}</a-descriptions-item>
         <a-descriptions-item label="故障等级">{{ mdl.repairLevel }}</a-descriptions-item>
         <a-descriptions-item label="故障类型">{{ mdl.failureTypeName }}</a-descriptions-item>
-        <a-descriptions-item label="故障等级">{{ mdl.repairLevel }}</a-descriptions-item>
-        <a-descriptions-item label="故障地点">{{ mdl.repairLevel }}</a-descriptions-item>
-        <a-descriptions-item label="门牌号">{{ mdl.repairLevel }}</a-descriptions-item>
-        <a-descriptions-item label="派单员">{{ mdl.repairLevel }}</a-descriptions-item>
-        <a-descriptions-item label="维修人">{{ mdl.repairUserId }}</a-descriptions-item>
-        <a-descriptions-item label="故障时间">{{ mdl.repairTime }}</a-descriptions-item>
+        <a-descriptions-item label="报修地点">{{ mdl.address }}</a-descriptions-item>
+        <a-descriptions-item label="楼层">{{ mdl.floor }}</a-descriptions-item>
+        <a-descriptions-item label="门牌号">{{ mdl.room }}</a-descriptions-item>
+        <a-descriptions-item label="派单员">{{ mdl.perUserName }}</a-descriptions-item>
+        <a-descriptions-item label="维修人">{{ mdl.repairUserName }}</a-descriptions-item>
         <a-descriptions-item label="报修时间">{{ mdl.createTime }}</a-descriptions-item>
         <a-descriptions-item label="状态">{{ mdl.statusName }}</a-descriptions-item>
-        <a-descriptions-item label="完成时间">{{ mdl.endDate }}</a-descriptions-item>
       </a-descriptions>
     </a-card>
     <a-card style="margin-top: 10px" :bordered="false" title="维修信息">
diff --git a/src/views/admin/modules/RepairModal.vue b/src/views/admin/modules/RepairModal.vue
index cdf9103..67960f6 100644
--- a/src/views/admin/modules/RepairModal.vue
+++ b/src/views/admin/modules/RepairModal.vue
@@ -282,8 +282,12 @@ export default {
       this.edit({ id: 0 })
     },
     edit (record) {
-      this.selectDevice(record.typeId)
-      this.selectRoomList(record.addressId)
+      console.log(record)
+      if (record.id !== 0) {
+        this.selectDevice(record.typeId)
+        this.selectRoomList(record.addressId)
+      }
+
       this.mdl = Object.assign(record)
       this.mdl.typeList = this.typeList
 
diff --git a/src/views/admin/repair/MeesageNoticeList.vue b/src/views/admin/repair/MeesageNoticeList.vue
index 4a6ca68..c9f030f 100644
--- a/src/views/admin/repair/MeesageNoticeList.vue
+++ b/src/views/admin/repair/MeesageNoticeList.vue
@@ -1,22 +1,6 @@
 <template>
   <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="48">
-          <a-col :md="5" :sm="15">
-            <a-form-item label="报修单号">
-              <a-input placeholder="请输入报修单号" v-model="queryParam.sn" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <span class="table-page-search-submitButtons">
-              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-              <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+
     <a-tabs :active-key="tabKey" @change="callback">
       <a-tab-pane key="1" tab="全部信息">
         <a-table