Browse Source

Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

master_hella_20240701
陈薪名 9 months ago
parent
commit
3aff9bd907
  1. 64
      src/api/wms/itemarea/index.ts
  2. 54
      src/api/wms/itemwarehouse/index.ts
  3. 244
      src/views/wms/basicDataManage/itemarea/index.vue
  4. 167
      src/views/wms/basicDataManage/itemarea/itemarea.data.ts
  5. 244
      src/views/wms/basicDataManage/itemwarehouse/index.vue
  6. 126
      src/views/wms/basicDataManage/itemwarehouse/itemwarehouse.data.ts

64
src/api/wms/itemarea/index.ts

@ -0,0 +1,64 @@
import request from '@/config/axios'
export interface ItemareaVO {
id: number
itemCode: string
areaCode: string
inPackUnit: string
outPackUnit: string
maxQty: number
minQty: number
safeQty: number
autoRepleinsh: string
repleinshFromArea: string
repleinshQty: number
needReceive: string
available: string
activeTime: Date
expireTime: Date
remark: string
manageMode: string
newlyToOutpackunit: string
surplusToOutpackunit: string
}
// 查询物料库区配置列表
export const getItemareaPage = async (params) => {
if (params.isSearch) {
delete params.isSearch
const data = {...params}
return await request.post({ url: '/wms/itemarea/senior', data })
} else {
return await request.get({ url: `/wms/itemarea/page`, params })
}
}
// 查询物料库区配置详情
export const getItemarea = async (id: number) => {
return await request.get({ url: `/wms/itemarea/get?id=` + id })
}
// 新增物料库区配置
export const createItemarea = async (data: ItemareaVO) => {
return await request.post({ url: `/wms/itemarea/create`, data })
}
// 修改物料库区配置
export const updateItemarea = async (data: ItemareaVO) => {
return await request.put({ url: `/wms/itemarea/update`, data })
}
// 删除物料库区配置
export const deleteItemarea = async (id: number) => {
return await request.delete({ url: `/wms/itemarea/delete?id=` + id })
}
// 导出物料库区配置 Excel
export const exportItemarea = async (params) => {
return await request.download({ url: `/wms/itemarea/export-excel`, params })
}
// 下载用户导入模板
export const importTemplate = () => {
return request.download({ url: '/wms/itemarea/get-import-template' })
}

54
src/api/wms/itemwarehouse/index.ts

@ -0,0 +1,54 @@
import request from '@/config/axios'
export interface ItemwarehouseVO {
id: number
itemCode: string
warehouseCode: string
manageMode: string
packUnit: string
available: string
activeTime: Date
expireTime: Date
remark: string
}
// 查询物料仓库默认配置列表
export const getItemwarehousePage = async (params) => {
if (params.isSearch) {
delete params.isSearch
const data = {...params}
return await request.post({ url: '/wms/itemwarehouse/senior', data })
} else {
return await request.get({ url: `/wms/itemwarehouse/page`, params })
}
}
// 查询物料仓库默认配置详情
export const getItemwarehouse = async (id: number) => {
return await request.get({ url: `/wms/itemwarehouse/get?id=` + id })
}
// 新增物料仓库默认配置
export const createItemwarehouse = async (data: ItemwarehouseVO) => {
return await request.post({ url: `/wms/itemwarehouse/create`, data })
}
// 修改物料仓库默认配置
export const updateItemwarehouse = async (data: ItemwarehouseVO) => {
return await request.put({ url: `/wms/itemwarehouse/update`, data })
}
// 删除物料仓库默认配置
export const deleteItemwarehouse = async (id: number) => {
return await request.delete({ url: `/wms/itemwarehouse/delete?id=` + id })
}
// 导出物料仓库默认配置 Excel
export const exportItemwarehouse = async (params) => {
return await request.download({ url: `/wms/itemwarehouse/export-excel`, params })
}
// 下载用户导入模板
export const importTemplate = () => {
return request.download({ url: '/wms/itemwarehouse/get-import-template' })
}

244
src/views/wms/basicDataManage/itemarea/index.vue

