From f19238b6f581414fc1a414d3329440ac47fbb1e8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 18 五月 2026 17:44:33 +0800
Subject: [PATCH] Merge branch 'dev_河南_鹤壁天沐玻璃厂' of http://114.132.189.42:9002/r/product-inventory-management into dev_河南_鹤壁天沐玻璃厂
---
src/views/equipmentManagement/upkeep/index.vue | 4 ++--
src/views/equipmentManagement/upkeep/Form/UpkeepDetailModal.vue | 2 +-
src/views/equipmentManagement/upkeep/Form/PlanModal.vue | 11 ++++++-----
src/views/equipmentManagement/upkeep/Form/formDia.vue | 6 +++---
4 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/views/equipmentManagement/upkeep/Form/PlanModal.vue b/src/views/equipmentManagement/upkeep/Form/PlanModal.vue
index 6aa9f89..35c8c0e 100644
--- a/src/views/equipmentManagement/upkeep/Form/PlanModal.vue
+++ b/src/views/equipmentManagement/upkeep/Form/PlanModal.vue
@@ -7,7 +7,7 @@
@cancel="handleCancel"
@close="handleClose"
>
- <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
+ <el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
<el-form-item label="璁惧鍚嶇О">
<el-select
v-model="form.deviceLedgerId"
@@ -64,12 +64,12 @@
placeholder="璇疯緭鍏ヤ繚鍏婚儴浣�"
/>
</el-form-item>
- <el-form-item label="淇濆吇椤圭洰" prop="maintenanceItems">
+ <el-form-item label="淇濆吇鍐呭" prop="maintenanceItems">
<el-input
v-model="form.maintenanceItems"
type="textarea"
:rows="3"
- placeholder="璇疯緭鍏ヤ繚鍏婚」鐩�"
+ placeholder="璇疯緭鍏ヤ繚鍏诲唴瀹�"
/>
</el-form-item>
<el-form-item v-if="id" label="淇濅慨鐘舵��">
@@ -79,7 +79,7 @@
<el-option label="澶辫触" :value="2"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="璁″垝淇濆吇鏃ユ湡">
+ <el-form-item label="璁″垝淇濆吇鏃ユ湡" prop="maintenancePlanTime">
<el-date-picker
style="width: 100%"
v-model="form.maintenancePlanTime"
@@ -150,7 +150,8 @@
const rules = {
maintenancePerson: [{ required: true, message: "璇烽�夋嫨淇濆吇浜�", trigger: "change" }],
maintenanceLocation: [{ required: true, message: "璇疯緭鍏ヤ繚鍏婚儴浣�", trigger: "blur" }],
- maintenanceItems: [{ required: true, message: "璇疯緭鍏ヤ繚鍏婚」鐩�", trigger: "blur" }],
+ maintenanceItems: [{ required: true, message: "璇疯緭鍏ヤ繚鍏诲唴瀹�", trigger: "blur" }],
+ maintenancePlanTime: [{ required: true, message: "璇烽�夋嫨璁″垝淇濆吇鏃ユ湡", trigger: "change" }],
};
const syncCreateUserFromLogin = () => {
diff --git a/src/views/equipmentManagement/upkeep/Form/UpkeepDetailModal.vue b/src/views/equipmentManagement/upkeep/Form/UpkeepDetailModal.vue
index 73a6659..838028e 100644
--- a/src/views/equipmentManagement/upkeep/Form/UpkeepDetailModal.vue
+++ b/src/views/equipmentManagement/upkeep/Form/UpkeepDetailModal.vue
@@ -14,7 +14,7 @@
<el-descriptions-item label="淇濆吇閮ㄤ綅" :span="2">
<div class="multiline">{{ detail.maintenanceLocation || "鈥�" }}</div>
</el-descriptions-item>
- <el-descriptions-item label="淇濆吇椤圭洰" :span="2">
+ <el-descriptions-item label="淇濆吇鍐呭" :span="2">
<div class="multiline">{{ detail.maintenanceItems || "鈥�" }}</div>
</el-descriptions-item>
<el-descriptions-item label="淇濆吇浜�">{{ detail.maintenancePerson || "鈥�" }}</el-descriptions-item>
diff --git a/src/views/equipmentManagement/upkeep/Form/formDia.vue b/src/views/equipmentManagement/upkeep/Form/formDia.vue
index 2eda377..519b2b1 100644
--- a/src/views/equipmentManagement/upkeep/Form/formDia.vue
+++ b/src/views/equipmentManagement/upkeep/Form/formDia.vue
@@ -158,12 +158,12 @@
</el-row>
<el-row>
<el-col :span="24">
- <el-form-item label="淇濆吇椤圭洰" prop="maintenanceItems">
+ <el-form-item label="淇濆吇鍐呭" prop="maintenanceItems">
<el-input
v-model="form.maintenanceItems"
type="textarea"
:rows="3"
- placeholder="璇疯緭鍏ヤ繚鍏婚」鐩�"
+ placeholder="璇疯緭鍏ヤ繚鍏诲唴瀹�"
/>
</el-form-item>
</el-col>
@@ -217,7 +217,7 @@
inspector: [{ required: true, message: "璇烽�夋嫨褰曞叆浜�", trigger: "blur" },],
maintenancePerson: [{ required: true, message: "璇烽�夋嫨淇濆吇浜�", trigger: "change" }],
maintenanceLocation: [{ required: true, message: "璇疯緭鍏ヤ繚鍏婚儴浣�", trigger: "blur" }],
- maintenanceItems: [{ required: true, message: "璇疯緭鍏ヤ繚鍏婚」鐩�", trigger: "blur" }],
+ maintenanceItems: [{ required: true, message: "璇疯緭鍏ヤ繚鍏诲唴瀹�", trigger: "blur" }],
registrationDate: [{ required: true, message: "璇烽�夋嫨鐧昏鏃堕棿", trigger: "change" }],
frequencyDetail: [{
validator: (rule, value, callback) => {
diff --git a/src/views/equipmentManagement/upkeep/index.vue b/src/views/equipmentManagement/upkeep/index.vue
index 2990d26..d9b5a32 100644
--- a/src/views/equipmentManagement/upkeep/index.vue
+++ b/src/views/equipmentManagement/upkeep/index.vue
@@ -376,7 +376,7 @@
},
{
prop: "maintenanceItems",
- label: "淇濆吇椤圭洰",
+ label: "淇濆吇鍐呭",
minWidth: 180,
showOverflowTooltip: true,
},
@@ -419,7 +419,7 @@
showOverflowTooltip: true,
},
{
- label: "淇濆吇椤圭洰",
+ label: "淇濆吇鍐呭",
align: "center",
prop: "maintenanceItems",
minWidth: 150,
--
Gitblit v1.9.3