From ae30037d1e78add57b8aceb4f100019c097dfb2c Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 17 六月 2026 16:19:56 +0800
Subject: [PATCH] 设备保养增加保养内容字段

---
 src/views/equipmentManagement/upkeep/index.vue                 |    4 +
 .gitignore                                                     |    3 +
 doc/maintenance_content.md                                     |   89 ++++++++++++++++++++++++++++++++++++++++++++
 src/views/equipmentManagement/upkeep/Form/formDia.vue          |    9 ++++
 src/views/equipmentManagement/upkeep/Form/MaintenanceModal.vue |    6 +++
 5 files changed, 110 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index 78a752d..1346a33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,6 @@
 
 package-lock.json
 yarn.lock
+
+# Claude
+.claude/
diff --git a/doc/maintenance_content.md b/doc/maintenance_content.md
new file mode 100644
index 0000000..4a0c627
--- /dev/null
+++ b/doc/maintenance_content.md
@@ -0,0 +1,89 @@
+# 璁惧淇濆吇鍐呭瀛楁
+
+## 娑夊強椤甸潰
+
+- 淇濆吇瀹氭椂浠诲姟绠$悊椤甸潰锛堟柊澧�/缂栬緫寮圭獥銆佸垪琛級
+- 璁惧淇濆吇璁板綍绠$悊椤甸潰锛堝垪琛ㄣ�佽鎯呭脊绐椼�佺‘璁や繚鍏诲脊绐楋級
+
+## API
+
+### 淇濆吇瀹氭椂浠诲姟
+
+| 鏂规硶 | 璺緞 | 璇存槑 |
+|------|------|------|
+| POST | /deviceMaintenanceTask/add | 鏂板瀹氭椂浠诲姟锛堟柊澧� maintenanceContent 瀛楁锛� |
+| POST | /deviceMaintenanceTask/update | 淇敼瀹氭椂浠诲姟锛堟柊澧� maintenanceContent 瀛楁锛� |
+| GET | /deviceMaintenanceTask/listPage | 鍒楄〃鏌ヨ锛堣繑鍥炴柊澧炲瓧娈碉級 |
+
+**鏂板璇锋眰/鍝嶅簲鍙傛暟锛�**
+
+| 鍙傛暟 | 绫诲瀷 | 蹇呭~ | 璇存槑 |
+|------|------|------|------|
+| maintenanceContent | String | 鍚� | 淇濆吇鍐呭锛屾渶闀�2000瀛� |
+
+### 璁惧淇濆吇璁板綍
+
+| 鏂规硶 | 璺緞 | 璇存槑 |
+|------|------|------|
+| POST | /device/maintenance | 鏂板淇濆吇璁板綍锛堟柊澧� maintenanceContent 瀛楁锛� |
+| PUT | /device/maintenance | 淇敼淇濆吇璁板綍锛堟柊澧� maintenanceContent 瀛楁锛� |
+| POST | /device/maintenance/maintenance | 纭淇濆吇锛堟柊澧� maintenanceContent 瀛楁锛� |
+| GET | /device/maintenance/page | 鍒楄〃鏌ヨ锛堣繑鍥炴柊澧炲瓧娈碉級 |
+| GET | /device/maintenance/{id} | 璇︽儏鏌ヨ锛堣繑鍥炴柊澧炲瓧娈碉級 |
+| POST | /device/maintenance/export | 瀵煎嚭Excel锛堟柊澧�"淇濆吇鍐呭"鍒楋級 |
+
+**鏂板璇锋眰/鍝嶅簲鍙傛暟锛�**
+
+| 鍙傛暟 | 绫诲瀷 | 蹇呭~ | 璇存槑 |
+|------|------|------|------|
+| maintenanceContent | String | 鍚� | 淇濆吇鍐呭锛屾渶闀�2000瀛� |
+
+**璇存槑锛�** 瀹氭椂浠诲姟瑙﹀彂鐢熸垚淇濆吇璁板綍鏃讹紝浼氳嚜鍔ㄥ皢瀹氭椂浠诲姟鐨� `maintenanceContent` 澶嶅埗鍒颁繚鍏昏褰曚腑銆�
+
+## 鍓嶇淇敼鐐�
+
+### 1. 淇濆吇瀹氭椂浠诲姟 - 鏂板/缂栬緫寮圭獥
+
+```html
+<el-form-item label="淇濆吇鍐呭" prop="maintenanceContent">
+  <el-input v-model="form.maintenanceContent" type="textarea" :rows="3" placeholder="璇疯緭鍏ヤ繚鍏诲唴瀹�" maxlength="2000" show-word-limit />
+</el-form-item>
+```
+
+### 2. 淇濆吇瀹氭椂浠诲姟 - 鍒楄〃
+
+```html
+<el-table-column label="淇濆吇鍐呭" prop="maintenanceContent" min-width="150" show-overflow-tooltip />
+```
+
+### 3. 璁惧淇濆吇璁板綍 - 鍒楄〃
+
+```html
+<el-table-column label="淇濆吇鍐呭" prop="maintenanceContent" min-width="150" show-overflow-tooltip />
+```
+
+### 4. 璁惧淇濆吇璁板綍 - 璇︽儏寮圭獥
+
+```html
+<el-form-item label="淇濆吇鍐呭">
+  <span>{{ detail.maintenanceContent }}</span>
+</el-form-item>
+```
+
+### 5. 璁惧淇濆吇璁板綍 - 纭淇濆吇寮圭獥锛堝彲閫夊~鍐�/淇敼锛�
+
+```html
+<el-form-item label="淇濆吇鍐呭" prop="maintenanceContent">
+  <el-input v-model="confirmForm.maintenanceContent" type="textarea" :rows="3" placeholder="璇疯緭鍏ヤ繚鍏诲唴瀹�" maxlength="2000" show-word-limit />
+</el-form-item>
+```
+
+### 6. 瀵煎嚭
+
+瀵煎嚭Excel鑷姩鏂板"淇濆吇鍐呭"鍒楋紝鏃犻渶鍓嶇棰濆澶勭悊銆�
+
+## 娉ㄦ剰浜嬮」
+
+- 鎵ц鏁版嵁搴撹縼绉昏剼鏈� `doc/20260617_device_maintenance_content.sql` 鍚庡啀閮ㄧ讲
+- 瀹氭椂浠诲姟鐢熸垚鐨勪繚鍏昏褰曚細鑷姩鎼哄甫瀹氭椂浠诲姟鐨勪繚鍏诲唴瀹癸紝鏃犻渶鎵嬪姩濉啓
+- 淇濆吇璁板綍鐨勪繚鍏诲唴瀹瑰彲鍦ㄧ‘璁や繚鍏绘椂淇敼
diff --git a/src/views/equipmentManagement/upkeep/Form/MaintenanceModal.vue b/src/views/equipmentManagement/upkeep/Form/MaintenanceModal.vue
index b27d1e1..b49f6f3 100644
--- a/src/views/equipmentManagement/upkeep/Form/MaintenanceModal.vue
+++ b/src/views/equipmentManagement/upkeep/Form/MaintenanceModal.vue
@@ -66,6 +66,9 @@
           </div>
         </div>
       </el-form-item>
