仓储主子表页面修改

master
maxw@mesnac.com 1 month ago
parent 9f3d99445c
commit 736df1a77b

@ -0,0 +1,77 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { PsmStoreTypeVO, PsmStoreTypeForm, PsmStoreTypeQuery } from '@/api/wms/psmStoreType/types';
/**
*
* @param query
* @returns {*}
*/
export const listPsmStoreType = (query?: PsmStoreTypeQuery): AxiosPromise<PsmStoreTypeVO[]> => {
return request({
url: '/wms/psmStoreType/list',
method: 'get',
params: query
});
};
/**
*
* @param storeTypeId
*/
export const getPsmStoreType = (storeTypeId: string | number): AxiosPromise<PsmStoreTypeVO> => {
return request({
url: '/wms/psmStoreType/' + storeTypeId,
method: 'get'
});
};
/**
*
* @param data
*/
export const addPsmStoreType = (data: PsmStoreTypeForm) => {
return request({
url: '/wms/psmStoreType',
method: 'post',
data: data
});
};
/**
*
* @param data
*/
export const updatePsmStoreType = (data: PsmStoreTypeForm) => {
return request({
url: '/wms/psmStoreType',
method: 'put',
data: data
});
};
/**
*
* @param storeTypeId
*/
export const delPsmStoreType = (storeTypeId: string | number | Array<string | number>) => {
return request({
url: '/wms/psmStoreType/' + storeTypeId,
method: 'delete'
});
};
/**
*
* @param query
* @returns {*}
*/
export function getWmsPsmStoreTypeList (query) {
return request({
url: '/wms/psmStoreType/getWmsPsmStoreTypeList',
method: 'get',
params: query
});
};

@ -0,0 +1,91 @@
export interface PsmStoreTypeVO {
/**
*
*/
storeTypeId: string | number;
/**
*
*/
storeTypeCode: string;
/**
*
*/
storeTypeName: string;
/**
*
*/
checkGradeCode: string;
/**
*
*/
checkGradeName: string;
}
export interface PsmStoreTypeForm extends BaseEntity {
/**
*
*/
storeTypeId?: string | number;
/**
*
*/
storeTypeCode?: string;
/**
*
*/
storeTypeName?: string;
/**
*
*/
checkGradeCode?: string;
/**
*
*/
checkGradeName?: string;
}
export interface PsmStoreTypeQuery extends PageQuery {
/**
*
*/
storeTypeId?: string | number;
/**
*
*/
storeTypeCode?: string;
/**
*
*/
storeTypeName?: string;
/**
*
*/
checkGradeCode?: string;
/**
*
*/
checkGradeName?: string;
/**
*
*/
params?: any;
}

@ -67,7 +67,7 @@
<el-card shadow="never">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:hppInStockDetail:add']"></el-button>
</el-col>
<el-col :span="1.5">
@ -75,7 +75,7 @@
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:hppInStockDetail:remove']"></el-button>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:hppInStockDetail:export']"></el-button>
</el-col>

