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 | 82 ++++++++++++++++++++++-------------------
1 files changed, 44 insertions(+), 38 deletions(-)
diff --git a/src/views/equipment/management/index.vue b/src/views/equipment/management/index.vue
index 5c29464..876a4b1 100644
--- a/src/views/equipment/management/index.vue
+++ b/src/views/equipment/management/index.vue
@@ -30,16 +30,20 @@
<!-- 鎿嶄綔鎸夐挳鍖� -->
<el-row :gutter="24" class="table-toolbar">
- <el-button :icon="Plus" type="primary" @click="handleAdd"
- >鏂板缓</el-button
+ <el-button :icon="Plus" type="primary" v-show="activeTab === 'management'" @click="handleAdd"
+ >璁惧鏂板</el-button
>
- <el-button :icon="Delete" type="danger" @click="handleDelete"
+ <el-button :icon="Plus" type="primary" v-show="activeTab === 'equipmentRequisition'" @click="handleAdd"
+ >棰嗙敤</el-button
+ >
+ <el-button :icon="Delete" type="danger" v-show="activeTab === 'management'" @click="handleDelete"
>鍒犻櫎</el-button
>
</el-row>
<!-- 琛ㄦ牸缁勪欢 -->
<div>
<data-table
+ :showOverflowTooltip="false"
:border="true"
:columns="columns"
:loading="loading"
@@ -51,6 +55,7 @@
@selection-change="handleSelectionChange"
:operations="['edit', 'viewRow']"
:operationsWidth="200"
+
>
<!-- 瀛楁鍚嶇О鍒楃殑鑷畾涔夋彃妲� - 鏄剧ず涓烘爣绛� -->
<template
@@ -99,22 +104,23 @@
v-model="equipmentRequisitionDialog"
:formData="form"
:maxQuantity="getMaxQuantity()"
+ :addOrEdit="addOrEdit"
@submit="onEquipmentRequisitionSubmit"
/>
- <UsageRecord
+ <!-- <UsageRecord
v-if="activeTab == 'usageRecord'"
v-model:copyForm="copyForm"
v-model:usageRecordDialog="usageRecordDialog"
:addOrEdit="addOrEdit"
:form="form"
@submit="getList"
- />
+ /> -->
</el-card>
</div>
</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";
@@ -164,14 +170,9 @@
columns: [
{ prop: "equipmentNo", label: "璁惧缂栧彿", minWidth: 100 },
{ prop: "equipmentName", label: "璁惧鍚嶇О", minWidth: 100 },
- { prop: "quantity", label: "鏁伴噺", minWidth: 100 },
+ { prop: "quantity", label: "鎬绘暟閲�", minWidth: 100 },
+ { prop: "usedNo", label: "宸蹭娇鐢ㄦ暟閲�", minWidth: 100 },
{ prop: "specification", label: "瑙勬牸鍨嬪彿", minWidth: 100 },
- {
- prop: "usageStatus",
- label: "浣跨敤鐘舵��",
- minWidth: 100,
- formatter: (row) => row.usageStatus == 1 ? "鍚敤" : "绂佺敤"
- },
{ prop: "purchaseDate", label: "閲囪喘鏃ユ湡", minWidth: 100 },
{ prop: "purchasePrice", label: "閲囪喘浠锋牸", minWidth: 100 },
]
@@ -183,41 +184,42 @@
api: getUsageRecordList,
deleteApi: null,
columns: [
- { prop: "userId", label: "棰嗙敤浜�", minWidth: 100 },
- { prop: "equipmentId", label: "璁惧ID", minWidth: 100 },
+ { prop: "userName", label: "棰嗙敤浜�", minWidth: 100 },
+ { prop: "equipmentNo", label: "璁惧缂栧彿", minWidth: 100 },
+ { prop: "equipmentName", label: "璁惧鍚嶇О", minWidth: 100 },
{ prop: "usageQuantity", label: "棰嗙敤鏁伴噺", minWidth: 100 },
{
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 },
{ prop: "remarks", label: "澶囨敞", minWidth: 100 },
]
},
- usageRecord:{
- label: "棰嗙敤璁板綍",
- searchPlaceholder: "璁惧缂栧彿/璁惧鍚嶇О/瑙勬牸鍨嬪彿",
- showSearch: true,
- api: getManagementList,
- deleteApi: delEquipment,
- columns: [
- { prop: "equipmentId", label: "璁惧缂栧彿", minWidth: 100 },
- { prop: "equipmentName", label: "璁惧鍚嶇О", minWidth: 100 },
- { prop: "quantity", label: "鏁伴噺", minWidth: 100 },
- { prop: "specification", label: "瑙勬牸鍨嬪彿", minWidth: 100 },
- {
- prop: "usageStatus",
- label: "浣跨敤鐘舵��",
- minWidth: 100,
- formatter: (row) => row.usageStatus == 1 ? "鍚敤" : "绂佺敤"
- },
- { prop: "purchaseDate", label: "閲囪喘鏃ユ湡", minWidth: 100 },
- { prop: "purchasePrice", label: "閲囪喘浠锋牸", minWidth: 100 },
- ]
- },
+ // usageRecord:{
+ // label: "棰嗙敤璁板綍",
+ // searchPlaceholder: "璁惧缂栧彿/璁惧鍚嶇О/瑙勬牸鍨嬪彿",
+ // showSearch: true,
+ // api: getManagementList,
+ // deleteApi: delEquipment,
+ // columns: [
+ // { prop: "equipmentId", label: "璁惧缂栧彿", minWidth: 100 },
+ // { prop: "equipmentName", label: "璁惧鍚嶇О", minWidth: 100 },
+ // { prop: "quantity", label: "鏁伴噺", minWidth: 100 },
+ // { prop: "specification", label: "瑙勬牸鍨嬪彿", minWidth: 100 },
+ // {
+ // prop: "usageStatus",
+ // label: "浣跨敤鐘舵��",
+ // minWidth: 100,
+ // formatter: (row) => row.usageStatus == 1 ? "鍚敤" : "绂佺敤"
+ // },
+ // { prop: "purchaseDate", label: "閲囪喘鏃ユ湡", minWidth: 100 },
+ // { prop: "purchasePrice", label: "閲囪喘浠锋牸", minWidth: 100 },
+ // ]
+ // },
// 鍚庣画鍙互鍦ㄨ繖閲屾坊鍔犳柊鐨勬爣绛鹃〉閰嶇疆
};
@@ -344,9 +346,13 @@
// 璁惧棰嗙敤寮圭獥鎻愪氦澶勭悊
const onEquipmentRequisitionSubmit = (formData) => {
+ console.log("鎻愪氦鐨勯鐢ㄦ暟鎹細", formData);
ElMessage.success('璁惧棰嗙敤鎴愬姛');
equipmentRequisitionDialog.value = false;
- getList();
+ nextTick(() => {
+ form.value = {};
+ getList();
+ });
};
// 鏁版嵁鑾峰彇
--
Gitblit v1.9.3