完善材料模块页面
This commit is contained in:
@ -3,10 +3,15 @@
|
||||
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
|
||||
<div v-show="showSearch" class="mb-[10px]">
|
||||
<el-card shadow="hover">
|
||||
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
|
||||
<el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
|
||||
<el-form-item label="材料名称" prop="materialsName">
|
||||
<el-input v-model="queryParams.materialsName" placeholder="请输入材料名称" clearable @keyup.enter="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="材料提供商" prop="companyId">
|
||||
<el-select v-model="queryParams.companyId" clearable placeholder="请选择材料提供商">
|
||||
<el-option v-for="item in companyOptions" :key="item.id" :label="item.companyName" :value="item.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
|
||||
@ -39,57 +44,60 @@
|
||||
</el-row>
|
||||
</template>
|
||||
|
||||
<el-table v-loading="loading" :data="materialsList" @selection-change="handleSelectionChange">
|
||||
<el-table
|
||||
v-loading="loading"
|
||||
:data="materialsList"
|
||||
@selection-change="handleSelectionChange"
|
||||
:row-key="getRowKey"
|
||||
:expand-row-keys="expandedRowKeys"
|
||||
@expand-change="handleExpandChange"
|
||||
>
|
||||
<el-table-column type="expand">
|
||||
<template #default="">
|
||||
<materials-inventory-table :materials-id="expandedRowKeys[0]" :project-id="currentProject.id" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="序号" type="index" width="60" align="center" />
|
||||
<el-table-column label="材料名称" align="center" prop="materialsName" />
|
||||
<el-table-column label="公司名称" align="center" prop="companyVo.companyName" />
|
||||
<el-table-column label="规格型号名称" align="center" prop="typeSpecificationName" />
|
||||
<el-table-column label="规格型号文件路径" align="center" prop="typeSpecificationUrl" />
|
||||
<el-table-column label="合格证编号名称" align="center" prop="certificateConformityName" />
|
||||
<el-table-column label="合格证编号文件路径" align="center" prop="certificateConformityUrl" />
|
||||
<el-table-column label="质量说明书编号" align="center" prop="qualityName" />
|
||||
<el-table-column label="质量说明书文件路径" align="center" prop="qualityUrl" />
|
||||
<el-table-column label="检验报告编号" align="center" prop="inspectionReportName" />
|
||||
<el-table-column label="检验报告文件路径" align="center" prop="inspectionReportUrl" />
|
||||
<el-table-column label="复试报告编号" align="center" prop="reexamineReportName" />
|
||||
<el-table-column label="复试报告文件路径" align="center" prop="reexamineReportUrl" />
|
||||
<el-table-column label="规格型号" align="center" prop="typeSpecificationName" />
|
||||
<!-- <el-table-column label="规格型号文件路径" align="center" prop="typeSpecificationUrl" />
|
||||
<el-table-column label="合格证编号名称" align="center" prop="certificateConformityName" />
|
||||
<el-table-column label="合格证编号文件路径" align="center" prop="certificateConformityUrl" />
|
||||
<el-table-column label="质量说明书编号" align="center" prop="qualityName" />
|
||||
<el-table-column label="质量说明书文件路径" align="center" prop="qualityUrl" />
|
||||
<el-table-column label="检验报告编号" align="center" prop="inspectionReportName" />
|
||||
<el-table-column label="检验报告文件路径" align="center" prop="inspectionReportUrl" />
|
||||
<el-table-column label="复试报告编号" align="center" prop="reexamineReportName" />
|
||||
<el-table-column label="复试报告文件路径" align="center" prop="reexamineReportUrl" />-->
|
||||
<el-table-column label="使用部位" align="center" prop="usePart" />
|
||||
<el-table-column label="计量单位" align="center" prop="weightId" />
|
||||
<el-table-column label="备注" align="center" prop="remark" />
|
||||
<el-table-column label="计量单位" align="center" prop="weightId" />
|
||||
<el-table-column label="预计材料数量" align="center" prop="quantityCount" />
|
||||
<el-table-column label="状态" align="center" prop="status">
|
||||
<template #default="{ row }">
|
||||
<span
|
||||
:style="{
|
||||
color: row.status === 0 ? 'green' : 'red',
|
||||
backgroundColor: row.status === 0 ? '#E6F9E6' : '#FDE2E2',
|
||||
padding: '5px 10px',
|
||||
borderRadius: '5px',
|
||||
display: 'inline-block'
|
||||
}"
|
||||
>
|
||||
{{ row.status === 0 ? '正常' : '异常' }}
|
||||
</span>
|
||||
<template #default="scope">
|
||||
<dict-tag :options="sys_normal_disable" :value="scope.row.status" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="220">
|
||||
<template #default="scope">
|
||||
<el-tooltip content="修改" placement="top">
|
||||
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['materials:materials:edit']"></el-button>
|
||||
</el-tooltip>
|
||||
<el-tooltip content="删除" placement="top">
|
||||
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['materials:materials:remove']"></el-button>
|
||||
</el-tooltip>
|
||||
<el-space wrap>
|
||||
<el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['materials:materials:edit']"> 修改 </el-button>
|
||||
<el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['materials:materials:remove']">
|
||||
删除
|
||||
</el-button>
|
||||
<el-button link type="primary" icon="Plus" @click="handleAddMaterialsInventory(scope.row)"> 出入库 </el-button>
|
||||
</el-space>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
|
||||
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.pageSize" @pagination="getList" />
|
||||
</el-card>
|
||||
<!-- 添加或修改材料名称对话框 -->
|
||||
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
|
||||
<el-form ref="materialsFormRef" :model="form" :rules="rules" label-width="80px">
|
||||
<el-form ref="materialsFormRef" :model="form" :rules="rules" label-width="160px">
|
||||
<el-form-item label="材料名称" prop="materialsName">
|
||||
<el-input v-model="form.materialsName" placeholder="请输入材料名称" />
|
||||
</el-form-item>
|
||||
@ -132,12 +140,12 @@
|
||||
<el-form-item label="计量单位" prop="weightId">
|
||||
<el-input v-model="form.weightId" placeholder="请输入计量单位" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" placeholder="请输入备注" />
|
||||
</el-form-item>
|
||||
<el-form-item label="预计材料数量" prop="quantityCount">
|
||||
<el-input v-model="form.quantityCount" placeholder="请输入预计材料数量" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" placeholder="请输入备注" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<div class="dialog-footer">
|
||||
@ -146,6 +154,7 @@
|
||||
</div>
|
||||
</template>
|
||||
</el-dialog>
|
||||
<materials-inventory-add-dialog :materials-id="currentMaterialsId" :project-id="currentProject.id" ref="dialogRef" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@ -153,9 +162,11 @@
|
||||
import { addMaterials, delMaterials, getMaterials, listMaterials, updateMaterials } from '@/api/materials/materials';
|
||||
import { MaterialsForm, MaterialsQuery, MaterialsVO } from '@/api/materials/materials/types';
|
||||
import { useUserStoreHook } from '@/store/modules/user';
|
||||
import MaterialsInventoryTable from '@/views/materials/materials/component/MaterialsInventoryTable.vue';
|
||||
import MaterialsInventoryAddDialog from '@/views/materials/materials/component/MaterialsInventoryAddDialog.vue';
|
||||
|
||||
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
||||
|
||||
const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'));
|
||||
// 获取用户 store
|
||||
const userStore = useUserStoreHook();
|
||||
// 从 store 中获取项目列表和当前选中的项目
|
||||
@ -202,7 +213,7 @@ const initFormData: MaterialsForm = {
|
||||
const data = reactive<PageData<MaterialsForm, MaterialsQuery>>({
|
||||
form: { ...initFormData },
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
current: 1,
|
||||
pageSize: 10,
|
||||
materialsName: undefined,
|
||||
companyId: undefined,
|
||||
@ -230,6 +241,7 @@ const data = reactive<PageData<MaterialsForm, MaterialsQuery>>({
|
||||
});
|
||||
|
||||
const { queryParams, form, rules } = toRefs(data);
|
||||
const companyOptions = ref([]);
|
||||
|
||||
/** 查询材料名称列表 */
|
||||
const getList = async () => {
|
||||
@ -237,6 +249,14 @@ const getList = async () => {
|
||||
const res = await listMaterials(queryParams.value);
|
||||
materialsList.value = res.data.records;
|
||||
total.value = res.data.total;
|
||||
const companyMap = new Map();
|
||||
res.data.records.forEach((record) => {
|
||||
const { id, companyName } = record.companyVo;
|
||||
if (!companyMap.has(id)) {
|
||||
companyMap.set(id, { id, companyName });
|
||||
}
|
||||
});
|
||||
companyOptions.value = Array.from(companyMap.values());
|
||||
loading.value = false;
|
||||
};
|
||||
|
||||
@ -254,7 +274,7 @@ const reset = () => {
|
||||
|
||||
/** 搜索按钮操作 */
|
||||
const handleQuery = () => {
|
||||
queryParams.value.pageNum = 1;
|
||||
queryParams.value.current = 1;
|
||||
getList();
|
||||
};
|
||||
|
||||
@ -271,6 +291,21 @@ const handleSelectionChange = (selection: MaterialsVO[]) => {
|
||||
multiple.value = !selection.length;
|
||||
};
|
||||
|
||||
// 存储当前展开行的 key 数组(只允许一个展开)
|
||||
const expandedRowKeys = ref([]);
|
||||
// row-key 函数:返回每一行的唯一标识
|
||||
const getRowKey = (row: any) => row.id;
|
||||
/** 展开选中数据 */
|
||||
const handleExpandChange = async (selection: MaterialsVO, expanded: any) => {
|
||||
if (expanded) {
|
||||
// 展开当前行时,将其他展开行关闭,只保留当前行 id
|
||||
expandedRowKeys.value = [selection.id];
|
||||
} else {
|
||||
// 收起当前行时,从 expandedRowKeys 中移除
|
||||
expandedRowKeys.value = expandedRowKeys.value.filter((key) => key !== selection.id);
|
||||
}
|
||||
};
|
||||
|
||||
/** 新增按钮操作 */
|
||||
const handleAdd = () => {
|
||||
reset();
|
||||
@ -325,6 +360,13 @@ const handleExport = () => {
|
||||
);
|
||||
};
|
||||
|
||||
const dialogRef = ref();
|
||||
const currentMaterialsId = ref<number | string>(0);
|
||||
const handleAddMaterialsInventory = (row?: MaterialsVO) => {
|
||||
currentMaterialsId.value = row.id ?? 0;
|
||||
dialogRef.value.openDialog();
|
||||
};
|
||||
|
||||
onMounted(() => {
|
||||
getList();
|
||||
});
|
||||
|
Reference in New Issue
Block a user