@ -57,7 +57,7 @@
<el-card shadow="never">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:hppOutStockDetail:add']"></el-button>
</el-col>
<el-col :span="1.5">
@ -65,7 +65,7 @@
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:hppOutStockDetail:remove']"></el-button>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:hppOutStockDetail:export']"></el-button>
</el-col>
@ -322,7 +322,7 @@ const handleDelete = async (row?: HppOutStockDetailVO) => {
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download('system/hppOutStockDetail/export', {
proxy?.download('wms/hppOutStockDetail/export', {
...queryParams.value
}, `hppOutStockDetail_${new Date().getTime()}.xlsx`)
}

@ -47,7 +47,7 @@
<el-card shadow="never">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:hppStorageDetail:add']"></el-button>
</el-col>
<el-col :span="1.5">
@ -55,7 +55,7 @@
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:hppStorageDetail:remove']"></el-button>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:hppStorageDetail:export']"></el-button>
</el-col>

@ -309,7 +309,7 @@ const handleDelete = async (row?: HppStoreVO) => {
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download('system/hppStore/export', {
proxy?.download('wms/hppStore/export', {
...queryParams.value
}, `hppStore_${new Date().getTime()}.xlsx`)
}

@ -93,7 +93,7 @@
<el-input v-model="form.storePlaceCode" placeholder="请输入库位代码" />
</el-form-item>
<el-form-item label="仓库id" prop="storeId">
<el-select v-model="form.objId" placeholder="请选择所属仓库">
<el-select v-model="form.storeId" placeholder="请选择所属仓库">
<el-option
v-for="item in StoreList"
:key="item.objId"
@ -207,9 +207,9 @@ const data = reactive<PageData<HppStorePlaceForm, HppStorePlaceQuery>>({
storePlaceCode: [
{ required: true, message: "库位代码不能为空", trigger: "blur" }
],
storeId: [
{ required: true, message: "仓库id不能为空", trigger: "blur" }
],
// storeId: [
// { required: true, message: "id", trigger: "blur" }
// ],
usedFlag: [
{ required: true, message: "使用状态不能为空", trigger: "blur" }
],
@ -234,6 +234,7 @@ const getList = async () => {
}
const getStoreList = async () => {
let res = await getWmsHppStoreList(null);
console.log(res.data)
StoreList.value = res.data;
};
/** 取消按钮 */
@ -312,7 +313,7 @@ const handleDelete = async (row?: HppStorePlaceVO) => {
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download('system/hppStorePlace/export', {
proxy?.download('wms/hppStorePlace/export', {
...queryParams.value
}, `hppStorePlace_${new Date().getTime()}.xlsx`)
}

@ -274,7 +274,7 @@ const handleDelete = async (row?: HsmToolingVO) => {
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download('system/hsmTooling/export', {
proxy?.download('wms/hsmTooling/export', {
...queryParams.value
}, `hsmTooling_${new Date().getTime()}.xlsx`)
}

@ -354,8 +354,8 @@
<el-dialog v-model="childrenTableInfoVisible" title="条码生成" width="40%">
<el-form :model="childrenTableInfoForm" label-width="120px">
<el-form-item label="物料" prop="materialId">
<el-select v-model="childrenTableInfoForm.materialId" placeholder="请选择物料">
<el-form-item label="物料" prop="materialCode">
<el-select v-model="childrenTableInfoForm.materialId" placeholder="请选择物料" :disabled="true">
<el-option
v-for="item in materialList"
:key="item.materialId"
@ -365,10 +365,10 @@
</el-select>
</el-form-item>
<el-form-item label="入库数量" prop="instockQty">
<el-input v-model="childrenTableInfoForm.instockQty" placeholder="请输入入库数量" />
<el-input v-model="childrenTableInfoForm.instockQty" placeholder="请输入入库数量" :disabled="true"/>
</el-form-item>
<el-form-item label="有无条码" prop="codeYesNo">
<el-radio-group v-model="childrenTableInfoForm.codeYesNo">
<el-radio-group v-model="childrenTableInfoForm.codeYesNo" :disabled="true">
<el-radio
v-for="dict in wms_barcode_if"
:key="dict.value"
@ -377,7 +377,7 @@
</el-radio-group>
</el-form-item>
<el-form-item label="已包数量" prop="printedNum">
<el-input v-model="childrenTableInfoForm.printedNum" placeholder="" />
<el-input v-model="childrenTableInfoForm.printedNum" placeholder="" :disabled="true"/>
</el-form-item>
<el-form-item label="分包数量" prop="printNum">
<el-input v-model="childrenTableInfoForm.printNum" placeholder="请输入分包数量" />
@ -474,6 +474,7 @@ listUser().then(e => {
/** 提交按钮 */
const submitForm = () => {
updateInstockDetail(childrenTableInfoForm.value).finally(() => childrenTableInfoVisible.value = false);
getChildrenTable({instockId: partntTableSelectCell.value.instockId})
}
//
@ -482,10 +483,11 @@ const getParentTable = async () => {
await listInstockOrder(queryForm.value).then(async (e) => {
parentTableLoad.value = false
parentTableData.value = e.rows
console.log(e.total)
parentTableTotal.value = e.total
if (e.rows.length > 0) {
parentTableRef.value.setCurrentRow(e.rows[0])
console.log(e.rows[0].instockId)
await getChildrenTable({instockId: e.rows[0].instockId})
} else {
childrenTableData.value = []
@ -500,7 +502,7 @@ const getChildrenTable = async (form) => {
await listInstockDetail(form).then(e => {
childrenTableLoad.value = false
childrenTableData.value = e.rows
parentTableTotal.value = e.total
// parentTableTotal.value = e.total
})
}
@ -617,7 +619,7 @@ const dialogSubmit = () => {
addInstockOrder(dialogForm.value).then(e => {
addInstockDetail(dialogtable.value.map(item => {
return {...item, instockCode: e.data.instockCode,instockId: e.data.instockId}
return {...item, instockCode: e.data.instockCode,instockId: e.data.instockId, materialCategories: e.data.materialCategories}
}
)
).then(v => {

@ -476,7 +476,7 @@ const getChildrenTable = async (form) => {
await allocateOrderDetailList(form).then(e => {
childrenTableLoad.value = false
childrenTableData.value = e.rows
parentTableTotal.value = e.total
// parentTableTotal.value = e.total
})
}

@ -194,20 +194,15 @@
</el-col>
</el-row>
<el-table :data="dialogtable" style="width: 100%">
<el-table-column label="字段1" prop="date" v-if="false">
<template #default="scope">
<el-select
v-model="scope.row.date"
placeholder="Select"
>
<el-option
v-for="i in material_mategories"
:label="i.materialName"
:value="i.materialId"
:key="i.materialId"
/>
</el-select>
</template>
<el-table-column label="物料大类" prop="materialCategories">
<el-select v-model="dialogForm.materialCategories" placeholder="" :disabled="true">
<el-option
v-for="dict in material_mategories"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-table-column>
<el-table-column label="物料名称" prop="materialId">
<template #default="scope">
@ -494,7 +489,7 @@ const getChildrenTable = async (form) => {
await listOutstockDetail(form).then(e => {
childrenTableLoad.value = false
childrenTableData.value = e.rows
parentTableTotal.value = e.total
// parentTableTotal.value = e.total
})
}
@ -611,7 +606,7 @@ const dialogSubmit = () => {
addOutstockOrder(dialogForm.value).then(e => {
addOutstockDetail(dialogtable.value.map(item => {
return {...item, outstockCode: e.data.outstockCode,outstockId: e.data.outstockId}
return {...item, outstockCode: e.data.outstockCode,outstockId: e.data.outstockId, materialCategories: e.data.materialCategories}
}
)
).then(v => {

@ -0,0 +1,269 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="仓库类型代码" prop="storeTypeCode">
<el-input v-model="queryParams.storeTypeCode" placeholder="请输入仓库类型代码" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="仓库类型名称" prop="storeTypeName">
<el-input v-model="queryParams.storeTypeName" placeholder="请输入仓库类型名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="存放品级编号" prop="checkGradeCode">
<el-input v-model="queryParams.checkGradeCode" placeholder="请输入存放品级编号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="存放品级名称" prop="checkGradeName">
<el-input v-model="queryParams.checkGradeName" placeholder="请输入存放品级名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
</el-card>
</div>
</transition>
<el-card shadow="never">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:psmStoreType:add']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:psmStoreType:edit']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:psmStoreType:remove']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:psmStoreType:export']"></el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="psmStoreTypeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="表主键" align="center" prop="storeTypeId" v-if="columns[0].visible"/> -->
<el-table-column label="仓库类型代码" align="center" prop="storeTypeCode" v-if="columns[7].visible"/>
<el-table-column label="仓库类型名称" align="center" prop="storeTypeName" v-if="columns[8].visible"/>
<el-table-column label="存放品级编号" align="center" prop="checkGradeCode" v-if="columns[9].visible"/>
<el-table-column label="存放品级名称" align="center" prop="checkGradeName" v-if="columns[10].visible"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:psmStoreType:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:psmStoreType:remove']"></el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改成品仓库类型对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="psmStoreTypeFormRef" :model="form" :rules="rules" label-width="80px">
<!-- <el-form-item label="表主键" prop="storeTypeId">
<el-input v-model="form.storeTypeId" placeholder="请输入表主键" />
</el-form-item> -->
<el-form-item label="仓库类型代码" prop="storeTypeCode">
<el-input v-model="form.storeTypeCode" placeholder="请输入仓库类型代码" />
</el-form-item>
<el-form-item label="仓库类型名称" prop="storeTypeName">
<el-input v-model="form.storeTypeName" placeholder="请输入仓库类型名称" />
</el-form-item>
<el-form-item label="存放品级编号" prop="checkGradeCode">
<el-input v-model="form.checkGradeCode" placeholder="请输入存放品级编号" />
</el-form-item>
<el-form-item label="存放品级名称" prop="checkGradeName">
<el-input v-model="form.checkGradeName" placeholder="请输入存放品级名称" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup name="PsmStoreType" lang="ts">
import { listPsmStoreType, getPsmStoreType, delPsmStoreType, addPsmStoreType, updatePsmStoreType } from '@/api/wms/psmStoreType';
import { PsmStoreTypeVO, PsmStoreTypeQuery, PsmStoreTypeForm } from '@/api/wms/psmStoreType/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const psmStoreTypeList = ref<PsmStoreTypeVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref<Array<string | number>>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const queryFormRef = ref<ElFormInstance>();
const psmStoreTypeFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
//
const columns = ref<FieldOption[]>([
{ key: 0, label: `表主键`, visible: true },
{ key: 1, label: `租户号`, visible: true },
{ key: 2, label: `创建人`, visible: true },
{ key: 3, label: `创建时间`, visible: true },
{ key: 4, label: `更新人`, visible: true },
{ key: 5, label: `更新时间`, visible: true },
{ key: 6, label: `创建部门`, visible: true },
{ key: 7, label: `仓库类型代码`, visible: true },
{ key: 8, label: `仓库类型名称`, visible: true },
{ key: 9, label: `存放品级编号`, visible: true },
{ key: 10, label: `存放品级名称`, visible: true },
]);
const initFormData: PsmStoreTypeForm = {
storeTypeId: undefined,
storeTypeCode: undefined,
storeTypeName: undefined,
checkGradeCode: undefined,
checkGradeName: undefined
}
const data = reactive<PageData<PsmStoreTypeForm, PsmStoreTypeQuery>>({
form: {...initFormData},
queryParams: {
pageNum: 1,
pageSize: 10,
storeTypeId: undefined,
storeTypeCode: undefined,
storeTypeName: undefined,
checkGradeCode: undefined,
checkGradeName: undefined,
params: {
}
},
rules: {
storeTypeId: [
{ required: true, message: "表主键不能为空", trigger: "blur" }
],
storeTypeCode: [
{ required: true, message: "仓库类型代码不能为空", trigger: "blur" }
],
storeTypeName: [
{ required: true, message: "仓库类型名称不能为空", trigger: "blur" }
],
checkGradeCode: [
{ required: true, message: "存放品级编号不能为空", trigger: "blur" }
],
checkGradeName: [
{ required: true, message: "存放品级名称不能为空", trigger: "blur" }
]
}
});
const { queryParams, form, rules } = toRefs(data);
/** 查询成品仓库类型列表 */
const getList = async () => {
loading.value = true;
const res = await listPsmStoreType(queryParams.value);
psmStoreTypeList.value = res.rows;
total.value = res.total;
loading.value = false;
}
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
}
/** 表单重置 */
const reset = () => {
form.value = {...initFormData};
psmStoreTypeFormRef.value?.resetFields();
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
}
/** 多选框选中数据 */
const handleSelectionChange = (selection: PsmStoreTypeVO[]) => {
ids.value = selection.map(item => item.storeTypeId);
single.value = selection.length != 1;
multiple.value = !selection.length;
}
/** 新增按钮操作 */
const handleAdd = () => {
reset();
dialog.visible = true;
dialog.title = "添加成品仓库类型";
}
/** 修改按钮操作 */
const handleUpdate = async (row?: PsmStoreTypeVO) => {
reset();
const _storeTypeId = row?.storeTypeId || ids.value[0]
const res = await getPsmStoreType(_storeTypeId);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = "修改成品仓库类型";
}
/** 提交按钮 */
const submitForm = () => {
psmStoreTypeFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.storeTypeId) {
await updatePsmStoreType(form.value).finally(() => buttonLoading.value = false);
} else {
await addPsmStoreType(form.value).finally(() => buttonLoading.value = false);
}
proxy?.$modal.msgSuccess("操作成功");
dialog.visible = false;
await getList();
}
});
}
/** 删除按钮操作 */
const handleDelete = async (row?: PsmStoreTypeVO) => {
const _storeTypeIds = row?.storeTypeId || ids.value;
await proxy?.$modal.confirm('是否确认删除成品仓库类型编号为"' + _storeTypeIds + '"的数据项?').finally(() => loading.value = false);
await delPsmStoreType(_storeTypeIds);
proxy?.$modal.msgSuccess("删除成功");
await getList();
}
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download('wms/psmStoreType/export', {
...queryParams.value
}, `psmStoreType_${new Date().getTime()}.xlsx`)
}
onMounted(() => {
getList();
});
</script>
Loading…
Cancel
Save