+      <el-form-item label="淇濆吇鍐呭" prop="maintenanceContent">
+        <el-input v-model="form.maintenanceContent" type="textarea" :rows="3" placeholder="璇疯緭鍏ヤ繚鍏诲唴瀹�" maxlength="2000" show-word-limit />
+      </el-form-item>
     </el-form>
   </FormDialog>
 </template>
@@ -98,6 +101,7 @@
   maintenanceActuallyTime: undefined,
   maintenanceResult: undefined,
   sparePartsIds: [],
+  maintenanceContent: undefined,
 });
 
 const sparePartOptions = ref([])
@@ -118,6 +122,7 @@
       ? dayjs(data.maintenanceActuallyTime).format("YYYY-MM-DD HH:mm:ss")
       : dayjs().format("YYYY-MM-DD HH:mm:ss");
   form.maintenanceResult = data.maintenanceResult;
+  form.maintenanceContent = data.maintenanceContent || "";
   if (Array.isArray(data?.sparePartsIds)) {
     form.sparePartsIds = data.sparePartsIds.map((v) => Number(v)).filter((v) => Number.isFinite(v));
   } else if (typeof data?.sparePartsIds === "string") {
@@ -158,6 +163,7 @@
     }
     const data = {
       id: planId.value,
+      maintenanceContent: form.maintenanceContent,
       ...form,
       sparePartsIds: form.sparePartsIds ? form.sparePartsIds.join(",") : "",
       sparePartsQty: form.sparePartsIds
diff --git a/src/views/equipmentManagement/upkeep/Form/formDia.vue b/src/views/equipmentManagement/upkeep/Form/formDia.vue
index 1460686..d39b844 100644
--- a/src/views/equipmentManagement/upkeep/Form/formDia.vue
+++ b/src/views/equipmentManagement/upkeep/Form/formDia.vue
@@ -189,6 +189,13 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="淇濆吇鍐呭" prop="maintenanceContent">
+            <el-input v-model="form.maintenanceContent" type="textarea" :rows="3" placeholder="璇疯緭鍏ヤ繚鍏诲唴瀹�" maxlength="2000" show-word-limit />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
   </FormDialog>
 </template>
@@ -233,6 +240,7 @@
     isEnabled: 1,
     inspector: undefined,
     remarks: "",
+    maintenanceContent: "",
     frequencyType: "",
     frequencyDetail: "",
     week: "",
@@ -383,6 +391,7 @@
     isEnabled: 1,
     inspector: undefined,
     remarks: "",
+    maintenanceContent: "",
     frequencyType: "",
     frequencyDetail: "",
     week: "",
diff --git a/src/views/equipmentManagement/upkeep/index.vue b/src/views/equipmentManagement/upkeep/index.vue
index b2756d1..4e9c57b 100644
--- a/src/views/equipmentManagement/upkeep/index.vue
+++ b/src/views/equipmentManagement/upkeep/index.vue
@@ -168,7 +168,7 @@
         @pagination="changePage"
       >
         <template #maintenanceResultRef="{ row }">
-          <div>{{ row.maintenanceResult || '-' }}</div>
+          <div>{{ { "0": "缁翠慨", "1": "瀹屽ソ" }[row.maintenanceResult] || row.maintenanceResult || "-" }}</div>
         </template>
         <template #statusRef="{ row }">
           <el-tag v-if="row.status === 2" type="danger">澶辫触</el-tag>
@@ -356,6 +356,7 @@
 	},
 	{ prop: "registrant", label: "鐧昏浜�", minWidth: 100 },
 	{ prop: "registrationDate", label: "鐧昏鏃ユ湡", minWidth: 100 },
+	{ prop: "maintenanceContent", label: "淇濆吇鍐呭", minWidth: 150, showOverflowTooltip: true },
 	{
 		label: "鏄惁鍚敤",
 		prop: "isEnabled",
@@ -427,6 +428,7 @@
 		dataType: "slot",
 		slot: "maintenanceResultRef",
 	},
+	{ prop: "maintenanceContent", label: "淇濆吇鍐呭", minWidth: 150, showOverflowTooltip: true },
 	{
 		label: "鐘舵��",
 		align: "center",

--
Gitblit v1.9.3