From 9ca3e64f571c38aeae3f649efdfa2f5339019805 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 25 三月 2026 13:39:28 +0800
Subject: [PATCH] feat(设备管理): 新增设备编号和转数字段
---
src/views/productionManagement/productionProcess/index.vue | 4 +++-
src/views/equipmentManagement/ledger/index.vue | 8 ++++++++
src/views/equipmentManagement/ledger/Form.vue | 20 ++++++++++++++++++--
3 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/src/views/equipmentManagement/ledger/Form.vue b/src/views/equipmentManagement/ledger/Form.vue
index 72d594e..e7ca39d 100644
--- a/src/views/equipmentManagement/ledger/Form.vue
+++ b/src/views/equipmentManagement/ledger/Form.vue
@@ -2,6 +2,11 @@
<el-form :model="form" label-width="120px" :rules="formRules" ref="formRef">
<el-row :gutter="20">
<el-col :span="12">
+ <el-form-item label="璁惧缂栧彿" prop="deviceCode">
+ <el-input v-model="form.deviceCode" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="璁惧鍚嶇О" prop="deviceName">
<el-input v-model="form.deviceName" placeholder="璇疯緭鍏ヨ澶囧悕绉�" />
</el-form-item>
@@ -40,6 +45,14 @@
<el-col :span="12">
<el-form-item label="渚涘簲鍟�" prop="supplierName">
<el-input v-model="form.supplierName" placeholder="璇疯緭鍏ヤ緵搴斿晢" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="杞暟(杞�/min)" prop="rpm">
+ <el-input-number :min="0" style="width: 100%"
+ v-model="form.rpm"
+ placeholder="璇疯緭鍏ヨ浆鏁�"
+ />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -147,8 +160,8 @@
/>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="棰勮杩愯鏃堕棿" prop="planRuntimeTime">
+ <el-col :span="12">
+ <el-form-item label="棰勮杩愯鏃堕棿" prop="planRuntimeTime">
<el-date-picker
style="width: 100%"
v-model="form.planRuntimeTime"
@@ -190,6 +203,7 @@
'鍏朵粬璁惧'
]);
const formRules = {
+ deviceCode: [{ required: true, trigger: "blur", message: "璇疯緭鍏ヨ澶囩紪鍙�" }],
deviceName: [{ required: true, trigger: "blur", message: "璇疯緭鍏�" }],
deviceModel: [{ required: true, trigger: "blur", message: "璇疯緭鍏�" }],
type: [{ required: true, trigger: "change", message: "璇烽�夋嫨鎴栬緭鍏ヨ澶囩被鍨�" }],
@@ -214,6 +228,7 @@
}
const { form, resetForm } = useFormData({
+ deviceCode: undefined, // 璁惧缂栧彿
deviceName: undefined, // 璁惧鍚嶇О
deviceModel: undefined, // 瑙勬牸鍨嬪彿
deviceBrand: undefined, // 璁惧鍝佺墝
@@ -239,6 +254,7 @@
}
const { code, data } = await getLedgerById(id);
if (code == 200) {
+ form.deviceCode = data.deviceCode;
form.deviceName = data.deviceName;
form.deviceModel = data.deviceModel;
form.deviceBrand = data.deviceBrand;
diff --git a/src/views/equipmentManagement/ledger/index.vue b/src/views/equipmentManagement/ledger/index.vue
index 62f0c6a..50e12f0 100644
--- a/src/views/equipmentManagement/ledger/index.vue
+++ b/src/views/equipmentManagement/ledger/index.vue
@@ -122,6 +122,10 @@
},
[
{
+ label: "璁惧缂栧彿",
+ prop: "deviceCode",
+ },
+ {
label: "璁惧鍚嶇О",
prop: "deviceName",
},
@@ -142,6 +146,10 @@
prop: "supplierName",
},
{
+ label: "杞暟(杞�/min)",
+ prop: "rpm",
+ },
+ {
label: "瀛樻斁浣嶇疆",
prop: "storageLocation",
},
diff --git a/src/views/productionManagement/productionProcess/index.vue b/src/views/productionManagement/productionProcess/index.vue
index 5bf92e4..a2d5572 100644
--- a/src/views/productionManagement/productionProcess/index.vue
+++ b/src/views/productionManagement/productionProcess/index.vue
@@ -223,7 +223,7 @@
width: 350,
operation: [
{
- name: "鏌ョ湅",
+ name: "鐢熶骇鍙傛暟",
type: "text",
clickFun: row => {
showProcessParamModal(row);
@@ -293,6 +293,7 @@
// 璁惧鍒楄〃鍒楅厤缃�
const deviceColumns = ref([
+ { label: "璁惧缂栧彿", prop: "deviceCode" },
{ label: "璁惧鍚嶇О", prop: "deviceName" },
{ label: "瑙勬牸鍨嬪彿", prop: "deviceModel" },
{ label: "璁惧鍝佺墝", prop: "deviceBrand" },
@@ -318,6 +319,7 @@
// 鍙�夎澶囧垪琛ㄥ垪閰嶇疆
const selectDeviceColumns = ref([
+ { label: "璁惧缂栧彿", prop: "deviceCode" },
{ label: "璁惧鍚嶇О", prop: "deviceName" },
{ label: "瑙勬牸鍨嬪彿", prop: "deviceModel" },
{ label: "璁惧鍝佺墝", prop: "deviceBrand" },
--
Gitblit v1.9.3