From b34e7d50bc009025d071725dcdb236f723f67e6e Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 20 九月 2024 11:09:03 +0800
Subject: [PATCH] 诊间屏 完善
---
src/views/ecg/doctor/DevDismantle.vue | 142 +++++++++++++++++++++++++++++------------------
1 files changed, 87 insertions(+), 55 deletions(-)
diff --git a/src/views/ecg/doctor/DevDismantle.vue b/src/views/ecg/doctor/DevDismantle.vue
index 090a5a6..42d52c2 100644
--- a/src/views/ecg/doctor/DevDismantle.vue
+++ b/src/views/ecg/doctor/DevDismantle.vue
@@ -6,53 +6,65 @@
label-width="100px"
v-loading="formLoading"
>
- <el-form-item label="璁惧缂栧彿" prop="devId">
- <el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="searchRentInfo"/>
- </el-form-item>
- <el-form-item label="鎮ｈ�呯紪鍙�" prop="patId">
- <el-input v-model="formData.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" />
- </el-form-item>
- <el-form-item label="鎮ｈ�呭悕绉�" prop="patName">
- <el-input v-model="formData.patName" placeholder="璇疯緭鍏ユ偅鑰呭悕绉�" />
- </el-form-item>
- <el-form-item label="瑁呮満鏃堕棿" prop="rentTime">
- <el-date-picker
- v-model="formData.rentTime"
- type="date"
- value-format="x"
- placeholder="閫夋嫨瑁呮満鏃堕棿"
- />
- </el-form-item>
- <el-form-item label="鎷嗘満鏃堕棿" prop="returnTime">
- <el-date-picker
- v-model="formData.returnTime"
- type="date"
- value-format="x"
- placeholder="閫夋嫨鎷嗘満鏃堕棿"
- />
- </el-form-item>
- <el-form-item label="骞叉壈鏁�" prop="interference">
- <el-input v-model="formData.interference" placeholder="璇疯緭鍏ュ共鎵版暟" />
- </el-form-item>
- <el-form-item label="鍩虹嚎绮�" prop="baseline">
- <el-input v-model="formData.baseline" placeholder="璇疯緭鍏ュ熀绾跨矖" />
- </el-form-item>
- <el-form-item label="鑴辩" prop="detachment">
- <el-input v-model="formData.detachment" placeholder="璇疯緭鍏ヨ劚绂�" />
- </el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" />
- </el-form-item>
+ <el-row :gutter="20">
+ <el-col :span="12">
+ <el-form-item label="璁惧缂栧彿" prop="devId">
+ <el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="searchRentInfo" />
+ </el-form-item>
+ <el-form-item label="鎮ｈ�呯紪鍙�" prop="patId">
+ <el-input v-model="formData.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" @input="searchRentInfo" />
+ </el-form-item>
+ <el-form-item label="鎮ｈ�呭悕绉�" prop="patName">
+ <el-input v-model="formData.patName" placeholder="璇疯緭鍏ユ偅鑰呭悕绉�" />
+ </el-form-item>
+ <el-form-item label="骞叉壈鏁�" prop="interference">
+ <el-input v-model="formData.interference" placeholder="璇疯緭鍏ュ共鎵版暟" />
+ </el-form-item>
+ <el-form-item label="鑴辩" prop="detachment">
+ <el-input v-model="formData.detachment" placeholder="璇疯緭鍏ヨ劚绂�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="瑁呮満鏃堕棿" prop="rentTime">
+ <el-date-picker
+ v-model="formData.rentTime"
+ type="date"
+ value-format="x"
+ placeholder="閫夋嫨瑁呮満鏃堕棿"
+ />
+ </el-form-item>
+ <el-form-item label="鎷嗘満鏃堕棿" prop="returnTime">
+ <el-date-picker
+ v-model="formData.returnTime"
+ type="date"
+ value-format="x"
+ placeholder="閫夋嫨鎷嗘満鏃堕棿"
+ />
+ </el-form-item>
+ <el-form-item label="鍩虹嚎绮�" prop="baseline">
+ <el-input v-model="formData.baseline" placeholder="璇疯緭鍏ュ熀绾跨矖" />
+ </el-form-item>
+ <el-form-item label="澶囨敞" prop="remark">
+ <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
<el-button @click="submitForm" type="primary" :disabled="formLoading">鎷嗘満瀹屾垚</el-button>
- <el-button @click="resetForm()">閲嶇疆</el-button>
+ <el-button @click="resetForm()">閲� 缃�</el-button>
+ <el-button @click="loseDismantle" :disabled="formLoading">閬� 澶�</el-button>
<!-- 鍖荤敓鎷嗘満鍒楄〃 -->
<ContentWrap>
- <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" @current-change="onCurChange" >
+ <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="jobType" />
- <el-table-column label="鍖荤敓缂栧彿" align="center" prop="docId" />
+ <el-table-column label="鎷嗘満鎯呭喌" align="center" prop="lost" >
+ <template #default="scope">
+ {{scope.row.lost == 1 ? "閬楀け" : "瀹屾垚"}}
+ </template>
+ </el-table-column>
+<!-- <el-table-column label="浣滀笟绫诲瀷" align="center" prop="jobType" />-->
+<!-- <el-table-column label="鍖荤敓缂栧彿" align="center" prop="docId" />-->
<el-table-column label="鍖荤敓鍚嶇О" align="center" prop="docName" />
<el-table-column label="璁惧缂栧彿" align="center" prop="devId" />
<el-table-column label="鎮ｈ�呯紪鍙�" align="center" prop="patId" />
@@ -139,8 +151,8 @@
remark: undefined
})
const formRules = reactive({
- devId: [{ required: true, message: '璁惧缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }],
- returnTime: [{ required: true, message: '璇烽�夋嫨瑁呮満鏃ユ湡', trigger: 'blur' }],
+ // devId: [{ required: true, message: '璁惧缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }],
+ returnTime: [{ required: true, message: '璇烽�夋嫨鎷嗘満鏃ユ湡', trigger: 'blur' }],
})
const formRef = ref() // 琛ㄥ崟 Ref
@@ -154,6 +166,26 @@
const data = formData.value as unknown as DevRentVO
//await DevRentApi.updateDevRent(data)
await DevRentApi.devDismantle(data)
+ message.success(t('鎿嶄綔鎴愬姛'))
+ dialogVisible.value = false
+ // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
+ emit('success')
+ resetForm()
+ getList()
+ } finally {
+ formLoading.value = false
+ }
+}
+
+// 閬楀け鎿嶄綔
+const loseDismantle = async () => {
+ // 鏍￠獙琛ㄥ崟
+ await formRef.value.validate()
+ // 鎻愪氦璇锋眰
+ formLoading.value = true
+ try {
+ const data = formData.value as unknown as DevRentVO
+ await DevRentApi.devLose(data)
message.success(t('鎿嶄綔鎴愬姛'))
dialogVisible.value = false
// 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
@@ -183,19 +215,16 @@
}
const searchRentInfo = async () => {
- const data = await DevRentApi.getLatestRent(formData.value.devId)
+ const data = await DevRentApi.getLatestRent(formData.value)
console.info( data )
+ if (null === data)
+ return
+
+ formData.value = data
if (data.returnTime === null)
data.returnTime = new Date().getTime()
-
- if (null != data) {
- formData.value = data
- }
}
-const getSelectedRent = async (rentId) => {
- formData.value = await DevRentApi.getDevRent(rentId)
-}
const loading = ref(true) // 鍒楄〃鐨勫姞杞戒腑
const list = ref<JobRecordVO[]>([]) // 鍒楄〃鐨勬暟鎹�
@@ -226,10 +255,13 @@
}
}
-const onCurChange = (cur) => {
- console.log( cur )
- console.log( cur.rentId)
- getSelectedRent( cur.rentId )
+const onRowClick = (cur) => {
+ if (cur !== null)
+ getSelectedRent( cur.rentId )
+}
+
+const getSelectedRent = async (rentId) => {
+ formData.value = await DevRentApi.getDevRent(rentId)
}
/** 鍒濆鍖� **/
--
Gitblit v1.9.3