From 6f1e2acc812b2f40359aabdb5d04648acfcdcef5 Mon Sep 17 00:00:00 2001 From: zhouwx <1175765986@qq.com> Date: 星期四, 24 四月 2025 08:40:11 +0800 Subject: [PATCH] 修改 --- src/views/firework/warehouse/index.vue | 114 +++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 78 insertions(+), 36 deletions(-) diff --git a/src/views/firework/warehouse/index.vue b/src/views/firework/warehouse/index.vue index 52eaff2..e56b188 100644 --- a/src/views/firework/warehouse/index.vue +++ b/src/views/firework/warehouse/index.vue @@ -9,41 +9,65 @@ icon="Plus" @click="addProject('add',{})" > - 新增 + 新增仓库 </el-button> </el-form-item> - <!-- <el-form-item label="姓名:" >--> - <!-- <el-input v-model="data.queryParams.name" placeholder="请输入姓名"></el-input>--> - <!-- </el-form-item>--> - <!-- <el-form-item >--> - <!-- <el-button--> - <!-- type="primary"--> - <!-- @click="getList"--> - <!-- >查询</el-button>--> - <!-- <el-button--> - <!-- type="primary"--> - <!-- plain--> - <!-- @click="reset"--> - <!-- >重置</el-button>--> - <!-- </el-form-item>--> + <el-form-item label="区域:" style="display: flex;align-items: center"> + <div style="margin: 10px"> + <div class="basic_search" > + <el-select v-model="queryParams.filter.provinceCode" clearable filterable > + <el-option v-for="item in data.provinceList" :key="item.id" :label="item.name" :value="item.code"> + </el-option> + </el-select> + </div> +<!-- <div class="basic_search" style="display:inline-block">--> +<!-- <el-select v-model="params.city" prop="city" clearable filterable @change="changeArea('city')">--> +<!-- <el-option v-for="item in cityList" :key="item.id" :label="item.name" :value="item.name">--> +<!-- </el-option>--> +<!-- </el-select>--> +<!-- </div>--> +<!-- <div class="basic_search" style="display:inline-block">--> +<!-- <el-select v-model="params.district" clearable filterable>--> +<!-- <el-option v-for="item in districtList" :key="item.id" :label="item.name" :value="item.name">--> +<!-- </el-option>--> +<!-- </el-select>--> +<!-- </div>--> + </div> + </el-form-item> + <el-form-item > + <el-button + type="primary" + @click="getList" + >查询</el-button> + <el-button + type="primary" + plain + @click="reset" + >重置</el-button> + </el-form-item> </el-form> </div> <!-- 表格数据 --> <el-table v-loading="loading" :data="dataList" :border="true"> <el-table-column label="序号" type="index" align="center" width="80" /> - <el-table-column label="仓库名称" prop="name" align="center" /> - <el-table-column label="仓库编号" prop="type" align="center" /> - <el-table-column label="面积" prop="phone" align="center" /> - <el-table-column label="危险等级" prop="createBy" align="center" /> - <el-table-column label="核定药量" prop="createBy" align="center" /> - <el-table-column label="核定人员" prop="updateBy" align="center" /> - <el-table-column label="创建人" prop="createTime" align="center" /> - <el-table-column label="创建时间" prop="updateTime" align="center" /> + <el-table-column label="仓库名称" prop="storeName" align="center" /> + <el-table-column label="仓库编号" prop="storeNum" align="center" /> + <el-table-column label="面积" prop="acreage" align="center" /> + <el-table-column label="危险等级" prop="dangerLevel" align="center" > + <template #default="scope"> + <span>{{scope.row.dangerLevel == 1 ? '1.1级库房' :scope.row.dangerLevel == 2? '1.3级库房' : '无药库房'}}</span> + </template> + </el-table-column> + <el-table-column label="核定药量" prop="dosage" align="center" /> + <el-table-column label="核定人员数量" prop="personLimit" align="center" width="120"/> + <el-table-column label="创建人" prop="createBy" align="center" /> + <el-table-column label="创建时间" prop="createDate" align="center" width="120"/> <el-table-column label="修改人" prop="updateBy" align="center" /> - <el-table-column label="修改时间" prop="updateTime" align="center" /> - <el-table-column label="操作" align="center" class-name="small-padding fixed-width" > + <el-table-column label="修改时间" prop="updateDate" align="center" width="120"/> + <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180"> <template #default="scope"> <el-button link type="primary" @click="addProject('edit',scope.row)">编辑</el-button> + <el-button link type="primary" @click="handleRoom(scope.row)">管理库房</el-button> <el-button link type="danger" @click="handleDelete(scope.row)">删除</el-button> </template> </el-table-column> @@ -56,6 +80,7 @@ @pagination="getList" /> <warehouseDialog ref="dialogRef" @getList="getList"></warehouseDialog> + <room-dialog ref="roomRef" @getList="getList"></room-dialog> </div> </template> @@ -63,12 +88,15 @@ import {getCurrentInstance, onMounted, onUnmounted, reactive, ref, toRefs} from "vue"; import {ElMessage, ElMessageBox} from "element-plus"; import warehouseDialog from './components/warehouseDialog.vue' -import {delTemplate, getTemplate} from "@/api/signAgreement/template"; -import {getWarning} from "@/api/company/warning"; +import roomDialog from './components/roomDialog.vue' import Cookies from "js-cookie"; +import {delWarehouse, getWarehouse} from "@/api/company/warehouse"; +import {subPixelOptimize} from "zrender/lib/graphic/helper/subPixelOptimize"; +import {getProvinceListData} from "@/api/company/area"; const { proxy } = getCurrentInstance(); const loading = ref(false); const dialogRef = ref(); +const roomRef = ref() const createSignRef = ref(); const data = reactive({ queryParams: { @@ -76,19 +104,22 @@ pageSize: 10, filter: { companyName: '', - companyCode: '' + companyCode: '', + provinceCode: '' } }, total: 0, - dataList: [] + dataList: [], + provinceList: [] }); const { queryParams, total, dataList } = toRefs(data); const classHourRef = ref(); -onMounted(()=>{ +onMounted(async ()=>{ const info = JSON.parse(Cookies.get('userInfo')) data.queryParams.filter.companyCode = info.companynumber - getList() + await getProvince() + await getList() }) onUnmounted(()=>{ @@ -98,9 +129,15 @@ const addProject = (type,value) => { dialogRef.value.openDialog(type,value) } +const getProvince = async () =>{ + let res = await getProvinceListData() + if(res.code == 200){ + data.provinceList = res.result.provinceList + } +} const getList = async () => { loading.value = true - const res = await getWarning(data.queryParams) + const res = await getWarehouse(data.queryParams) if(res.code == 200){ data.dataList = res.result.records data.total = res.result.total @@ -117,7 +154,8 @@ pageSize: 10, filter: { companyName: '', - companyCode: '' + companyCode: '', + provinceCode: '' } } getList() @@ -132,7 +170,10 @@ type: 'warning', }) .then( async() => { - const res = await delTemplate(val.id) + const param = { + id: val.id + } + const res = await delWarehouse(param) if(res.code == 200){ ElMessage.success('数据删除成功') await getList() @@ -142,8 +183,9 @@ }) } - - +const handleRoom = (val) => { + roomRef.value.openDialog(val) +} const getRowKeys = (row) => { return row.name } -- Gitblit v1.9.2