yunxi
/
mes-heli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

库区功能实装

Browse Source 
库区功能实装
master
siontion 9 months ago
parent 3c41ace543
commit 785d8550cd
2 changed files with 94 additions and 157 deletions
Show Stats Download Patch File Download Diff File

52
mes-ui/mes-ui-admin-vue3/src/views/heli/rg/RgForm.vue
Unescape View File

@ -7,23 +7,26 @@
label-width="100px"
v-loading="formLoading"
>
<el-form-item label="库区编号，唯一" prop="rgNo">
<el-input v-model="formData.rgNo" placeholder="请输入库区编号，唯一" />
<el-form-item label="库区编码" prop="rgNo">
<el-input v-model="formData.rgNo" placeholder="库区编码" required />
</el-form-item>
<el-form-item label="库区名称，唯一" prop="rgName">
<el-input v-model="formData.rgName" placeholder="请输入库区名称，唯一" />
<el-form-item label="库区名称" prop="rgName">
<el-input v-model="formData.rgName" placeholder="库区名称" required/>
</el-form-item>
<el-form-item label="仓库 Id，对应 wms_wh 表中的Id" prop="whId">
<el-select v-model="formData.whId" placeholder="请选择仓库 Id，对应 wms_wh 表中的Id">
<el-option label="请选择字典生成" value="" />
<el-form-item label="所属仓库" prop="whId">
<el-select v-model="formData.whId" clearable class="!w-700px">
<el-option v-for="dict in warehouseList" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="描述信息" prop="descr">
<el-input v-model="formData.descr" placeholder="请输入描述信息" />
</el-form-item>
<el-form-item label="状态,1 表示正常，2 表示禁用" prop="rgStatus">
<el-form-item label="状态" prop="rgStatus">
<el-radio-group v-model="formData.rgStatus">
<el-radio label="1">请选择字典生成</el-radio>
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_STATUS)"
:key="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
@ -35,6 +38,8 @@
</template>
<script setup lang="ts">
import * as RgApi from '@/api/heli/rg'
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import * as WarehouseApi from '@/api/heli/warehouse'
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
@ -52,14 +57,29 @@ const formData = ref({
rgStatus: undefined,
})
const formRules = reactive({
rgNo: [{ required: true, message: '库区编号，唯一不能为空', trigger: 'blur' }],
whId: [{ required: true, message: '仓库 Id，对应 wms_wh 表中的Id不能为空', trigger: 'change' }],
rgStatus: [{ required: true, message: '状态,1 表示正常，2 表示禁用不能为空', trigger: 'blur' }],
rgNo: [{ required: true, message: '库区编码不能为空', trigger: 'blur' }],
rgName: [{ required: true, message: '库区名称不能为空', trigger: 'blur' }],
whId: [{ required: true, message: '所属仓库不能为空', trigger: 'change' }],
})
const formRef = ref() // 表单 Ref
const warehouseList = ref([])
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
const queryParamsWarehouse = reactive({
pageNo: 1,
pageSize: 99
})
const data = await WarehouseApi.getWarehousePage(queryParamsWarehouse)
data.list.forEach(element => {
element.label = element.whName
element.value = element.id
});
warehouseList.value = data.list
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
@ -108,7 +128,7 @@ const resetForm = () => {
rgName: undefined,
whId: undefined,
descr: undefined,
rgStatus: undefined,
rgStatus: 1,
}
formRef.value?.resetFields()
}

199
mes-ui/mes-ui-admin-vue3/src/views/heli/rg/index.vue
Unescape View File

