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

Merge remote-tracking branch 'origin/master'

Browse Source
master
zengchenxi 9 months ago
parent 297c3fb486 fe60526eb9
commit 102069255e
7 changed files with 54 additions and 39 deletions
Show Stats Download Patch File Download Diff File

2
mes-ui/mes-ui-admin-vue3/src/views/heli/mouldtype/index.vue
Unescape View File

@ -1,7 +1,7 @@
<template> <template>
<el-card class="hl-card"> <el-card class="hl-card">
<template #header> <template #header>
<span>摸具类型</span> <span>模具类型</span>
</template> </template>
<ContentWrap class="borderxx"> <ContentWrap class="borderxx">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->

14
mes-ui/mes-ui-admin-vue3/src/views/heli/pn/PnForm.vue
Unescape View File

@ -1,25 +1,25 @@
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="700px">
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"
:rules="formRules" :rules="formRules"
label-width="100px" label-width="108px"
v-loading="formLoading" v-loading="formLoading"
> >
<el-form-item label="库位编码" prop="pnNo"> <el-form-item label="库位编码" prop="pnNo">
<el-input v-model="formData.pnNo" placeholder="库位编码" /> <el-input v-model="formData.pnNo" placeholder="库位编码" class="!w-500px" />
</el-form-item> </el-form-item>
<el-form-item label="库位名称" prop="pnName"> <el-form-item label="库位名称" prop="pnName">
<el-input v-model="formData.pnName" placeholder="请库位名称" /> <el-input v-model="formData.pnName" placeholder="请库位名称" class="!w-500px" />
</el-form-item> </el-form-item>
<el-form-item label="所属仓库" prop="whId"> <el-form-item label="所属仓库" prop="whId">
<el-select v-model="formData.whId" placeholder="下拉选择" clearable class="!w-240px" @change="handleWhChange"> <el-select v-model="formData.whId" placeholder="下拉选择" clearable class="!w-500px" @change="handleWhChange">
<el-option v-for="dict in whList" :key="dict.value" :label="dict.label" :value="dict.value" /> <el-option v-for="dict in whList" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="所属库区" prop="rgId"> <el-form-item label="所属库区" prop="rgId">
<el-select v-model="formData.rgId" placeholder="下拉选择" clearable class="!w-240px"> <el-select v-model="formData.rgId" placeholder="下拉选择" clearable class="!w-500px">
<el-option v-for="dict in rgSelected" :key="dict.value" :label="dict.label" :value="dict.value" /> <el-option v-for="dict in rgSelected" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -177,4 +177,4 @@ const resetForm = () => {
} }
formRef.value?.resetFields() formRef.value?.resetFields()
} }
</script> </script>

17
mes-ui/mes-ui-admin-vue3/src/views/heli/pn/index.vue
Unescape View File

@ -1,7 +1,11 @@
<template> <template>
<ContentWrap> <el-card class="hl-card">
<template #header>
<span>库位维护</span>
</template>
<ContentWrap class="borderxx">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px"> <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="108px">
<el-form-item label="库位编码" prop="pnNo"> <el-form-item label="库位编码" prop="pnNo">
<el-input v-model="queryParams.pnNo" placeholder="库位编码" clearable @keyup.enter="handleQuery" class="!w-240px" /> <el-input v-model="queryParams.pnNo" placeholder="库位编码" clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item> </el-form-item>
@ -25,7 +29,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="handleQuery"> <el-button @click="handleQuery" type="primary">
<Icon icon="ep:search" class="mr-5px" /> 搜索 <Icon icon="ep:search" class="mr-5px" /> 搜索
</el-button> </el-button>
<el-button @click="resetQuery"> <el-button @click="resetQuery">
@ -40,7 +44,7 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table">
<el-table-column label="库位编码" align="center" prop="pnNo" /> <el-table-column label="库位编码" align="center" prop="pnNo" />
<el-table-column label="库位名称" align="center" prop="pnName" /> <el-table-column label="库位名称" align="center" prop="pnName" />
<el-table-column label="所属仓库" align="center" prop="whId"> <el-table-column label="所属仓库" align="center" prop="whId">
@ -59,7 +63,7 @@
<dict-tag :type="DICT_TYPE.HELI_COMMON_STATUS" :value="scope.row.pnStatus" /> <dict-tag :type="DICT_TYPE.HELI_COMMON_STATUS" :value="scope.row.pnStatus" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180px" /> <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="220px" />
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template #default="scope"> <template #default="scope">
<el-button link type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['heli:pn:update']"> <el-button link type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['heli:pn:update']">
@ -76,6 +80,7 @@
@pagination="getList" /> @pagination="getList" />
</ContentWrap> </ContentWrap>
</el-card>
<!-- 表单弹窗：添加/修改 --> <!-- 表单弹窗：添加/修改 -->
<PnForm ref="formRef" @success="getList" /> <PnForm ref="formRef" @success="getList" />
</template> </template>
@ -216,4 +221,4 @@ onMounted(async () => {
await getList() await getList()
}) })
</script> </script>

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

