From 3e1fb69d30b38230988a102b651b464c05283675 Mon Sep 17 00:00:00 2001
From: zhang_12370 <z2864490065@outlook.com>
Date: 星期二, 15 七月 2025 16:45:21 +0800
Subject: [PATCH] 1、优化设备领用 2、优化设备列表
---
src/views/equipment/management/index.vue | 12 ++++++++----
src/views/equipment/management/mould/equipmentRequisitionDialog.vue | 5 +++--
src/views/equipment/management/mould/managementDialog.vue | 11 +++++++----
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/views/equipment/management/index.vue b/src/views/equipment/management/index.vue
index 8c9d8be..876a4b1 100644
--- a/src/views/equipment/management/index.vue
+++ b/src/views/equipment/management/index.vue
@@ -36,7 +36,7 @@
<el-button :icon="Plus" type="primary" v-show="activeTab === 'equipmentRequisition'" @click="handleAdd"
>棰嗙敤</el-button
>
- <el-button :icon="Delete" type="danger" @click="handleDelete"
+ <el-button :icon="Delete" type="danger" v-show="activeTab === 'management'" @click="handleDelete"
>鍒犻櫎</el-button
>
</el-row>
@@ -120,7 +120,7 @@
</template>
<script setup>
-import { computed, onMounted, reactive, ref } from "vue";
+import { computed, onMounted, reactive, ref, nextTick } from "vue";
import { ElMessage } from "element-plus";
import { Delete, Plus } from "@element-plus/icons-vue";
@@ -192,7 +192,7 @@
prop: "equipmentStatus",
label: "浣跨敤鐘舵��",
minWidth: 100,
- formatter: (row) => row.usageStatus == 1 ? "浣跨敤涓�" : "宸插綊杩�"
+ formatter: (row) => row.equipmentStatus == "0" ? "浣跨敤涓�" : "宸插綊杩�"
},
{ prop: "usageStartTime", label: "浣跨敤寮�濮嬫椂闂�", minWidth: 100 },
{ prop: "usageEndTime", label: "浣跨敤缁撴潫鏃堕棿", minWidth: 100 },
@@ -346,9 +346,13 @@
// 璁惧棰嗙敤寮圭獥鎻愪氦澶勭悊
const onEquipmentRequisitionSubmit = (formData) => {
+ console.log("鎻愪氦鐨勯鐢ㄦ暟鎹細", formData);
ElMessage.success('璁惧棰嗙敤鎴愬姛');
equipmentRequisitionDialog.value = false;
- getList();
+ nextTick(() => {
+ form.value = {};
+ getList();
+ });
};
// 鏁版嵁鑾峰彇
diff --git a/src/views/equipment/management/mould/equipmentRequisitionDialog.vue b/src/views/equipment/management/mould/equipmentRequisitionDialog.vue
index a31f0d0..c3be23d 100644
--- a/src/views/equipment/management/mould/equipmentRequisitionDialog.vue
+++ b/src/views/equipment/management/mould/equipmentRequisitionDialog.vue
@@ -51,9 +51,10 @@
>
</el-form-item>
<el-form-item label="浣跨敤鐘舵��" prop="equipmentStatus">
+ <!-- 缂栬緫鐨勬椂鍊欒嚜鍔ㄥ尮閰� -->
<el-select v-model="form.equipmentStatus" placeholder="璇烽�夋嫨" :disabled="isViewMode">
- <el-option label="浣跨敤涓�" :value="1" />
- <el-option label="宸插綊杩�" :value="0" />
+ <el-option label="浣跨敤涓�" value="0" />
+ <el-option label="宸插綊杩�" value="1" />
</el-select>
</el-form-item>
<el-form-item label="浣跨敤寮�濮嬫椂闂�" prop="usageStartTime">
diff --git a/src/views/equipment/management/mould/managementDialog.vue b/src/views/equipment/management/mould/managementDialog.vue
index e2b3e72..80b22f1 100644
--- a/src/views/equipment/management/mould/managementDialog.vue
+++ b/src/views/equipment/management/mould/managementDialog.vue
@@ -16,9 +16,9 @@
>
<el-row :gutter="20">
<el-col :span="11">
- <el-form-item label="璁惧缂栧彿" prop="equipmentName">
+ <el-form-item label="璁惧缂栧彿" prop="equipmentNo">
<el-input
- v-model="formData.equipmentName"
+ v-model="formData.equipmentNo"
placeholder="璇疯緭鍏ヨ澶囩紪鍙�"
:disabled="isViewMode"
style="width: 100%"
@@ -123,6 +123,7 @@
<script setup>
import { ref, watch, computed, reactive } from "vue";
import { addOrEditEquipment } from "@/api/equipment/management/index.js";
+import { ElMessage } from "element-plus";
const props = defineProps({
beforeClose: {
@@ -181,7 +182,7 @@
try {
const result = await addOrEditEquipment({ ...formData.value });
const title = props.title.includes("鏂板") ? "鏂板" : "缂栬緫";
-
+ console.log(result)
if (result.code === 200 && result.msg) {
ElMessage.success(`${title}鎴愬姛锛�${result.msg}`);
emit("submit", { title, ...formData.value, result });
@@ -191,7 +192,6 @@
}
} catch (error) {
console.error("鎻愪氦澶辫触:", error);
- ElMessage.error("鎻愪氦澶辫触锛岃閲嶈瘯");
}
});
};
@@ -219,6 +219,9 @@
closeDialog();
};
const rules = reactive({
+ equipmentNo: [
+ { required: true, message: "璇疯緭鍏ヤ緵璐у晢鍚嶇О", trigger: "blur" },
+ ],
equipmentName: [
{ required: true, message: "璇疯緭鍏ヤ緵璐у晢鍚嶇О", trigger: "blur" },
],
--
Gitblit v1.9.3