From c81a4b97b0813a7894014f74a88ac86bc72e0cb1 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Tue, 07 Jul 2026 17:52:14 +0800
Subject: [PATCH] feat:增加字段

---
 applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue                   |   18 ++++++++++++++++++
 applications/drone-command/src/views/basicManage/deviceStock/index.vue                        |    5 +++++
 applications/task-work-order/src/views/orderView/deviceInvocation/equipmentResource/index.vue |    5 +++++
 3 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue b/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
index 2240b15..897a940 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
@@ -150,6 +150,22 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
+					<el-form-item label="使用日期" prop="serviceLife">
+						<el-date-picker class="command-date-picker" popper-class="command-date-picker-popper"
+							v-model="formData.serviceLife"
+							type="date"
+							placeholder="选择日期"
+							value-format="YYYY-MM-DD HH:mm:ss"
+							clearable
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="使用年限" prop="useDate">
+						<el-input type="number" class="command-input" v-model="formData.useDate" maxlength="50" placeholder="请输入" clearable />
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
 					<el-form-item label="负责人" prop="charger">
 						<el-select class="command-select" popper-class="command-select-popper"
 							v-model="formData.charger" placeholder="请选择" :disabled="!formData.belongDept" clearable>
@@ -246,6 +262,8 @@
 	belongDept: fieldRules(true),
 	contactPhone: contactPhoneRules(true, 50),
 	charger: fieldRules(true),
+	serviceLife: fieldRules(true, 50),
+	useDate: fieldRules(true, 50),
 }
 
 const userList = ref([])
diff --git a/applications/drone-command/src/views/basicManage/deviceStock/index.vue b/applications/drone-command/src/views/basicManage/deviceStock/index.vue
index 2b49523..1758ccb 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/index.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/index.vue
@@ -91,6 +91,11 @@
 							{{ getDictLabel(row.trackStatus, trackStatusOptions) }}
 						</template>
 					</el-table-column>
+					<el-table-column prop="maintenanceStatus" show-overflow-tooltip width="96" label="维护状态">
+						<template v-slot="{ row }">
+							{{ row.maintenanceStatus === 0 ? '否' : '是' }}
+						</template>
+					</el-table-column>
 					<el-table-column label="操作" class-name="operation-btns" width="196">
 						<template v-slot="{ row }">
 							<el-link @click="handleView(row)">查看</el-link>
diff --git a/applications/task-work-order/src/views/orderView/deviceInvocation/equipmentResource/index.vue b/applications/task-work-order/src/views/orderView/deviceInvocation/equipmentResource/index.vue
index 9063627..e523bbc 100644
--- a/applications/task-work-order/src/views/orderView/deviceInvocation/equipmentResource/index.vue
+++ b/applications/task-work-order/src/views/orderView/deviceInvocation/equipmentResource/index.vue
@@ -75,6 +75,11 @@
 							{{ getDictLabel(row.modeCode, dictObj.modeCode) }}
 						</template>
 					</el-table-column>
+					<el-table-column prop="maintenanceState" show-overflow-tooltip label="保养状态">
+						<template v-slot="{ row }">
+							{{ row.maintenanceState === 0 ? '无需保养' : row.maintenanceState === 1 ? '待保养' : '正在保养' }}
+						</template>
+					</el-table-column>
 					<el-table-column prop="deviceSn" show-overflow-tooltip label="设备SN" />
 					<el-table-column show-overflow-tooltip label="设备位置" >
 						<template v-slot="{ row }">

--
Gitblit v1.9.3