@ -1,20 +1,20 @@
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="700px">
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"
:rules="formRules" :rules="formRules"
label-width="100px" label-width="108px"
v-loading="formLoading" v-loading="formLoading"
> >
<el-form-item label="库区编码" prop="rgNo"> <el-form-item label="库区编码" prop="rgNo">
<el-input v-model="formData.rgNo" placeholder="库区编码" required /> <el-input v-model="formData.rgNo" placeholder="库区编码" required class="!w-500px" />
</el-form-item> </el-form-item>
<el-form-item label="库区名称" prop="rgName"> <el-form-item label="库区名称" prop="rgName">
<el-input v-model="formData.rgName" placeholder="库区名称" required/> <el-input v-model="formData.rgName" placeholder="库区名称" required class="!w-500px"/>
</el-form-item> </el-form-item>
<el-form-item label="所属仓库" prop="whId"> <el-form-item label="所属仓库" prop="whId">
<el-select v-model="formData.whId" clearable class="!w-700px"> <el-select v-model="formData.whId" clearable class="!w-500px">
<el-option v-for="dict in warehouseList" :key="dict.value" :label="dict.label" :value="dict.value" /> <el-option v-for="dict in warehouseList" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -132,4 +132,4 @@ const resetForm = () => {
} }
formRef.value?.resetFields() formRef.value?.resetFields()
} }
</script> </script>

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

@ -1,7 +1,11 @@
<template> <template>
<ContentWrap> <el-card class="hl-card">
<template #header>
<span>库区维护</span>
</template>
<ContentWrap class="borderxx">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px"> <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="108px">
<el-form-item label="库区编码" prop="rgNo"> <el-form-item label="库区编码" prop="rgNo">
<el-input v-model="queryParams.rgNo" placeholder="库区编码" clearable @keyup.enter="handleQuery" class="!w-240px" /> <el-input v-model="queryParams.rgNo" placeholder="库区编码" clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item> </el-form-item>
@ -21,7 +25,7 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="handleQuery"> <el-button @click="handleQuery" type="primary">
<Icon icon="ep:search" class="mr-5px" /> 搜索 <Icon icon="ep:search" class="mr-5px" /> 搜索
</el-button> </el-button>
<el-button @click="resetQuery"> <el-button @click="resetQuery">
@ -36,7 +40,7 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table">
<el-table-column label="库区编码" align="center" prop="rgNo" /> <el-table-column label="库区编码" align="center" prop="rgNo" />
<el-table-column label="库区名称" align="center" prop="rgName" /> <el-table-column label="库区名称" align="center" prop="rgName" />
<el-table-column label="所属仓库" align="center" prop="whId" > <el-table-column label="所属仓库" align="center" prop="whId" >
@ -54,7 +58,7 @@
align="center" align="center"
prop="createTime" prop="createTime"
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" width="220px"
/> />
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template #default="scope"> <template #default="scope">
@ -72,6 +76,7 @@
@pagination="getList" /> @pagination="getList" />
</ContentWrap> </ContentWrap>
</el-card>
<!-- 表单弹窗：添加/修改 --> <!-- 表单弹窗：添加/修改 -->
<RgForm ref="formRef" @success="getList" /> <RgForm ref="formRef" @success="getList" />
</template> </template>
@ -184,4 +189,4 @@ onMounted(async () => {
warehouseList.value = data.list warehouseList.value = data.list
await getList() await getList()
}) })
</script> </script>

