From 5f694550ed7bf0f6147c66feaa4406034ae62e54 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Tue, 11 Aug 2026 19:06:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 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..e835248 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
@@ -45,6 +45,14 @@
<div class="val">{{ formData.belongDeptName }}</div>
</el-col>
<el-col :span="12">
+ <div class="label">开始使用日期</div>
+ <div class="val">{{ formData.useDate }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div class="label">使用年限</div>
+ <div class="val">{{ formData.serviceLife }}</div>
+ </el-col>
+ <el-col :span="12">
<div class="label">负责人</div>
<div class="val">{{ formData.charger }}</div>
</el-col>
@@ -80,7 +88,7 @@
</div>
</div>
- <el-form class="dialog-form" v-else ref="formRef" :model="formData" :rules="rules" label-width="100px">
+ <el-form class="dialog-form" v-else ref="formRef" :model="formData" :rules="rules" label-width="120px">
<el-row>
<el-col :span="12">
<el-form-item label="设备名称" prop="deviceName">
@@ -147,6 +155,33 @@
<el-tree-select class="command-select" popper-class="command-tree-select-popper"
v-model="formData.belongDept" node-key="id" :data="deptTree" :props="treeProps"
check-strictly @change="belongDeptChange" clearable />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="开始使用日期" prop="useDate">
+ <el-date-picker class="command-date-picker" popper-class="command-date-picker-popper"
+ v-model="formData.useDate"
+ type="date"
+ placeholder="选择日期"
+ value-format="YYYY-MM-DD"
+ clearable
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="使用年限" prop="serviceLife">
+ <el-input-number
+ class="command-input"
+ v-model="formData.serviceLife"
+ :min="0"
+ :max="100"
+ :precision="0"
+ :step="1"
+ step-strictly
+ :controls="false"
+ placeholder="请输入"
+ @keydown="e => ['.', 'e', 'E', '+', '-'].includes(e.key) && e.preventDefault()"
+ />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -246,6 +281,8 @@
belongDept: fieldRules(true),
contactPhone: contactPhoneRules(true, 50),
charger: fieldRules(true),
+ serviceLife: fieldRules(true),
+ useDate: fieldRules(true),
}
const userList = ref([])
--
Gitblit v1.9.3