@ -0,0 +1,244 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="Itemarea.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
<TableHead
:HeadButttondata="HeadButttondata"
@button-base-click="buttonBaseClick"
:routeName="routeName"
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="Itemarea.allSchemas"
/>
<!-- 列表 -->
<ContentWrap>
<Table
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"
:pagination="{
total: tableObject.total
}"
v-model:pageSize="tableObject.pageSize"
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
<template #code="{row}">
<el-button type="primary" link @click="openDetail(row, '代码', row.code)">
<span>{{ row.code }}</span>
</el-button>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<BasicForm
ref="basicFormRef"
@success="formsSuccess"
:rules="ItemareaRules"
:formAllSchemas="Itemarea.allSchemas"
:apiUpdate="ItemareaApi.updateItemarea"
:apiCreate="ItemareaApi.createItemarea"
@searchTableSuccess="searchTableSuccess"
:isBusiness="false"
/>
<!-- 详情 -->
<Detail ref="detailRef" :isBasic="true" :allSchemas="Itemarea.allSchemas" />
<!-- 导入 -->
<ImportForm ref="importFormRef" url="/wms/itemarea/import" :importTemplateData="importTemplateData" @success="importSuccess" />
</template>
<script setup lang="ts">
import download from '@/utils/download'
import { Itemarea,ItemareaRules } from './itemarea.data'
import * as ItemareaApi from '@/api/wms/itemarea'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/components/Detail/src/Detail.vue'
defineOptions({ name: 'Itemarea' })
const message = useMessage() //
const { t } = useI18n() //
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(Itemarea.allSchemas.tableColumns)
//
const searchTableSuccess = (formField, searchField, val, formRef) => {
nextTick(() => {
const setV = {}
setV[formField] = val[0][searchField]
formRef.setValues(setV)
})
}
//
const updataTableColumns = (val) => {
tableColumns.value = val
}
const { tableObject, tableMethods } = useTable({
getListApi: ItemareaApi.getItemareaPage //
})
//
const { getList, setSearchParams } = tableMethods
//
const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:itemarea:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:itemarea:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:itemarea:export'}), //
defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), //
// {
// label: '',
// name: 'zdy',
// hide: false,
// type: 'primary',
// icon: 'Select',
// color: ''
// },
]
//
const buttonBaseClick = (val, item) => {
if (val == 'add') { //
openForm('create')
} else if (val == 'import') { //
handleImport()
} else if (val == 'export') { //
handleExport()
} else if (val == 'refresh') { //
getList()
} else if (val == 'filtrate') { //
} else { //
console.log('其他按钮', item)
}
}
// -
const butttondata = [
defaultButtons.mainListEditBtn({hasPermi:'wms:itemarea:update'}), //
defaultButtons.mainListDeleteBtn({hasPermi:'wms:itemarea:delete'}), //
]
// -
const buttonTableClick = async (val, row) => {
if (val == 'edit') { //
openForm('update', row)
} else if (val == 'delete') { //
handleDelete(row.id)
}
}
/** 添加/修改操作 */
const basicFormRef = ref()
const openForm = (type: string, row?: any) => {
basicFormRef.value.open(type, row)
}
// form
const formsSuccess = async (formType,data) => {
var isHave =Itemarea.allSchemas.formSchema.some(function (item) {
return item.field === 'activeTime' || item.field === 'expireTime';
});
if(isHave){
if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
message.error('失效时间要大于生效时间')
return;
}
}
if(data.activeTime==0)data.activeTime = null;
if(data.expireTime==0)data.expireTime = null;
if (formType === 'create') {
await ItemareaApi.createItemarea(data)
message.success(t('common.createSuccess'))
} else {
await ItemareaApi.updateItemarea(data)
message.success(t('common.updateSuccess'))
}
basicFormRef.value.dialogVisible = false
getList()
}
/** 详情操作 */
const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
detailRef.value.openDetail(row, titleName, titleValue, 'basicItemarea')
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
//
await message.delConfirm()
//
await ItemareaApi.deleteItemarea(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
/** 导出按钮操作 */
const exportLoading = ref(false) //
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await ItemareaApi.exportItemarea(tableObject.params)
download.excel(data, '物料库区配置.xlsx')
} catch {
} finally {
exportLoading.value = false
}
}
/** 导入 */
const importFormRef = ref()
const handleImport = () => {
importFormRef.value.open()
}
//
const importTemplateData = reactive({
templateUrl: '',
templateTitle: '物料库区配置导入模版.xlsx'
})
//
const importSuccess = () => {
getList()
}
//
const searchFormClick = (searchData) => {
tableObject.params = {
isSearch: true,
filters: searchData.filters
}
getList() //
}
/** 初始化 **/
onMounted(async () => {
getList()
importTemplateData.templateUrl = await ItemareaApi.importTemplate()
})
</script>

167
src/views/wms/basicDataManage/itemarea/itemarea.data.ts

