From 3a56a133d4e06a75632ffd171ce5b125c9d51b72 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 24 九月 2024 14:37:32 +0800
Subject: [PATCH] 装机&放弃 逻辑新增state

---
 src/views/ecg/doctor/DevDismantle.vue               |    2 +-
 src/api/ecg/devrent/index.ts                        |    4 ++--
 src/views/ecg/doctor/components/DevInstallPanel.vue |    6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/api/ecg/devrent/index.ts b/src/api/ecg/devrent/index.ts
index fd188c1..3924f0a 100644
--- a/src/api/ecg/devrent/index.ts
+++ b/src/api/ecg/devrent/index.ts
@@ -47,8 +47,8 @@
   },
 
   // 鑾峰彇鎮h�呰澶囨渶杩戠殑绉熻祦
-  getLatestRent: async (params: any) => {
-    return await request.get({ url: `/ecg/dev-rent/get-latest-rent`, params })
+  getDismantleRent: async (params: any) => {
+    return await request.get({ url: `/ecg/dev-rent/get-dismantle-rent`, params })
   },
 
   // 瑁呮満
diff --git a/src/views/ecg/doctor/DevDismantle.vue b/src/views/ecg/doctor/DevDismantle.vue
index 351e45c..db8c5f4 100644
--- a/src/views/ecg/doctor/DevDismantle.vue
+++ b/src/views/ecg/doctor/DevDismantle.vue
@@ -228,7 +228,7 @@
 }
 
 const getRentInfo = async () => {
-  const data = await DevRentApi.getLatestRent(formData.value)
+  const data = await DevRentApi.getDismantleRent(formData.value)
   if (null === data)
     return
 
diff --git a/src/views/ecg/doctor/components/DevInstallPanel.vue b/src/views/ecg/doctor/components/DevInstallPanel.vue
index d6bfecb..7361809 100644
--- a/src/views/ecg/doctor/components/DevInstallPanel.vue
+++ b/src/views/ecg/doctor/components/DevInstallPanel.vue
@@ -37,7 +37,8 @@
       <el-table-column label="id" align="center" prop="id" />
       <el-table-column label="瑁呮満鎯呭喌" align="center" prop="cancelled" >
         <template #default="scope">
-          {{scope.row.cancelled == 1 ? "鏀惧純" : "瀹屾垚"}}
+          <span v-if="scope.row.jobType === 10">"宸茶鏈�"</span>
+          <span v-if="scope.row.jobType === 30">"宸叉斁寮�"</span>
         </template>
       </el-table-column>
 <!--      <el-table-column label="浣滀笟绫诲瀷" align="center" prop="jobType" />-->
@@ -226,7 +227,7 @@
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  jobType: 0,
+  jobType: [10, 30],
   docId: undefined,
   docName: undefined,
   devId: undefined,
@@ -237,6 +238,7 @@
   remark: undefined,
   createTime: []
 })
+
 /** 鏌ヨ鍒楄〃 */
 const getList = async () => {
   loading.value = true

--
Gitblit v1.9.3