14
mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/WarehouseForm.vue
Unescape View File

@ -1,23 +1,23 @@
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="700px">
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"
:rules="formRules" :rules="formRules"
label-width="100px" label-width="108px"
v-loading="formLoading" v-loading="formLoading"
> >
<el-form-item label="仓库编号" prop="whNo"> <el-form-item label="仓库编号" prop="whNo">
<el-input v-model="formData.whNo" disabled /> <el-input v-model="formData.whNo" disabled class="!w-500px" />
</el-form-item> </el-form-item>
<el-form-item label="仓库名称" prop="whName"> <el-form-item label="仓库名称" prop="whName">
<el-input v-model="formData.whName" placeholder="请输入仓库名称" /> <el-input v-model="formData.whName" placeholder="请输入仓库名称" class="!w-500px" />
</el-form-item> </el-form-item>
<el-form-item label="联系人" prop="contact"> <el-form-item label="联系人" prop="contact">
<el-input v-model="formData.contact" placeholder="请输入联系人" /> <el-input v-model="formData.contact" placeholder="请输入联系人" class="!w-500px" />
</el-form-item> </el-form-item>
<el-form-item label="联系电话" prop="telephone"> <el-form-item label="联系电话" prop="telephone">
<el-input v-model="formData.telephone" placeholder="请输入联系电话" /> <el-input v-model="formData.telephone" placeholder="请输入联系电话" class="!w-500px" />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="whStatus"> <el-form-item label="状态" prop="whStatus">
<el-radio-group v-model="formData.whStatus"> <el-radio-group v-model="formData.whStatus">
@ -116,4 +116,4 @@ const resetForm = () => {
} }
formRef.value?.resetFields() formRef.value?.resetFields()
} }
</script> </script>

17
mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/index.vue
Unescape View File

@ -1,7 +1,11 @@
<template> <template>
<ContentWrap> <el-card class="hl-card">
<template #header>
<span>仓储设置</span>
</template>
<ContentWrap class="borderxx">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px"> <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="108px">
<el-form-item label="仓库编号" prop="whNo"> <el-form-item label="仓库编号" prop="whNo">
<el-input v-model="queryParams.whNo" placeholder="仓库编号" clearable @keyup.enter="handleQuery" class="!w-240px" /> <el-input v-model="queryParams.whNo" placeholder="仓库编号" clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item> </el-form-item>
@ -16,7 +20,7 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="handleQuery"> <el-button @click="handleQuery" type="primary">
<Icon icon="ep:search" class="mr-5px" /> 搜索 <Icon icon="ep:search" class="mr-5px" /> 搜索
</el-button> </el-button>
<el-button @click="resetQuery"> <el-button @click="resetQuery">
@ -35,7 +39,7 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table">
<el-table-column label="仓库编号" align="center" prop="whNo" /> <el-table-column label="仓库编号" align="center" prop="whNo" />
<el-table-column label="仓库名称" align="center" prop="whName" /> <el-table-column label="仓库名称" align="center" prop="whName" />
<el-table-column label="负责人" align="center" prop="contact" /> <el-table-column label="负责人" align="center" prop="contact" />
@ -45,7 +49,7 @@
<dict-tag :type="DICT_TYPE.HELI_COMMON_STATUS" :value="scope.row.whStatus" /> <dict-tag :type="DICT_TYPE.HELI_COMMON_STATUS" :value="scope.row.whStatus" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180px" /> <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="220px" />
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template #default="scope"> <template #default="scope">
<el-button link type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['heli:warehouse:update']"> <el-button link type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['heli:warehouse:update']">
@ -62,6 +66,7 @@
@pagination="getList" /> @pagination="getList" />
</ContentWrap> </ContentWrap>
</el-card>
<!-- 表单弹窗：添加/修改 --> <!-- 表单弹窗：添加/修改 -->
<WarehouseForm ref="formRef" @success="getList" /> <WarehouseForm ref="formRef" @success="getList" />
</template> </template>
@ -153,4 +158,4 @@ const handleExport = async () => {
onMounted(async () => { onMounted(async () => {
await getList() await getList()
}) })
</script> </script>

Write Preview
Loading…
Cancel
Save