From 817f8b5f25e08499e7e90b38c002e74131d57c17 Mon Sep 17 00:00:00 2001 From: zhouwx <1175765986@qq.com> Date: 星期五, 18 四月 2025 14:30:12 +0800 Subject: [PATCH] 修改 --- src/views/hazardousChemicals/electronicWarehouse/components/productTable.vue | 70 ++++++++++++++++++++++++++++++++--- 1 files changed, 64 insertions(+), 6 deletions(-) diff --git a/src/views/hazardousChemicals/electronicWarehouse/components/productTable.vue b/src/views/hazardousChemicals/electronicWarehouse/components/productTable.vue index 3c51d8f..73db9a8 100644 --- a/src/views/hazardousChemicals/electronicWarehouse/components/productTable.vue +++ b/src/views/hazardousChemicals/electronicWarehouse/components/productTable.vue @@ -2,6 +2,26 @@ <div class="app-container"> <div style="display: flex;justify-content: space-between"> <el-form :inline="true" style="display: flex;align-items: center;flex-wrap: wrap;" > + <el-form-item label="企业名称:" > + <el-select + clearable + v-model="data.queryParams.companyId" + filterable + remote + reserve-keyword + placeholder="请输入企业名称" + remote-show-suffix + :remote-method="getCompanyList" + style="width: 100%" + > + <el-option + v-for="item in data.companyList" + :key="item.id" + :label="item.name" + :value="item.id" + /> + </el-select> + </el-form-item> <el-form-item label="品名:" > <el-input v-model="data.queryParams.params.name" placeholder="请输入品名" clearable></el-input> </el-form-item> @@ -76,6 +96,7 @@ } from "@/api/hazardousChemicals/productRecord"; import {delRawRecord} from "@/api/hazardousChemicals/rawRecord"; import {useRoute, useRouter} from "vue-router"; +import {getCompany} from "@/api/hazardousChemicals/company"; const router = useRouter() const route = useRoute() const { proxy } = getCurrentInstance(); @@ -86,18 +107,21 @@ queryParams: { pageNum: 1, pageSize: 10, + companyId: null, params :{ name: '', - productSn: '' + productSn: '', + } }, total: 0, - dataList: [] + dataList: [], + companyList: [] }); const { queryParams, total, dataList } = toRefs(data); const classHourRef = ref(); -onMounted(()=>{ +onMounted(async ()=>{ if(route.query.val){ const val = JSON.parse(route.query.val) if(val){ @@ -105,7 +129,9 @@ data.queryParams.pageSize = val.pageSize; } } - getList() + await getCompanyList() + await getList() + }) const getList = async () => { @@ -119,6 +145,34 @@ } loading.value = false } +const getCompanyList = async (val)=>{ + if(val){ + const queryParams = { + name: val + } + const res = await getCompany(queryParams) + if (res.code == 200) { + data.companyList = res.data.list + } else { + ElMessage.warning(res.message) + } + } + else { + const queryParams = { + pageNum: 1, + pageSize: 10 + } + const res = await getCompany(queryParams) + if (res.code == 200) { + data.companyList = res.data.list + if(data.queryParams.companyId == null){ + data.queryParams.companyId = data.companyList[0].id + } + } else { + ElMessage.warning(res.message) + } + } +} const openDialog = (type, value) => { dialogRef.value.openDialog(type, value); @@ -131,10 +185,13 @@ pageSize: 10, params :{ name: '', - productSn: '' + productSn: '', + } } + data.queryParams.companyId = data.companyList[0].id getList() + } const getProRecord = (val) => { dialogRef.value.openDialog(val) @@ -144,7 +201,8 @@ pageNum: data.queryParams.pageNum, pageSize: data.queryParams.pageSize, basicId: val.basicId, - warehouseId: val.warehouseId + warehouseId: val.warehouseId, + companyId: val.productBasic.companyId } const v = JSON.stringify(obj) router.push({ path: "/proDetail", query: { val: v } }); -- Gitblit v1.9.2