From 907bc89de0152ed695edf7c29541044e19f8e8f9 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 25 九月 2024 14:29:24 +0800
Subject: [PATCH] 设备准备-领用
---
src/api/ecg/devrent/index.ts | 5 +++++
src/views/ecg/devmanage/index.vue | 1 +
src/views/ecg/doctor/components/DevInstallPanel.vue | 23 +++++++++++------------
3 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/api/ecg/devrent/index.ts b/src/api/ecg/devrent/index.ts
index 3924f0a..0411c01 100644
--- a/src/api/ecg/devrent/index.ts
+++ b/src/api/ecg/devrent/index.ts
@@ -51,6 +51,11 @@
return await request.get({ url: `/ecg/dev-rent/get-dismantle-rent`, params })
},
+ // 璁惧鍑嗗
+ devReady: async (data: DevRentVO) => {
+ return await request.post({ url: `/ecg/dev-rent/dev-ready`, data })
+ },
+
// 瑁呮満
devInstall: async (data: DevRentVO) => {
return await request.post({ url: `/ecg/dev-rent/dev-install`, data })
diff --git a/src/views/ecg/devmanage/index.vue b/src/views/ecg/devmanage/index.vue
index fe3b320..8253a0d 100644
--- a/src/views/ecg/devmanage/index.vue
+++ b/src/views/ecg/devmanage/index.vue
@@ -117,6 +117,7 @@
<el-table-column label="浣跨敤鎯呭喌" align="center" prop="lost" >
<template #default="scope">
<span v-if="scope.row.state === 0">绌洪棽</span>
+ <span v-if="scope.row.state === 5">宸查鐢�</span>
<span v-if="scope.row.state === 10">浣跨敤涓�</span>
<span v-if="scope.row.state === 20">宸查仐澶�</span>
</template>
diff --git a/src/views/ecg/doctor/components/DevInstallPanel.vue b/src/views/ecg/doctor/components/DevInstallPanel.vue
index 9a70bf5..bc456fc 100644
--- a/src/views/ecg/doctor/components/DevInstallPanel.vue
+++ b/src/views/ecg/doctor/components/DevInstallPanel.vue
@@ -25,19 +25,18 @@
<el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
</el-form>
- <el-button @click="submitForm" type="primary" :disabled="formLoading">瑁呮満瀹屾垚</el-button>
+ <el-button @click="submitForm" type="primary" :disabled="formLoading">棰嗙敤瀹屾垚</el-button>
<el-button @click="resetForm()">閲� 缃�</el-button>
<el-button @click="printBill()">鎵撳嵃灏忕エ</el-button>
<el-button @click="cancelInstall" :disabled="formLoading">鏀惧純瑁呮満</el-button>
-
<!-- 鍖荤敓瑁呮満鍒楄〃 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" @row-click="onRowClick" >
<el-table-column label="id" align="center" prop="id" />
- <el-table-column label="瑁呮満鎯呭喌" align="center" prop="cancelled" >
+ <el-table-column label="棰嗙敤鎯呭喌" align="center" prop="cancelled" >
<template #default="scope">
- <span v-if="scope.row.jobType === 10">"宸茶鏈�"</span>
+ <span v-if="scope.row.jobType === 5">"宸查鐢�"</span>
<span v-if="scope.row.jobType === 30">"宸叉斁寮�"</span>
</template>
</el-table-column>
@@ -111,7 +110,7 @@
/** 瑁呮満鎷嗘満 琛ㄥ崟 */
defineComponent({ name: 'DevInstallPanel' })
-const emit = defineEmits(['success']) // 瀹氫箟 success 浜嬩欢锛岀敤浜庢搷浣滄垚鍔熷悗鐨勫洖璋�
+const emit = defineEmits(['success-ready']) // 瀹氫箟 success 浜嬩欢锛岀敤浜庢搷浣滄垚鍔熷悗鐨勫洖璋�
const { t } = useI18n() // 鍥介檯鍖�
const message = useMessage() // 娑堟伅寮圭獥
@@ -165,16 +164,16 @@
try {
const data = formData.value as unknown as DevRentVO
if (formData.value.id === null || formData.value.id === undefined) {
- const result = await DevRentApi.devInstall(data)
+ const result = await DevRentApi.devReady(data)
formData.value.id = result
- message.success(t('鏂板缓鎴愬姛'))
+ message.success(t('鎿嶄綔瀹屾垚'))
} else {
- await DevRentApi.devInstall(data)
- message.success(t('鏇存柊鎴愬姛'))
+ await DevRentApi.devReady(data)
+ message.success(t('鏇存柊瀹屾垚'))
}
dialogVisible.value = false
// 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
- emit('success')
+ emit('success-ready')
resetForm()
getList()
} finally {
@@ -193,7 +192,7 @@
message.success(t('鎿嶄綔鎴愬姛'))
}
// 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
- emit('success')
+ emit('success-ready')
resetForm()
getList()
}
@@ -232,7 +231,7 @@
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
- jobType: [10, 30],
+ jobType: [5, 30],
docId: undefined,
docName: undefined,
devId: undefined,
--
Gitblit v1.9.3