@ -1,110 +1,34 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<el-form-item label="库区编号，唯一" prop="rgNo">
<el-input
v-model="queryParams.rgNo"
placeholder="请输入库区编号，唯一"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
<el-form-item label="库区编码" prop="rgNo">
<el-input v-model="queryParams.rgNo" placeholder="库区编码" clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item label="库区名称，唯一" prop="rgName">
<el-input
v-model="queryParams.rgName"
placeholder="请输入库区名称，唯一"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
<el-form-item label="库区名称" prop="rgName">
<el-input v-model="queryParams.rgName" placeholder="库区名称" clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item label="仓库 Id，对应 wms_wh 表中的Id" prop="whId">
<el-select
v-model="queryParams.whId"
placeholder="请选择仓库 Id，对应 wms_wh 表中的Id"
clearable
class="!w-240px"
>
<el-option label="请选择字典生成" value="" />
<el-form-item label="所属仓库" prop="whId">
<el-select v-model="queryParams.whId" placeholder="下拉选择" clearable class="!w-240px">
<el-option v-for="dict in warehouseList" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="状态,1 表示正常，2 表示禁用" prop="rgStatus">
<el-select
v-model="queryParams.rgStatus"
placeholder="请选择状态,1 表示正常，2 表示禁用"
clearable
class="!w-240px"
>
<el-option label="请选择字典生成" value="" />
<el-form-item label="启用状态" prop="rgStatus">
<el-select v-model="queryParams.rgStatus" placeholder="启用状态" clearable class="!w-240px">
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_STATUS)" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="记录的创建人,对应员工表中的 Id" prop="creator">
<el-input
v-model="queryParams.creator"
placeholder="请输入记录的创建人,对应员工表中的 Id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker
v-model="queryParams.createTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="记录的修改人,对应员工表中的 Id" prop="updater">
<el-input
v-model="queryParams.updater"
placeholder="请输入记录的修改人,对应员工表中的 Id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="更新时间" prop="updateTime">
<el-date-picker
v-model="queryParams.updateTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button
type="primary"
plain
@click="openForm('create')"
v-hasPermi="['heli:rg:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
<el-button @click="handleQuery">
<Icon icon="ep:search" class="mr-5px" /> 搜索
</el-button>
<el-button @click="resetQuery">
<Icon icon="ep:refresh" class="mr-5px" /> 重置
</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['heli:rg:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
<el-button type="primary" plain @click="openForm('create')" v-hasPermi="['heli:rg:create']">
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
</el-form-item>
</el-form>
@ -113,56 +37,32 @@
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="主键id" align="center" prop="id" />
<el-table-column label="库区编号，唯一" align="center" prop="rgNo" />
<el-table-column label="库区名称，唯一" align="center" prop="rgName" />
<el-table-column label="仓库 Id，对应 wms_wh 表中的Id" align="center" prop="whId" />
<el-table-column label="描述信息" align="center" prop="descr" />
<el-table-column label="状态,1 表示正常，2 表示禁用" align="center" prop="rgStatus" />
<el-table-column label="记录的创建人,对应员工表中的 Id" align="center" prop="creator" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="记录的修改人,对应员工表中的 Id" align="center" prop="updater" />
<el-table-column
label="更新时间"
align="center"
prop="updateTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="库区编码" align="center" prop="rgNo" />
<el-table-column label="库区名称" align="center" prop="rgName" />
<el-table-column label="所属仓库" align="center" prop="whId" >
<template #default="scope">
{{ warehouseList.find((tag) => tag.id === scope.row.whId)?.whName }}
</template>
</el-table-column>
<el-table-column label="启用状态" align="center" prop="rgStatus" >
<template #default="scope">
<dict-tag :type="DICT_TYPE.HELI_COMMON_STATUS" :value="scope.row.rgStatus" />
</template>
</el-table-column>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['heli:rg:update']"
>
<el-button link type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['heli:rg:update']">
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['heli:rg:delete']"
>
<!-- <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['heli:rg:delete']">
删除
</el-button>
</el-button> -->
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
<Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
@pagination="getList" />
</ContentWrap>
<!-- 表单弹窗：添加/修改 -->
@ -170,10 +70,13 @@
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import * as RgApi from '@/api/heli/rg'
import RgForm from './RgForm.vue'
import * as WarehouseApi from '@/api/heli/warehouse'
defineOptions({ name: 'Rg' })
@ -189,7 +92,7 @@ const queryParams = reactive({
rgNo: undefined,
rgName: undefined,
whId: undefined,
rgStatus: undefined,
rgStatus: 1,
creator: undefined,
createTime: [],
updater: undefined,
@ -197,6 +100,7 @@ const queryParams = reactive({
})
const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中
const warehouseList = ref([])
/** 查询列表 */
const getList = async () => {
@ -238,7 +142,7 @@ const handleDelete = async (id: number) => {
message.success(t('common.delSuccess'))
// 刷新列表
await getList()
} catch {}
} catch { }
}
/** 导出按钮操作 */
@ -257,7 +161,20 @@ const handleExport = async () => {
}
/** 初始化 **/
onMounted(() => {
getList()
onMounted(async () => {
const queryParamsWarehouse = reactive({
pageNo: 1,
pageSize: 99
})
const data = await WarehouseApi.getWarehousePage(queryParamsWarehouse)
data.list.forEach(element => {
element.label = element.whName
element.value = element.id
});
warehouseList.value = data.list
await getList()
})
</script>
Write Preview
Loading…
Cancel
Save