fix(wms): 修复新增物料表后入库、库存等功能的逻辑
parent
a49aa62760
commit
80cd8b33be
@ -0,0 +1,76 @@
|
|||||||
|
import request from '@/utils/request';
|
||||||
|
import { AxiosPromise } from 'axios';
|
||||||
|
import { WmsBaseProductForm, WmsBaseProductQuery, WmsBaseProductVO } from '@/api/wms/wmsBaseProduct/types';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询海威成品信息列表
|
||||||
|
* @param query
|
||||||
|
* @returns {*}
|
||||||
|
*/
|
||||||
|
|
||||||
|
export const listWmsBaseProduct = (query?: WmsBaseProductQuery): AxiosPromise<WmsBaseProductVO[]> => {
|
||||||
|
return request({
|
||||||
|
url: '/wms/wmsBaseProduct/list',
|
||||||
|
method: 'get',
|
||||||
|
params: query
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询海威成品信息详细
|
||||||
|
* @param productId
|
||||||
|
*/
|
||||||
|
export const getWmsBaseProduct = (productId: string | number): AxiosPromise<WmsBaseProductVO> => {
|
||||||
|
return request({
|
||||||
|
url: '/wms/wmsBaseProduct/' + productId,
|
||||||
|
method: 'get'
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 新增海威成品信息
|
||||||
|
* @param data
|
||||||
|
*/
|
||||||
|
export const addWmsBaseProduct = (data: WmsBaseProductForm) => {
|
||||||
|
return request({
|
||||||
|
url: '/wms/wmsBaseProduct',
|
||||||
|
method: 'post',
|
||||||
|
data: data
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 修改海威成品信息
|
||||||
|
* @param data
|
||||||
|
*/
|
||||||
|
export const updateWmsBaseProduct = (data: WmsBaseProductForm) => {
|
||||||
|
return request({
|
||||||
|
url: '/wms/wmsBaseProduct',
|
||||||
|
method: 'put',
|
||||||
|
data: data
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 删除海威成品信息
|
||||||
|
* @param productId
|
||||||
|
*/
|
||||||
|
export const delWmsBaseProduct = (productId: string | number | Array<string | number>) => {
|
||||||
|
return request({
|
||||||
|
url: '/wms/wmsBaseProduct/' + productId,
|
||||||
|
method: 'delete'
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 下拉框查询海威成品信息列表
|
||||||
|
* @param query
|
||||||
|
* @returns {*}
|
||||||
|
*/
|
||||||
|
export function getWmsBaseProductList(query) {
|
||||||
|
return request({
|
||||||
|
url: '/wms/wmsBaseProduct/getWmsBaseProductList',
|
||||||
|
method: 'get',
|
||||||
|
params: query
|
||||||
|
});
|
||||||
|
}
|
||||||
@ -0,0 +1,265 @@
|
|||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<el-dialog v-model="productDialog.visible.value" :title="productDialog.title.value" width="80%" append-to-body>
|
||||||
|
<el-row :gutter="20">
|
||||||
|
<el-col :span="24">
|
||||||
|
<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" label-width="100px">
|
||||||
|
<el-form-item label="成品编码" prop="productCode">
|
||||||
|
<el-input v-model="queryParams.productCode" placeholder="请输入成品编码" clearable @keyup.enter="handleQuery" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="成品名称" prop="productName">
|
||||||
|
<el-input v-model="queryParams.productName" placeholder="请输入成品名称" clearable @keyup.enter="handleQuery" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="激活标识" prop="activeFlag">
|
||||||
|
<el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable>
|
||||||
|
<el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value" />
|
||||||
|
</el-select>
|
||||||
|
</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="hover">
|
||||||
|
<template v-if="prop.multiple" #header>
|
||||||
|
<el-tag v-for="product in selectProductList" :key="product.productId" closable style="margin: 2px" @close="handleCloseTag(product)">
|
||||||
|
{{ product.productName }}
|
||||||
|
</el-tag>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<vxe-table
|
||||||
|
ref="tableRef"
|
||||||
|
height="400px"
|
||||||
|
border
|
||||||
|
show-overflow
|
||||||
|
:data="wmsBaseProductList"
|
||||||
|
:loading="loading"
|
||||||
|
:row-config="{ keyField: 'productId', isHover: true }"
|
||||||
|
:checkbox-config="{ reserve: true, trigger: 'row', highlight: true, showHeader: prop.multiple }"
|
||||||
|
@checkbox-all="handleCheckboxAll"
|
||||||
|
@checkbox-change="handleCheckboxChange"
|
||||||
|
>
|
||||||
|
<vxe-column type="checkbox" width="50" align="center" />
|
||||||
|
<vxe-column key="productCode" title="成品编码" align="center" field="productCode" />
|
||||||
|
<vxe-column key="productName" title="成品名称" align="center" field="productName" />
|
||||||
|
<vxe-column key="productSpe" title="成品描述" align="center" field="productSpe" />
|
||||||
|
<vxe-column key="unitName" title="单位" align="center" field="unitName" />
|
||||||
|
<vxe-column key="purchasePrice" title="参考成本" align="center" field="purchasePrice" />
|
||||||
|
<vxe-column key="foreignPrice" title="统一报价(参考)" align="center" field="foreignPrice" />
|
||||||
|
<vxe-column key="stockingPeriod" title="备货期(天)" align="center" field="stockingPeriod" />
|
||||||
|
<vxe-column key="activeFlag" title="激活标识" align="center">
|
||||||
|
<template #default="scope">
|
||||||
|
<dict-tag :options="active_flag" :value="scope.row.activeFlag"></dict-tag>
|
||||||
|
</template>
|
||||||
|
</vxe-column>
|
||||||
|
</vxe-table>
|
||||||
|
|
||||||
|
<pagination
|
||||||
|
v-show="total > 0"
|
||||||
|
v-model:page="queryParams.pageNum"
|
||||||
|
v-model:limit="queryParams.pageSize"
|
||||||
|
:total="total"
|
||||||
|
@pagination="pageList"
|
||||||
|
/>
|
||||||
|
</el-card>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
|
||||||
|
<template #footer>
|
||||||
|
<el-button @click="close">取消</el-button>
|
||||||
|
<el-button type="primary" @click="confirm">确定</el-button>
|
||||||
|
</template>
|
||||||
|
</el-dialog>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { listWmsBaseProduct } from '@/api/wms/wmsBaseProduct';
|
||||||
|
import { WmsBaseProductQuery, WmsBaseProductVO } from '@/api/wms/wmsBaseProduct/types';
|
||||||
|
import { VxeTableInstance } from 'vxe-table';
|
||||||
|
import useDialog from '@/hooks/useDialog';
|
||||||
|
import { getCurrentInstance, nextTick, onMounted, reactive, ref, toRefs, watch, computed } from 'vue';
|
||||||
|
|
||||||
|
interface PropType {
|
||||||
|
modelValue?: WmsBaseProductVO[] | WmsBaseProductVO | undefined;
|
||||||
|
multiple?: boolean;
|
||||||
|
data?: string | number | (string | number)[] | undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
const prop = withDefaults(defineProps<PropType>(), {
|
||||||
|
multiple: true,
|
||||||
|
modelValue: undefined,
|
||||||
|
data: undefined
|
||||||
|
});
|
||||||
|
const emit = defineEmits(['update:modelValue', 'confirmCallBack']);
|
||||||
|
|
||||||
|
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
||||||
|
const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
|
||||||
|
|
||||||
|
const wmsBaseProductList = ref<WmsBaseProductVO[]>([]);
|
||||||
|
const loading = ref(true);
|
||||||
|
const showSearch = ref(true);
|
||||||
|
const total = ref(0);
|
||||||
|
const selectProductList = ref<WmsBaseProductVO[]>([]);
|
||||||
|
|
||||||
|
const queryFormRef = ref<ElFormInstance>();
|
||||||
|
const tableRef = ref<VxeTableInstance<WmsBaseProductVO>>();
|
||||||
|
|
||||||
|
const productDialog = useDialog({
|
||||||
|
title: '成品选择'
|
||||||
|
});
|
||||||
|
|
||||||
|
const queryParams = ref<WmsBaseProductQuery>({
|
||||||
|
pageNum: 1,
|
||||||
|
pageSize: 10,
|
||||||
|
productCode: undefined,
|
||||||
|
productName: undefined,
|
||||||
|
activeFlag: undefined,
|
||||||
|
params: {}
|
||||||
|
});
|
||||||
|
|
||||||
|
const defaultSelectProductIds = computed(() => computedIds(prop.data));
|
||||||
|
|
||||||
|
const confirm = () => {
|
||||||
|
emit('update:modelValue', selectProductList.value);
|
||||||
|
emit('confirmCallBack', selectProductList.value);
|
||||||
|
productDialog.closeDialog();
|
||||||
|
};
|
||||||
|
|
||||||
|
const computedIds = (data) => {
|
||||||
|
if (data === '' || data === null || data === undefined) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
if (data instanceof Array) {
|
||||||
|
return data.map((item) => String(item));
|
||||||
|
} else if (typeof data === 'string') {
|
||||||
|
return data.split(',');
|
||||||
|
} else if (typeof data === 'number') {
|
||||||
|
return [String(data)];
|
||||||
|
} else {
|
||||||
|
console.warn('<ProductSelect> 未支持的数据类型');
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 查询成品信息列表 */
|
||||||
|
const getList = async () => {
|
||||||
|
loading.value = true;
|
||||||
|
try {
|
||||||
|
const res = await listWmsBaseProduct(queryParams.value);
|
||||||
|
wmsBaseProductList.value = res.rows;
|
||||||
|
total.value = res.total;
|
||||||
|
} catch (error) {
|
||||||
|
console.error('查询成品列表失败:', error);
|
||||||
|
} finally {
|
||||||
|
loading.value = false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const pageList = async () => {
|
||||||
|
await getList();
|
||||||
|
const products = wmsBaseProductList.value.filter((item) => {
|
||||||
|
return selectProductList.value.some((product) => product.productId === item.productId);
|
||||||
|
});
|
||||||
|
await tableRef.value?.setCheckboxRow(products, true);
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 搜索按钮操作 */
|
||||||
|
const handleQuery = () => {
|
||||||
|
queryParams.value.pageNum = 1;
|
||||||
|
getList();
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 重置按钮操作 */
|
||||||
|
const resetQuery = () => {
|
||||||
|
queryFormRef.value?.resetFields();
|
||||||
|
queryParams.value.pageNum = 1;
|
||||||
|
queryParams.value.productCode = undefined;
|
||||||
|
queryParams.value.productName = undefined;
|
||||||
|
queryParams.value.activeFlag = undefined;
|
||||||
|
handleQuery();
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleCheckboxChange = (checked) => {
|
||||||
|
if (!prop.multiple && checked.checked) {
|
||||||
|
tableRef.value?.setCheckboxRow(selectProductList.value, false);
|
||||||
|
selectProductList.value = [];
|
||||||
|
}
|
||||||
|
const row = checked.row;
|
||||||
|
if (checked.checked) {
|
||||||
|
selectProductList.value.push(row);
|
||||||
|
} else {
|
||||||
|
selectProductList.value = selectProductList.value.filter((item) => {
|
||||||
|
return item.productId !== row.productId;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleCheckboxAll = (checked) => {
|
||||||
|
const rows = wmsBaseProductList.value;
|
||||||
|
if (checked.checked) {
|
||||||
|
rows.forEach((row) => {
|
||||||
|
if (!selectProductList.value.some((item) => item.productId === row.productId)) {
|
||||||
|
selectProductList.value.push(row);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
selectProductList.value = selectProductList.value.filter((item) => {
|
||||||
|
return !rows.some((row) => row.productId === item.productId);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleCloseTag = (product: WmsBaseProductVO) => {
|
||||||
|
const productId = product.productId;
|
||||||
|
const index = selectProductList.value.findIndex((item) => item.productId === productId);
|
||||||
|
if (index > -1) {
|
||||||
|
const row = selectProductList.value[index];
|
||||||
|
tableRef.value?.setCheckboxRow(row, false);
|
||||||
|
selectProductList.value.splice(index, 1);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const initSelectProduct = async () => {
|
||||||
|
if (defaultSelectProductIds.value.length > 0) {
|
||||||
|
const products = wmsBaseProductList.value.filter((item) => {
|
||||||
|
return defaultSelectProductIds.value.includes(String(item.productId));
|
||||||
|
});
|
||||||
|
selectProductList.value = products;
|
||||||
|
await nextTick(() => {
|
||||||
|
tableRef.value?.setCheckboxRow(products, true);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const close = () => {
|
||||||
|
productDialog.closeDialog();
|
||||||
|
};
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => productDialog.visible.value,
|
||||||
|
async (newValue: boolean) => {
|
||||||
|
if (newValue) {
|
||||||
|
await getList();
|
||||||
|
await initSelectProduct();
|
||||||
|
} else {
|
||||||
|
tableRef.value?.clearCheckboxReserve();
|
||||||
|
tableRef.value?.clearCheckboxRow();
|
||||||
|
resetQuery();
|
||||||
|
selectProductList.value = [];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
defineExpose({
|
||||||
|
open: productDialog.openDialog,
|
||||||
|
close: productDialog.closeDialog
|
||||||
|
});
|
||||||
|
</script>
|
||||||
@ -0,0 +1,198 @@
|
|||||||
|
<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" label-width="100px">
|
||||||
|
<!-- <el-form-item label="库位编码" prop="locationCode">
|
||||||
|
<el-input v-model="queryParams.locationCode" placeholder="请输入库位编码" clearable @keyup.enter="handleQuery" />
|
||||||
|
</el-form-item>-->
|
||||||
|
<el-form-item label="成品编码" prop="productCode">
|
||||||
|
<el-input v-model="queryParams.productCode" placeholder="请输入成品编码" clearable @keyup.enter="handleQuery" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="成品名称" prop="productName">
|
||||||
|
<el-input v-model="queryParams.productName" placeholder="请输入成品名称" clearable @keyup.enter="handleQuery" />
|
||||||
|
</el-form-item>
|
||||||
|
|
||||||
|
<el-form-item label="选择仓库" prop="warehouseId">
|
||||||
|
<el-select v-model="queryParams.warehouseId" placeholder="请选择仓库" clearable>
|
||||||
|
<el-option v-for="item in warehouseList" :key="item.warehouseId" :label="item.warehouseName" :value="item.warehouseId" />
|
||||||
|
</el-select>
|
||||||
|
</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">
|
||||||
|
<el-table
|
||||||
|
ref="childTable"
|
||||||
|
v-loading="loading"
|
||||||
|
border
|
||||||
|
:data="inventoryDetailsList"
|
||||||
|
@expand-change="selectChildList"
|
||||||
|
:row-key="(row) => row.materielId"
|
||||||
|
>
|
||||||
|
<!-- 添加展开列 -->
|
||||||
|
<el-table-column type="expand" width="55">
|
||||||
|
<template #default="{ row }">
|
||||||
|
<el-table border :data="row.data" v-loading="row.loading" style="width: 95%; margin: 0 auto">
|
||||||
|
<el-table-column label="库位编码" align="center" prop="locationCode" />
|
||||||
|
<el-table-column label="批次号" align="center" prop="batchNumber" />
|
||||||
|
<el-table-column label="库存数量" align="center" prop="inventoryAmount" />
|
||||||
|
<el-table-column label="库存数量" align="center" prop="inventoryAmount" />
|
||||||
|
<!-- <el-table-column label="锁定数量" align="center" prop="lockedAmount" />-->
|
||||||
|
|
||||||
|
<el-table-column label="创建时间" align="center" prop="createTime" />
|
||||||
|
</el-table>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
|
||||||
|
<el-table-column label="所属仓库" align="center" prop="warehouseName" v-if="columns[3].visible" />
|
||||||
|
<el-table-column label="成品编码" align="center" prop="productCode" v-if="columns[4].visible" />
|
||||||
|
<el-table-column label="成品名称" align="center" prop="productName" v-if="columns[4].visible" />
|
||||||
|
<el-table-column label="成品描述" align="center" prop="productSpe" v-if="columns[4].visible" />
|
||||||
|
<el-table-column label="外部品牌" align="center" prop="externalBrand" v-if="columns[4].visible" />
|
||||||
|
<el-table-column label="库存数量" align="center" prop="inventoryAmount" v-if="columns[6].visible" />
|
||||||
|
</el-table>
|
||||||
|
|
||||||
|
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
|
||||||
|
</el-card>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup name="InventoryDetails" lang="ts">
|
||||||
|
import { getWmsInventoryDetailsList, listCountQuery } from '@/api/wms/inventoryDetails';
|
||||||
|
import { InventoryDetailsForm, InventoryDetailsQuery, InventoryDetailsVO } from '@/api/wms/inventoryDetails/types';
|
||||||
|
import { getWmsWarehouseInfoList } from '@/api/wms/warehouseInfo';
|
||||||
|
|
||||||
|
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
||||||
|
const { use_state } = toRefs<any>(proxy?.useDict('use_state'));
|
||||||
|
|
||||||
|
const inventoryDetailsList = ref<InventoryDetailsVO[]>([]);
|
||||||
|
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 warehouseList = ref([]);
|
||||||
|
const childTable = ref([]);
|
||||||
|
const queryFormRef = ref<ElFormInstance>();
|
||||||
|
const inventoryDetailsFormRef = ref<ElFormInstance>();
|
||||||
|
|
||||||
|
const getWarehouseList = async () => {
|
||||||
|
const res = await getWmsWarehouseInfoList();
|
||||||
|
warehouseList.value = res.data;
|
||||||
|
};
|
||||||
|
const dialog = reactive<DialogOption>({
|
||||||
|
visible: false,
|
||||||
|
title: ''
|
||||||
|
});
|
||||||
|
|
||||||
|
// 列显隐信息
|
||||||
|
const columns = ref<FieldOption[]>([
|
||||||
|
{ key: 0, label: `库存ID`, visible: false },
|
||||||
|
{ key: 1, label: `租户编号`, visible: false },
|
||||||
|
{ key: 2, label: `库位编码`, visible: false },
|
||||||
|
{ key: 3, label: `仓库ID`, visible: true },
|
||||||
|
{ key: 4, label: `物料ID`, visible: true },
|
||||||
|
{ key: 5, label: `批次号`, visible: true },
|
||||||
|
{ key: 6, label: `库存数量`, visible: true },
|
||||||
|
{ key: 7, label: `锁定数量`, visible: true },
|
||||||
|
{ key: 8, label: `备注`, visible: false },
|
||||||
|
{ key: 9, label: `删除标志`, visible: true },
|
||||||
|
{ key: 10, label: `创建部门`, visible: true },
|
||||||
|
{ key: 11, label: `创建人`, visible: true },
|
||||||
|
{ key: 12, label: `创建时间`, visible: true },
|
||||||
|
{ key: 13, label: `更新人`, visible: true },
|
||||||
|
{ key: 14, label: `更新时间`, visible: true }
|
||||||
|
]);
|
||||||
|
|
||||||
|
const initFormData: InventoryDetailsForm = {
|
||||||
|
inventoryDetailsId: undefined,
|
||||||
|
locationCode: undefined,
|
||||||
|
warehouseId: undefined,
|
||||||
|
materielId: undefined,
|
||||||
|
batchNumber: undefined,
|
||||||
|
inventoryAmount: undefined,
|
||||||
|
lockedAmount: undefined,
|
||||||
|
remark: undefined
|
||||||
|
};
|
||||||
|
const data = reactive<PageData<InventoryDetailsForm, InventoryDetailsQuery>>({
|
||||||
|
form: { ...initFormData },
|
||||||
|
queryParams: {
|
||||||
|
pageNum: 1,
|
||||||
|
pageSize: 10,
|
||||||
|
locationCode: undefined,
|
||||||
|
productCode: undefined,
|
||||||
|
productName: undefined,
|
||||||
|
warehouseId: undefined,
|
||||||
|
materielId: undefined,
|
||||||
|
batchNumber: undefined,
|
||||||
|
inventoryAmount: undefined,
|
||||||
|
lockedAmount: undefined,
|
||||||
|
params: {}
|
||||||
|
},
|
||||||
|
rules: {}
|
||||||
|
});
|
||||||
|
|
||||||
|
const { queryParams, form, rules } = toRefs(data);
|
||||||
|
|
||||||
|
// 展开行的处理
|
||||||
|
const selectChildList = async (row, expandedRows) => {
|
||||||
|
if (expandedRows.length && !row.data) {
|
||||||
|
row.loading = true;
|
||||||
|
const res = await getWmsInventoryDetailsList({
|
||||||
|
materielId: row.materielId,
|
||||||
|
warehouseId: row.warehouseId
|
||||||
|
});
|
||||||
|
row.data = res.data;
|
||||||
|
row.loading = false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 查询库存明细列表 */
|
||||||
|
const getList = async () => {
|
||||||
|
loading.value = true;
|
||||||
|
const res = await listCountQuery(queryParams.value);
|
||||||
|
inventoryDetailsList.value = res.rows;
|
||||||
|
total.value = res.total;
|
||||||
|
loading.value = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 取消按钮 */
|
||||||
|
const cancel = () => {
|
||||||
|
reset();
|
||||||
|
dialog.visible = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 表单重置 */
|
||||||
|
const reset = () => {
|
||||||
|
form.value = { ...initFormData };
|
||||||
|
inventoryDetailsFormRef.value?.resetFields();
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 搜索按钮操作 */
|
||||||
|
const handleQuery = () => {
|
||||||
|
queryParams.value.pageNum = 1;
|
||||||
|
getList();
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 重置按钮操作 */
|
||||||
|
const resetQuery = () => {
|
||||||
|
queryFormRef.value?.resetFields();
|
||||||
|
handleQuery();
|
||||||
|
};
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
getList();
|
||||||
|
getWarehouseList();
|
||||||
|
});
|
||||||
|
</script>
|
||||||
@ -0,0 +1,318 @@
|
|||||||
|
<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" label-width="100px">
|
||||||
|
<el-form-item label="成品编码" prop="productCode">
|
||||||
|
<el-input v-model="queryParams.productCode" placeholder="请输入成品编码" clearable @keyup.enter="handleQuery" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="成品名称" prop="productName">
|
||||||
|
<el-input v-model="queryParams.productName" placeholder="请输入成品名称" clearable @keyup.enter="handleQuery" />
|
||||||
|
</el-form-item>
|
||||||
|
|
||||||
|
<el-form-item label="激活标识" prop="activeFlag">
|
||||||
|
<el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable>
|
||||||
|
<el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value" />
|
||||||
|
</el-select>
|
||||||
|
</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="['wms:wmsBaseProduct:add']"> 新增 </el-button>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="1.5">
|
||||||
|
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['wms:wmsBaseProduct:edit']"
|
||||||
|
>修改
|
||||||
|
</el-button>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="1.5">
|
||||||
|
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['wms:wmsBaseProduct:remove']"
|
||||||
|
>删除
|
||||||
|
</el-button>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="1.5">
|
||||||
|
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['wms:wmsBaseProduct: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" border :data="wmsBaseProductList" @selection-change="handleSelectionChange">
|
||||||
|
<el-table-column type="selection" width="55" align="center" />
|
||||||
|
<el-table-column label="物料ID" align="center" prop="productId" v-if="columns[0].visible" />
|
||||||
|
<el-table-column label="租户编号" align="center" prop="tenantId" v-if="columns[1].visible" />
|
||||||
|
<el-table-column label="成品编码" align="center" prop="productCode" v-if="columns[2].visible" />
|
||||||
|
<el-table-column label="成品名称" align="center" prop="productName" v-if="columns[3].visible" />
|
||||||
|
<el-table-column label="外部品牌规格" align="center" prop="externalBrand" v-if="columns[3].visible" />
|
||||||
|
<el-table-column label="成品描述" align="center" prop="productSpe" v-if="columns[4].visible" />
|
||||||
|
<el-table-column label="单位" align="center" prop="unitName" v-if="columns[5].visible" />
|
||||||
|
<el-table-column label="参考成本" align="center" prop="purchasePrice" v-if="columns[6].visible" />
|
||||||
|
<el-table-column label="统一报价(参考)" align="center" prop="foreignPrice" v-if="columns[7].visible" />
|
||||||
|
<el-table-column label="备货期(天)" align="center" prop="stockingPeriod" v-if="columns[8].visible" />
|
||||||
|
<el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[9].visible">
|
||||||
|
<template #default="scope">
|
||||||
|
<dict-tag :options="active_flag" :value="scope.row.activeFlag" />
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="创建部门" align="center" prop="createDept" v-if="columns[10].visible" />
|
||||||
|
<el-table-column label="创建人" align="center" prop="createBy" v-if="columns[11].visible" />
|
||||||
|
<el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[12].visible">
|
||||||
|
<template #default="scope">
|
||||||
|
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[13].visible" />
|
||||||
|
<el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[14].visible">
|
||||||
|
<template #default="scope">
|
||||||
|
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="操作" align="center" fixed="right" 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="['wms:wmsBaseProduct:edit']"></el-button>
|
||||||
|
</el-tooltip>
|
||||||
|
<el-tooltip content="删除" placement="top">
|
||||||
|
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:wmsBaseProduct: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="wmsBaseProductFormRef" :model="form" :rules="rules" label-width="120px">
|
||||||
|
<el-form-item label="成品编码" prop="productCode">
|
||||||
|
<el-input v-model="form.productCode" placeholder="请输入成品编码" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="成品名称" prop="productName">
|
||||||
|
<el-input v-model="form.productName" placeholder="请输入成品名称" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="成品描述" prop="productSpe">
|
||||||
|
<el-input v-model="form.productSpe" type="textarea" placeholder="请输入内容" />
|
||||||
|
</el-form-item>
|
||||||
|
|
||||||
|
<el-form-item label="外部品牌规格" prop="externalBrand">
|
||||||
|
<el-input v-model="form.externalBrand" placeholder="请输入外部品牌规格" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="单位" prop="unitId">
|
||||||
|
<el-select v-model="form.unitId" placeholder="请选择单位">
|
||||||
|
<el-option v-for="dict in unitInfoList" :key="dict.unitId" :label="dict.unitName" :value="dict.unitId"></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="参考成本" prop="purchasePrice">
|
||||||
|
<el-input v-model="form.purchasePrice" placeholder="请输入参考成本" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="统一报价(参考)" prop="foreignPrice">
|
||||||
|
<el-input v-model="form.foreignPrice" placeholder="请输入统一报价(参考)" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="备货期" prop="stockingPeriod">
|
||||||
|
<el-input v-model="form.stockingPeriod" placeholder="请输入备货期" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="激活标识" prop="activeFlag">
|
||||||
|
<el-select v-model="form.activeFlag" placeholder="请选择激活标识">
|
||||||
|
<el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
|
||||||
|
</el-select>
|
||||||
|
</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="WmsBaseProduct" lang="ts">
|
||||||
|
import { addWmsBaseProduct, delWmsBaseProduct, getWmsBaseProduct, listWmsBaseProduct, updateWmsBaseProduct } from '@/api/wms/wmsBaseProduct';
|
||||||
|
import { WmsBaseProductForm, WmsBaseProductQuery, WmsBaseProductVO } from '@/api/wms/wmsBaseProduct/types';
|
||||||
|
import { getBaseUnitInfoList } from '@/api/oa/base/unitInfo';
|
||||||
|
|
||||||
|
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
||||||
|
const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
|
||||||
|
|
||||||
|
const wmsBaseProductList = ref<WmsBaseProductVO[]>([]);
|
||||||
|
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 wmsBaseProductFormRef = ref<ElFormInstance>();
|
||||||
|
|
||||||
|
const dialog = reactive<DialogOption>({
|
||||||
|
visible: false,
|
||||||
|
title: ''
|
||||||
|
});
|
||||||
|
|
||||||
|
// 列显隐信息
|
||||||
|
const columns = ref<FieldOption[]>([
|
||||||
|
{ key: 0, label: `物料ID`, visible: false },
|
||||||
|
{ key: 1, label: `租户编号`, visible: false },
|
||||||
|
{ 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: false },
|
||||||
|
{ key: 11, label: `创建人`, visible: false },
|
||||||
|
{ key: 12, label: `创建时间`, visible: true },
|
||||||
|
{ key: 13, label: `更新人`, visible: false },
|
||||||
|
{ key: 14, label: `更新时间`, visible: true }
|
||||||
|
]);
|
||||||
|
|
||||||
|
const initFormData: WmsBaseProductForm = {
|
||||||
|
productId: undefined,
|
||||||
|
productCode: undefined,
|
||||||
|
productName: undefined,
|
||||||
|
productSpe: undefined,
|
||||||
|
unitId: undefined,
|
||||||
|
purchasePrice: undefined,
|
||||||
|
foreignPrice: undefined,
|
||||||
|
stockingPeriod: undefined,
|
||||||
|
activeFlag: undefined
|
||||||
|
};
|
||||||
|
const data = reactive<PageData<WmsBaseProductForm, WmsBaseProductQuery>>({
|
||||||
|
form: { ...initFormData },
|
||||||
|
queryParams: {
|
||||||
|
pageNum: 1,
|
||||||
|
pageSize: 10,
|
||||||
|
productCode: undefined,
|
||||||
|
productName: undefined,
|
||||||
|
activeFlag: undefined,
|
||||||
|
params: {}
|
||||||
|
},
|
||||||
|
rules: {
|
||||||
|
// productId: [{ required: true, message: '物料ID不能为空', trigger: 'blur' }],
|
||||||
|
productName: [{ required: true, message: '成品名称不能为空', trigger: 'blur' }],
|
||||||
|
unitId: [{ required: true, message: '单位不能为空', trigger: 'change' }]
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const { queryParams, form, rules } = toRefs(data);
|
||||||
|
/** 查询单位信息下拉框结构 */
|
||||||
|
const unitInfoList = ref([]);
|
||||||
|
const getUnitInfoListSelect = async () => {
|
||||||
|
const res = await getBaseUnitInfoList(null);
|
||||||
|
unitInfoList.value = res.data;
|
||||||
|
};
|
||||||
|
/** 查询海威成品信息列表 */
|
||||||
|
const getList = async () => {
|
||||||
|
loading.value = true;
|
||||||
|
const res = await listWmsBaseProduct(queryParams.value);
|
||||||
|
wmsBaseProductList.value = res.rows;
|
||||||
|
total.value = res.total;
|
||||||
|
loading.value = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 取消按钮 */
|
||||||
|
const cancel = () => {
|
||||||
|
reset();
|
||||||
|
dialog.visible = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 表单重置 */
|
||||||
|
const reset = () => {
|
||||||
|
form.value = { ...initFormData };
|
||||||
|
wmsBaseProductFormRef.value?.resetFields();
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 搜索按钮操作 */
|
||||||
|
const handleQuery = () => {
|
||||||
|
queryParams.value.pageNum = 1;
|
||||||
|
getList();
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 重置按钮操作 */
|
||||||
|
const resetQuery = () => {
|
||||||
|
queryFormRef.value?.resetFields();
|
||||||
|
handleQuery();
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 多选框选中数据 */
|
||||||
|
const handleSelectionChange = (selection: WmsBaseProductVO[]) => {
|
||||||
|
ids.value = selection.map((item) => item.productId);
|
||||||
|
single.value = selection.length != 1;
|
||||||
|
multiple.value = !selection.length;
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 新增按钮操作 */
|
||||||
|
const handleAdd = () => {
|
||||||
|
reset();
|
||||||
|
dialog.visible = true;
|
||||||
|
dialog.title = '添加仓库物料信息';
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 修改按钮操作 */
|
||||||
|
const handleUpdate = async (row?: WmsBaseProductVO) => {
|
||||||
|
reset();
|
||||||
|
const _productId = row?.productId || ids.value[0];
|
||||||
|
const res = await getWmsBaseProduct(_productId);
|
||||||
|
Object.assign(form.value, res.data);
|
||||||
|
dialog.visible = true;
|
||||||
|
dialog.title = '修改仓库物料信息';
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 提交按钮 */
|
||||||
|
const submitForm = () => {
|
||||||
|
wmsBaseProductFormRef.value?.validate(async (valid: boolean) => {
|
||||||
|
if (valid) {
|
||||||
|
buttonLoading.value = true;
|
||||||
|
if (form.value.productId) {
|
||||||
|
await updateWmsBaseProduct(form.value).finally(() => (buttonLoading.value = false));
|
||||||
|
} else {
|
||||||
|
await addWmsBaseProduct(form.value).finally(() => (buttonLoading.value = false));
|
||||||
|
}
|
||||||
|
proxy?.$modal.msgSuccess('操作成功');
|
||||||
|
dialog.visible = false;
|
||||||
|
await getList();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 删除按钮操作 */
|
||||||
|
const handleDelete = async (row?: WmsBaseProductVO) => {
|
||||||
|
const _productIds = row?.productId || ids.value;
|
||||||
|
await proxy?.$modal.confirm('是否确认删除仓库物料信息编号为"' + _productIds + '"的数据项？').finally(() => (loading.value = false));
|
||||||
|
await delWmsBaseProduct(_productIds);
|
||||||
|
proxy?.$modal.msgSuccess('删除成功');
|
||||||
|
await getList();
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 导出按钮操作 */
|
||||||
|
const handleExport = () => {
|
||||||
|
proxy?.download(
|
||||||
|
'wms/wmsBaseProduct/export',
|
||||||
|
{
|
||||||
|
...queryParams.value
|
||||||
|
},
|
||||||
|
`wmsBaseProduct_${new Date().getTime()}.xlsx`
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
getList();
|
||||||
|
getUnitInfoListSelect();
|
||||||
|
});
|
||||||
|
</script>
|
||||||
Loading…
Reference in New Issue