@ -0,0 +1,167 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
// 表单校验
export const ItemareaRules = reactive({
itemCode: [required],
areaCode: [required],
inPackUnit: [required],
outPackUnit: [required],
needReceive: [required],
available: [required],
manageMode: [required],
})
export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
{
label: 'id',
field: 'id',
sort: 'custom',
isForm: false,
},
{
label: '物品代码',
field: 'itemCode',
sort: 'custom',
isSearch: true,
},
{
label: '区域代码',
field: 'areaCode',
sort: 'custom',
isSearch: true,
},
{
label: '入库包装规格',
field: 'inPackUnit',
sort: 'custom',
},
{
label: '出库包装规格',
field: 'outPackUnit',
sort: 'custom',
},
{
label: '最高库存数量(0 为无限)',
field: 'maxQty',
sort: 'custom',
},
{
label: '最低库存数量',
field: 'minQty',
sort: 'custom',
},
{
label: '安全预警库存数量',
field: 'safeQty',
sort: 'custom',
},
{
label: '是否自动补料',
field: 'autoRepleinsh',
sort: 'custom',
},
{
label: '补料来源库区',
field: 'repleinshFromArea',
sort: 'custom',
},
{
label: '补料数量',
field: 'repleinshQty',
sort: 'custom',
},
{
label: '需要接收确认',
field: 'needReceive',
sort: 'custom',
},
{
label: '是否可用',
field: 'available',
sort: 'custom',
isSearch: true,
},
{
label: '生效时间',
field: 'activeTime',
sort: 'custom',
formatter: dateFormatter,
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
valueFormat: 'x'
}
},
},
{
label: '失效时间',
field: 'expireTime',
sort: 'custom',
formatter: dateFormatter,
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
valueFormat: 'x'
}
},
},
{
label: '备注',
field: 'remark',
sort: 'custom',
},
{
label: '创建时间',
field: 'createTime',
sort: 'custom',
formatter: dateFormatter,
isForm: false,
},
{
label: '创建者ID',
field: 'creator',
sort: 'custom',
isForm: false,
},
{
label: '最后更新时间',
field: 'updateTime',
sort: 'custom',
formatter: dateFormatter,
isForm: false,
},
{
label: '最后更新者ID',
field: 'updater',
sort: 'custom',
isForm: false,
},
{
label: '管理精度',
field: 'manageMode',
sort: 'custom',
isSearch: true,
},
{
label: '入库后库存自动转换为出库包装规格',
field: 'newlyToOutpackunit',
sort: 'custom',
},
{
label: '出库后剩余库存自动转换为出库包装规格 出库后剩余库存自动转换为出库包装规格',
field: 'surplusToOutpackunit',
sort: 'custom',
},
{
label: '操作',
field: 'action',
isForm: false,
table: {
width: 150,
fixed: 'right'
}
}
]))

244
src/views/wms/basicDataManage/itemwarehouse/index.vue

