From e93d241d51765e701d89cd7f6f4088c6cb22949b Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 21 四月 2023 16:51:47 +0800
Subject: [PATCH] 修改
---
src/views/facilityManagement/safetyGoodsAndEquipment/index.vue | 55 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/src/views/facilityManagement/safetyGoodsAndEquipment/index.vue b/src/views/facilityManagement/safetyGoodsAndEquipment/index.vue
index d47495a..16b16e9 100644
--- a/src/views/facilityManagement/safetyGoodsAndEquipment/index.vue
+++ b/src/views/facilityManagement/safetyGoodsAndEquipment/index.vue
@@ -2,15 +2,21 @@
<div class="home-container">
<div style="height: 100%">
<el-row class="homeCard">
-<!-- <div class="basic-line">-->
-<!-- <span>设备区域名称：</span>-->
-<!-- <el-input class="input-box" v-model="tableData.listQuery.regionName" placeholder="设备区域名称" clearable> </el-input>-->
-<!-- </div>-->
-<!-- <div class="basic-line">-->
-<!-- <span>设备区域类型：</span>-->
-<!-- <el-select class="input-box" v-model="tableData.listQuery.regionTypeId" placeholder="设备区域类型" filterable>-->
-<!-- </el-select>-->
-<!-- </div>-->
+ <div class="basic-line">
+ <span>分类名称：</span>
+ <el-select class="input-box" v-model="tableData.listQuery.searchParams.bigClassifyId" placeholder="分类名称" filterable clearable>
+ <el-option
+ v-for="item in tableData.goodsBigClassifyList"
+ :key="item.id"
+ :value="item.id"
+ :label="item.materialClassifyName"
+ ></el-option>
+ </el-select>
+ </div>
+ <div class="basic-line">
+ <span>物资名称：</span>
+ <el-input class="input-box" v-model="tableData.listQuery.searchParams.materialName" placeholder="物资名称" clearable> </el-input>
+ </div>
<div style="padding-bottom: 10px">
<el-button size="large" type="primary" class="ml10" v-throttle @click="refreshGoodsAndEquipmentData">
<el-icon>
@@ -24,9 +30,9 @@
</el-icon>
新增
</el-button>
- <el-button size="large" class="ml10" @click="openAddGoods()">
- 管理分类
- </el-button>
+<!-- <el-button size="large" class="ml10" @click="openAddGoods()">-->
+<!-- 管理分类-->
+<!-- </el-button>-->
</div>
</el-row>
<div class="homeCard">
@@ -38,13 +44,13 @@
<el-table-column prop="serialNum" label="序列号" show-overflow-tooltip></el-table-column>
<el-table-column prop="depName" label="部门名称" show-overflow-tooltip></el-table-column>
<el-table-column prop="consumableName" label="是否是耗材" show-overflow-tooltip></el-table-column>
- <el-table-column prop="validStockCount" label="库存" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="stockCount" label="库存" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="250" align="center">
<template #default="scope">
<el-button size="small" text type="success" :icon="Edit" @click="openBatchInStorage('批量入库', scope.row)">批量入库</el-button>
<el-button size="small" text type="warning" :icon="Edit" @click="openBatchOutStorage('批量出库', scope.row)">批量出库</el-button>
<el-button size="small" text type="primary" :icon="Edit" @click="linkToGoodsDetail('查看明细', scope.row)">查看明细</el-button>
- <el-button size="small" text :icon="Edit" @click="onOpenDialogRef('编辑', scope.row)">编辑</el-button>
+<!-- <el-button size="small" text :icon="Edit" @click="onOpenDialogRef('编辑', scope.row)">编辑</el-button>-->
<el-button size="small" text type="danger" :icon="Delete" @click="onDelGoodsEquipment(scope.row)">删除</el-button>
</template>
</el-table-column>
@@ -57,7 +63,7 @@
<safety-goods-and-equipment-dialog ref="safetyGoodsAndEquipmentDialogRef" @refreshData="refreshGoodsAndEquipmentData"></safety-goods-and-equipment-dialog>
<batch-out-storage ref="batchOutStorageRef" @refreshData="refreshGoodsAndEquipmentData"></batch-out-storage>
<batch-in-storage ref="batchInStorageRef" @refreshData="refreshGoodsAndEquipmentData"></batch-in-storage>
- <add-goods-dialog ref="addGoodsDialogRef"></add-goods-dialog>
+ <add-goods-dialog ref="addGoodsDialogRef" @refreshClassify="getAllSafetyEquipmentList"></add-goods-dialog>
</div>
</template>
@@ -119,9 +125,9 @@
batchOutStorageRef.value.openBatchOutStorageDialog(value)
}
-const openAddGoods = () => {
- addGoodsDialogRef.value.openAddGoodsDialog(tableData.goodsBigClassifyList)
-}
+// const openAddGoods = () => {
+// addGoodsDialogRef.value.openAddGoodsDialog(tableData.goodsBigClassifyList)
+// }
const linkToGoodsDetail = (title: string, value: DataType) => {
router.push({ path: '/goodsDetailManage', query:{ id: value.id } });
@@ -169,7 +175,7 @@
const getAllSafetyEquipmentList = async () => {
let res = await goodsAndEquipmentApi().getAllSafetyEquipment();
if(res.data.code === '200'){
- tableData.goodsBigClassifyList = res.data.data
+ tableData.goodsBigClassifyList = JSON.parse(JSON.stringify(res.data.data))
}else{
ElMessage({
message:res.data.msg,
@@ -323,4 +329,15 @@
color: #0098f5;
}
}
+
+:deep(.el-textarea.is-disabled .el-textarea__inner) {
+ background-color: var(--el-card-bg-color);
+ color: var(--el-input-text-color, var(--el-text-color-regular));
+}
+:deep(.el-input.is-disabled .el-input__inner) {
+ color: var(--el-input-text-color, var(--el-text-color-regular));
+}
+:deep(.el-input.is-disabled .el-input__wrapper) {
+ background-color: var(--el-card-bg-color);
+}
</style>
--
Gitblit v1.9.2