From 62b4b7af6fb8dea23cf14b0709156871a3c144af Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 23 六月 2026 14:41:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_大罗素马铃薯new' into dev_新疆_大罗素马铃薯new
---
src/views/equipmentManagement/upkeep/Form/MaintenanceModal.vue | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/src/views/equipmentManagement/upkeep/Form/MaintenanceModal.vue b/src/views/equipmentManagement/upkeep/Form/MaintenanceModal.vue
index e86b64a..b49f6f3 100644
--- a/src/views/equipmentManagement/upkeep/Form/MaintenanceModal.vue
+++ b/src/views/equipmentManagement/upkeep/Form/MaintenanceModal.vue
@@ -25,18 +25,11 @@
style="width: 100%"
/>
</el-form-item>
- <el-form-item label="淇濆吇鐘舵��">
- <el-select v-model="form.status">
- <el-option label="寰呬繚鍏�" :value="0"></el-option>
- <el-option label="瀹岀粨" :value="1"></el-option>
- <el-option label="澶辫触" :value="2"></el-option>
- </el-select>
- </el-form-item>
<el-form-item label="淇濆吇缁撴灉">
- <el-input
- v-model="form.maintenanceResult"
- placeholder="璇疯緭鍏ヤ繚鍏荤粨鏋�"
- type="text" />
+ <el-select v-model="form.maintenanceResult" placeholder="璇烽�夋嫨淇濆吇缁撴灉">
+ <el-option label="缁翠慨" value="0" />
+ <el-option label="瀹屽ソ" value="1" />
+ </el-select>
</el-form-item>
<el-form-item label="璁惧澶囦欢">
<el-select v-model="form.sparePartsIds" :loading="loadingSparePartOptions" placeholder="璇烽�夋嫨璁惧澶囦欢" multiple filterable>
@@ -73,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>
@@ -84,7 +80,7 @@
import dayjs from "dayjs";
import useUserStore from "@/store/modules/user";
import { ElMessage } from "element-plus";
-import {computed, ref} from "vue";
+import {computed, getCurrentInstance, ref} from "vue";
import {getSparePartsList} from "@/api/equipmentManagement/spareParts.js";
defineOptions({
@@ -92,6 +88,7 @@
});
const emits = defineEmits(["ok"]);
+const { proxy } = getCurrentInstance();
// 淇濆瓨璁″垝淇濆吇璁板綍鐨刬d
const planId = ref();
@@ -100,11 +97,11 @@
const userStore = useUserStore();
const { form, resetForm } = useFormData({
- maintenanceActuallyName: undefined, // 瀹為檯淇濆吇浜�
- maintenanceActuallyTime: undefined, // 瀹為檯淇濆吇鏃ユ湡
- maintenanceResult: undefined, // 淇濆吇缁撴灉
- status: 0, // 淇濆吇鐘舵��
+ maintenanceActuallyName: undefined,
+ maintenanceActuallyTime: undefined,
+ maintenanceResult: undefined,
sparePartsIds: [],
+ maintenanceContent: undefined,
});
const sparePartOptions = ref([])
@@ -121,12 +118,11 @@
form.maintenanceActuallyName =
data.maintenanceActuallyName ?? userStore.nickName;
form.maintenanceActuallyTime =
- data.maintenanceActuallyTime
+ data.maintenanceActuallyTime
? dayjs(data.maintenanceActuallyTime).format("YYYY-MM-DD HH:mm:ss")
: dayjs().format("YYYY-MM-DD HH:mm:ss");
form.maintenanceResult = data.maintenanceResult;
- form.status = 1; // 榛樿鐘舵�佷负瀹岀粨
- // multiple 閫夋嫨鍣ㄨ姹傛暟缁勶紱鍚庣甯歌繑鍥� "1,2,3"
+ 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") {
@@ -167,6 +163,7 @@
}
const data = {
id: planId.value,
+ maintenanceContent: form.maintenanceContent,
...form,
sparePartsIds: form.sparePartsIds ? form.sparePartsIds.join(",") : "",
sparePartsQty: form.sparePartsIds
--
Gitblit v1.9.3