@ -0,0 +1,244 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="Itemwarehouse.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
<TableHead
:HeadButttondata="HeadButttondata"
@button-base-click="buttonBaseClick"
:routeName="routeName"
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="Itemwarehouse.allSchemas"
/>
<!-- 列表 -->
<ContentWrap>
<Table
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"
:pagination="{
total: tableObject.total
}"
v-model:pageSize="tableObject.pageSize"
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
<template #code="{row}">
<el-button type="primary" link @click="openDetail(row, '代码', row.code)">
<span>{{ row.code }}</span>
</el-button>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<BasicForm
ref="basicFormRef"
@success="formsSuccess"
:rules="ItemwarehouseRules"
:formAllSchemas="Itemwarehouse.allSchemas"
:apiUpdate="ItemwarehouseApi.updateItemwarehouse"
:apiCreate="ItemwarehouseApi.createItemwarehouse"
@searchTableSuccess="searchTableSuccess"
:isBusiness="false"
/>
<!-- 详情 -->
<Detail ref="detailRef" :isBasic="true" :allSchemas="Itemwarehouse.allSchemas" />
<!-- 导入 -->
<ImportForm ref="importFormRef" url="/wms/itemwarehouse/import" :importTemplateData="importTemplateData" @success="importSuccess" />
</template>
<script setup lang="ts">
import download from '@/utils/download'
import { Itemwarehouse,ItemwarehouseRules } from './itemwarehouse.data'
import * as ItemwarehouseApi from '@/api/wms/itemwarehouse'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/components/Detail/src/Detail.vue'
defineOptions({ name: 'Itemwarehouse' })
const message = useMessage() //
const { t } = useI18n() //
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(Itemwarehouse.allSchemas.tableColumns)
//
const searchTableSuccess = (formField, searchField, val, formRef) => {
nextTick(() => {
const setV = {}
setV[formField] = val[0][searchField]
formRef.setValues(setV)
})
}
//
const updataTableColumns = (val) => {
tableColumns.value = val
}
const { tableObject, tableMethods } = useTable({
getListApi: ItemwarehouseApi.getItemwarehousePage //
})
//
const { getList, setSearchParams } = tableMethods
//
const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:itemwarehouse:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:itemwarehouse:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:itemwarehouse:export'}), //
defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), //
// {
// label: '',
// name: 'zdy',
// hide: false,
// type: 'primary',
// icon: 'Select',
// color: ''
// },
]
//
const buttonBaseClick = (val, item) => {
if (val == 'add') { //
openForm('create')
} else if (val == 'import') { //
handleImport()
} else if (val == 'export') { //
handleExport()
} else if (val == 'refresh') { //
getList()
} else if (val == 'filtrate') { //
} else { //
console.log('其他按钮', item)
}
}
// -
const butttondata = [
defaultButtons.mainListEditBtn({hasPermi:'wms:itemwarehouse:update'}), //
defaultButtons.mainListDeleteBtn({hasPermi:'wms:itemwarehouse:delete'}), //
]
// -
const buttonTableClick = async (val, row) => {
if (val == 'edit') { //
openForm('update', row)
} else if (val == 'delete') { //
handleDelete(row.id)
}
}
/** 添加/修改操作 */
const basicFormRef = ref()
const openForm = (type: string, row?: any) => {
basicFormRef.value.open(type, row)
}
// form
const formsSuccess = async (formType,data) => {
var isHave =Itemwarehouse.allSchemas.formSchema.some(function (item) {
return item.field === 'activeTime' || item.field === 'expireTime';
});
if(isHave){
if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
message.error('失效时间要大于生效时间')
return;
}
}
if(data.activeTime==0)data.activeTime = null;
if(data.expireTime==0)data.expireTime = null;
if (formType === 'create') {
await ItemwarehouseApi.createItemwarehouse(data)
message.success(t('common.createSuccess'))
} else {
await ItemwarehouseApi.updateItemwarehouse(data)
message.success(t('common.updateSuccess'))
}
basicFormRef.value.dialogVisible = false
getList()
}
/** 详情操作 */
const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
detailRef.value.openDetail(row, titleName, titleValue, 'basicItemwarehouse')
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
//
await message.delConfirm()
//
await ItemwarehouseApi.deleteItemwarehouse(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
/** 导出按钮操作 */
const exportLoading = ref(false) //
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await ItemwarehouseApi.exportItemwarehouse(tableObject.params)
download.excel(data, '物料仓库默认配置.xlsx')
} catch {
} finally {
exportLoading.value = false
}
}
/** 导入 */
const importFormRef = ref()
const handleImport = () => {
importFormRef.value.open()
}
//
const importTemplateData = reactive({
templateUrl: '',
templateTitle: '物料仓库默认配置导入模版.xlsx'
})
//
const importSuccess = () => {
getList()
}
//
const searchFormClick = (searchData) => {
tableObject.params = {
isSearch: true,
filters: searchData.filters
}
getList() //
}
/** 初始化 **/
onMounted(async () => {
getList()
importTemplateData.templateUrl = await ItemwarehouseApi.importTemplate()
})
</script>

126
src/views/wms/basicDataManage/itemwarehouse/itemwarehouse.data.ts

@ -0,0 +1,126 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
// 表单校验
export const ItemwarehouseRules = reactive({
itemCode: [required],
warehouseCode: [required],
manageMode: [required],
packUnit: [required],
available: [required],
})
export const Itemwarehouse = useCrudSchemas(reactive<CrudSchema[]>([
{
label: 'id',
field: 'id',
sort: 'custom',
isForm: false,
},
{
label: '物品代码',
field: 'itemCode',
sort: 'custom',
isSearch: true,
},
{
label: '区域代码',
field: 'warehouseCode',
sort: 'custom',
isSearch: true,
},
{
label: '管理精度',
field: 'manageMode',
sort: 'custom',
isSearch: true,
},
{
label: '入库包装规格',
field: 'packUnit',
sort: 'custom',
},
{
label: '是否可用',
field: 'available',
sort: 'custom',
},
{
label: '生效时间',
field: 'activeTime',
sort: 'custom',
formatter: dateFormatter,
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
valueFormat: 'x'
}
},
},
{
label: '失效时间',
field: 'expireTime',
sort: 'custom',
formatter: dateFormatter,
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
valueFormat: 'x'
}
},
},
{
label: '备注',
field: 'remark',
sort: 'custom',
},
{
label: '创建时间',
field: 'createTime',
sort: 'custom',
formatter: dateFormatter,
isForm: false,
},
{
label: '删除时间',
field: 'deletionTime',
sort: 'custom',
formatter: dateFormatter,
isForm: false,
},
{
label: '删除者ID',
field: 'deleterId',
sort: 'custom',
isForm: false,
},
{
label: '扩展属性',
field: 'extraProperties',
sort: 'custom',
isForm: false,
},
{
label: '并发乐观锁',
field: 'concurrencyStamp',
sort: 'custom',
isForm: false,
},
{
label: '地点ID',
field: 'siteId',
sort: 'custom',
isForm: false,
},
{
label: '操作',
field: 'action',
isForm: false,
table: {
width: 150,
fixed: 'right'
}
}
]))
Loading…
Cancel
Save