主子表新增物料展示,筛选条件

master
maxw@mesnac.com 4 months ago
parent f63fdf0bb5
commit 1357a0e4c3

@ -48,6 +48,13 @@ export const addAllocateOrder = (data) => {
};
export const getMaterialList = (query) => {
return request({
url: '/wms/inventory/getMaterialInfoList',
method: 'get',
params: query
});
};
export const getInstockMaterialList = (query) => {
return request({
url: '/wms/baseMaterialInfo/materialList',
method: 'get',

@ -0,0 +1,77 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { PsmAreaVO, PsmAreaForm, PsmAreaQuery } from '@/api/wms/psmArea/types';
/**
*
* @param query
* @returns {*}
*/
export const listPsmArea = (query?: PsmAreaQuery): AxiosPromise<PsmAreaVO[]> => {
return request({
url: '/system/psmArea/list',
method: 'get',
params: query
});
};
/**
*
* @param areaId
*/
export const getPsmArea = (areaId: string | number): AxiosPromise<PsmAreaVO> => {
return request({
url: '/system/psmArea/' + areaId,
method: 'get'
});
};
/**
*
* @param data
*/
export const addPsmArea = (data: PsmAreaForm) => {
return request({
url: '/system/psmArea',
method: 'post',
data: data
});
};
/**
*
* @param data
*/
export const updatePsmArea = (data: PsmAreaForm) => {
return request({
url: '/system/psmArea',
method: 'put',
data: data
});
};
/**
*
* @param areaId
*/
export const delPsmArea = (areaId: string | number | Array<string | number>) => {
return request({
url: '/system/psmArea/' + areaId,
method: 'delete'
});
};
/**
*
* @param query
* @returns {*}
*/
export function getWmsPsmAreaList (query) {
return request({
url: '/system/psmArea/getWmsPsmAreaList',
method: 'get',
params: query
});
};

@ -0,0 +1,76 @@
export interface PsmAreaVO {
/**
*
*/
areaId: string | number;
/**
*
*/
areaName: string;
/**
*
*/
areaCode: string;
/**
*
*/
warehouseId: string | number;
}
export interface PsmAreaForm extends BaseEntity {
/**
*
*/
areaId?: string | number;
/**
*
*/
areaName?: string;
/**
*
*/
areaCode?: string;
/**
*
*/
warehouseId?: string | number;
}
export interface PsmAreaQuery extends PageQuery {
/**
*
*/
areaId?: string | number;
/**
*
*/
areaName?: string;
/**
*
*/
areaCode?: string;
/**
*
*/
warehouseId?: string | number;
/**
*
*/
params?: any;
}

@ -15,6 +15,27 @@ export const listPsmStorage = (query?: PsmStorageQuery): AxiosPromise<PsmStorage
params: query
});
};
/**
*
*/
export const expiredList = (query?: PsmStorageQuery): AxiosPromise<PsmStorageVO[]> => {
return request({
url: '/wms/psmStorage/expiredList',
method: 'get',
params: query
});
};
/**
*
*/
export const expiringList = (query?: PsmStorageQuery): AxiosPromise<PsmStorageVO[]> => {
return request({
url: '/wms/psmStorage/expiringList',
method: 'get',
params: query
});
};
/**
*

@ -484,7 +484,7 @@ import {listUser} from "@/api/system/user";
import { listInstockDetail, getInstockDetail, delInstockDetail, addInstockDetail, updateInstockDetail, getMaterialListVo } from '@/api/wms/instockDetail';
import { InstockDetailVO, InstockDetailQuery, InstockDetailForm } from '@/api/wms/instockDetail/types';
import {
getMaterialList
getMaterialList, getInstockMaterialList
} from '@/api/wms/linkage'
const {proxy} = getCurrentInstance() as ComponentInternalInstance;
@ -697,7 +697,7 @@ const parentTableDelete = async (e) => {
//
const setMaterialList = (materialCategories) => {
getMaterialList({materialCategories}).then(e => {
getInstockMaterialList({"materialCategories":materialCategories}).then(e => {
materialList.value = e.data
})
}

@ -150,7 +150,7 @@
</el-select>
</el-form-item>
<el-form-item label="出库仓库" prop="planWarehouseId">
<el-select v-model="dialogForm.planWarehouseId" placeholder="请选择所属仓库">
<el-select v-model="dialogForm.planWarehouseId" placeholder="请选择所属仓库" @change="setMaterialList">
<el-option
v-for="item in baseStoreList"
:key="item.warehouseId"
@ -213,7 +213,7 @@
</el-select>
</template>
</el-table-column>
<el-table-column label="物料code" prop="materialId">
<el-table-column label="物料编码" prop="materialId">
<template #default="scope">
<el-select
v-model="scope.row.materialId"
@ -597,8 +597,9 @@ const parentTableDelete = async (e) => {
}
//
const setMaterialList = (materialCategories) => {
getMaterialList({materialCategories}).then(e => {
const setMaterialList = () => {
console.log(dialogForm.value.materialCategories)
getMaterialList({"materialCategories":dialogForm.value.materialCategories,"storeId":dialogForm.value.planWarehouseId}).then(e => {
materialList.value = e.data
})
}

@ -397,6 +397,8 @@ const getBaseWarehouseListsss = async () => {
baseStoreList.value = res.data;
};
const getLocationList = async () => {
form.value.planLocationCode = ''
form.value.targetLocationCode = ''
const warehouseId = form.value.warehouseId;
let res = await getWmsBaseLocationVoList({'warehouseId':warehouseId});
locationList.value = res.data;

@ -135,8 +135,8 @@
<el-dialog v-model="dialogVisible" :title="dialogTitle" width="80%">
<el-card shadow="never">
<el-form :model="dialogForm" :inline="true" label-width="120px" :disabled="isView">
<el-form-item label="仓库ID" prop="warehouseId">
<el-select v-model="dialogForm.warehouseId" placeholder="请选择所属仓库">
<el-form-item label="仓库" prop="warehouseId">
<el-select v-model="dialogForm.warehouseId" placeholder="请选择所属仓库" @change="setMaterialList">
<el-option
v-for="item in baseStoreList"
:key="item.warehouseId"
@ -204,7 +204,7 @@
></el-option>
</el-select>
</el-table-column>
<el-table-column label="物料code" prop="materialId">
<el-table-column label="物料编码" prop="materialId">
<template #default="scope">
<el-select
v-model="scope.row.materialId"
@ -620,7 +620,7 @@ const parentTableDelete = async (e) => {
//
const setMaterialList = (materialCategories) => {
getMaterialList({materialCategories}).then(e => {
getMaterialList({"materialCategories":dialogForm.value.materialCategories,"warehouseId":dialogForm.value.warehouseId}).then(e => {
materialList.value = e.data
})
}

@ -0,0 +1,259 @@
<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="areaId">
<el-input v-model="queryParams.areaId" placeholder="请输入主键" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="库区名称" prop="areaName">
<el-input v-model="queryParams.areaName" placeholder="请输入库区名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="库区代码" prop="areaCode">
<el-input v-model="queryParams.areaCode" placeholder="请输入库区代码" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="仓库" prop="warehouseId">
<el-input v-model="queryParams.warehouseId" 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:psmArea:add']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:psmArea:edit']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:psmArea:remove']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:psmArea: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="psmAreaList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键" align="center" prop="areaId" v-if="columns[0].visible"/>
<el-table-column label="库区名称" align="center" prop="areaName" v-if="columns[7].visible"/>
<el-table-column label="库区代码" align="center" prop="areaCode" v-if="columns[8].visible"/>
<el-table-column label="仓库" align="center" prop="warehouseId" v-if="columns[9].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:psmArea:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:psmArea: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="psmAreaFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="主键" prop="areaId">
<el-input v-model="form.areaId" placeholder="请输入主键" />
</el-form-item>
<el-form-item label="库区名称" prop="areaName">
<el-input v-model="form.areaName" placeholder="请输入库区名称" />
</el-form-item>
<el-form-item label="库区代码" prop="areaCode">
<el-input v-model="form.areaCode" placeholder="请输入库区代码" />
</el-form-item>
<el-form-item label="仓库" prop="warehouseId">
<el-input v-model="form.warehouseId" 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="PsmArea" lang="ts">
import { listPsmArea, getPsmArea, delPsmArea, addPsmArea, updatePsmArea } from '@/api/wms/psmArea';
import { PsmAreaVO, PsmAreaQuery, PsmAreaForm } from '@/api/wms/psmArea/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const psmAreaList = ref<PsmAreaVO[]>([]);
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 psmAreaFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
//
const columns = ref<FieldOption[]>([
{ key: 0, label: `主键`, visible: true },
// { key: 1, label: `${comment}`, visible: true },
// { key: 2, label: `${comment}`, visible: true },
// { key: 3, label: `${comment}`, visible: true },
// { key: 4, label: `${comment}`, visible: true },
// { key: 5, label: `${comment}`, visible: true },
// { key: 6, label: `${comment}`, visible: true },
{ key: 7, label: `库区名称`, visible: true },
{ key: 8, label: `库区代码`, visible: true },
{ key: 9, label: `仓库`, visible: true },
]);
const initFormData: PsmAreaForm = {
areaId: undefined,
areaName: undefined,
areaCode: undefined,
warehouseId: undefined
}
const data = reactive<PageData<PsmAreaForm, PsmAreaQuery>>({
form: {...initFormData},
queryParams: {
pageNum: 1,
pageSize: 10,
areaId: undefined,
areaName: undefined,
areaCode: undefined,
warehouseId: undefined,
params: {
}
},
rules: {
areaId: [
{ required: true, message: "主键不能为空", trigger: "blur" }
],
areaName: [
{ required: true, message: "库区名称不能为空", trigger: "blur" }
],
areaCode: [
{ required: true, message: "库区代码不能为空", trigger: "blur" }
],
warehouseId: [
{ required: true, message: "仓库不能为空", trigger: "blur" }
]
}
});
const { queryParams, form, rules } = toRefs(data);
/** 查询成品库区列表 */
const getList = async () => {
loading.value = true;
const res = await listPsmArea(queryParams.value);
psmAreaList.value = res.rows;
total.value = res.total;
loading.value = false;
}
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
}
/** 表单重置 */
const reset = () => {
form.value = {...initFormData};
psmAreaFormRef.value?.resetFields();
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
}
/** 多选框选中数据 */
const handleSelectionChange = (selection: PsmAreaVO[]) => {
ids.value = selection.map(item => item.areaId);
single.value = selection.length != 1;
multiple.value = !selection.length;
}
/** 新增按钮操作 */
const handleAdd = () => {
reset();
dialog.visible = true;
dialog.title = "添加成品库区";
}
/** 修改按钮操作 */
const handleUpdate = async (row?: PsmAreaVO) => {
reset();
const _areaId = row?.areaId || ids.value[0]
const res = await getPsmArea(_areaId);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = "修改成品库区";
}
/** 提交按钮 */
const submitForm = () => {
psmAreaFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.areaId) {
await updatePsmArea(form.value).finally(() => buttonLoading.value = false);
} else {
await addPsmArea(form.value).finally(() => buttonLoading.value = false);
}
proxy?.$modal.msgSuccess("操作成功");
dialog.visible = false;
await getList();
}
});
}
/** 删除按钮操作 */
const handleDelete = async (row?: PsmAreaVO) => {
const _areaIds = row?.areaId || ids.value;
await proxy?.$modal.confirm('是否确认删除成品库区编号为"' + _areaIds + '"的数据项?').finally(() => loading.value = false);
await delPsmArea(_areaIds);
proxy?.$modal.msgSuccess("删除成功");
await getList();
}
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download('wms/psmArea/export', {
...queryParams.value
}, `psmArea_${new Date().getTime()}.xlsx`)
}
onMounted(() => {
getList();
});
</script>

@ -0,0 +1,352 @@
<template>
<div class="p-2">
<div class="mb-[10px]">
<el-card shadow="hover" class="text-center">
<el-radio-group v-model="tab" @change="changeTab(tab)">
<el-radio-button value="waiting">过期</el-radio-button>
<el-radio-button value="finish">将过期</el-radio-button>
</el-radio-group>
</el-card>
</div>
<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="materialId">
<el-select v-model="queryParams.materialId" placeholder="请选择物料">
<el-option
v-for="item in materialList"
:key="item.materialId"
:label="item.materialCode"
:value="item.materialId"
/>
</el-select>
</el-form-item>
<el-form-item label="硫化条码" prop="tyreNo">
<el-input v-model="queryParams.tyreNo" 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="storeName">
<el-input v-model="queryParams.storeName" placeholder="请输入仓库名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="库位条码" prop="storedasPlaceCode">
<el-input v-model="queryParams.storePlaceCode" placeholder="请输入库位条码" clearable @keyup.enter="handleQuery" />
</el-form-item>dsada
<el-form-item label="工装条码" prop="toolingBarcode">
<el-input v-model="queryParams.toolingBarcode" 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:psmStorage:add']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:psmStorage:edit']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:psmStorage:remove']"></el-button>
</el-col> -->
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:psmStorage: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="psmStorageList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="表主键" align="center" prop="objid" v-if="columns[0].visible"/> -->
<el-table-column label="物料" align="center" prop="materialCode" v-if="columns[7].visible"/>
<el-table-column label="轮胎规格" align="center" prop="materialSpe" v-if="columns[8].visible"/>
<el-table-column label="硫化条码" align="center" prop="tyreNo" v-if="columns[9].visible"/>
<el-table-column label="品级编号" align="center" prop="checkGradeCode" v-if="columns[10].visible"/>
<el-table-column label="仓库名称" align="center" prop="storeName" v-if="columns[11].visible"/>
<el-table-column label="库位条码" align="center" prop="storePlaceCode" v-if="columns[12].visible"/>
<el-table-column label="工装条码" align="center" prop="toolingBarcode" v-if="columns[13].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:psmStorage:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:psmStorage: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="psmStorageFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="表主键" prop="objid">
<el-input v-model="form.objid" placeholder="请输入表主键" />
</el-form-item>
<el-form-item label="物料ID" prop="materialId">
<el-input v-model="form.materialId" placeholder="请输入物料ID" />
</el-form-item>
<el-form-item label="轮胎规格" prop="materialSpe">
<el-input v-model="form.materialSpe" placeholder="请输入轮胎规格" />
</el-form-item>
<el-form-item label="硫化条码" prop="tyreNo">
<el-input v-model="form.tyreNo" 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="storeName">
<el-input v-model="form.storeName" placeholder="请输入仓库名称" />
</el-form-item>
<el-form-item label="库位条码" prop="storePlaceCode">
<el-input v-model="form.storePlaceCode" placeholder="请输入库位条码" />
</el-form-item>
<el-form-item label="工装条码" prop="toolingBarcode">
<el-input v-model="form.toolingBarcode" 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="PsmStorage" lang="ts">
import { listPsmStorage, getPsmStorage, delPsmStorage, addPsmStorage, updatePsmStorage, expiredList, expiringList } from '@/api/wms/psmStorage';
import { PsmStorageVO, PsmStorageQuery, PsmStorageForm } from '@/api/wms/psmStorage/types';
import { getMaterialListVo } from '@/api/wms/instockDetail';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const psmStorageList = ref<PsmStorageVO[]>([]);
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 materialList = ref([]);
const queryFormRef = ref<ElFormInstance>();
const psmStorageFormRef = ref<ElFormInstance>();
const tab = ref('waiting');
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: `物料ID`, visible: true },
{ key: 8, label: `轮胎规格`, visible: true },
{ 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 },
]);
const initFormData: PsmStorageForm = {
objid: undefined,
materialId: undefined,
materialSpe: undefined,
tyreNo: undefined,
checkGradeCode: undefined,
storeName: undefined,
storePlaceCode: undefined,
toolingBarcode: undefined
}
const data = reactive<PageData<PsmStorageForm, PsmStorageQuery>>({
form: {...initFormData},
queryParams: {
pageNum: 1,
pageSize: 10,
objid: undefined,
materialId: undefined,
materialSpe: undefined,
tyreNo: undefined,
checkGradeCode: undefined,
storeName: undefined,
storePlaceCode: undefined,
toolingBarcode: undefined,
params: {
}
},
rules: {
objid: [
{ required: true, message: "表主键不能为空", trigger: "blur" }
],
materialId: [
{ required: true, message: "物料ID不能为空", trigger: "blur" }
],
materialSpe: [
{ required: true, message: "轮胎规格不能为空", trigger: "blur" }
],
tyreNo: [
{ required: true, message: "硫化条码不能为空", trigger: "blur" }
],
checkGradeCode: [
{ required: true, message: "品级编号不能为空", trigger: "blur" }
],
storeName: [
{ required: true, message: "仓库名称不能为空", trigger: "blur" }
],
storePlaceCode: [
{ required: true, message: "库位条码不能为空", trigger: "blur" }
],
toolingBarcode: [
{ required: true, message: "工装条码不能为空", trigger: "blur" }
]
}
});
const { queryParams, form, rules } = toRefs(data);
const getMaterialList = async () => {
const res = await getMaterialListVo(null);
console.log(res.data);
materialList.value = res.data;
}
/** 查询成品库存列表 */
const getList = async () => {
if ('waiting' === tab.value) {
loading.value = true;
const res = await expiredList(queryParams.value);
psmStorageList.value = res.rows;
total.value = res.total;
loading.value = false;
} else {
loading.value = true;
const res = await expiringList(queryParams.value);
psmStorageList.value = res.rows;
total.value = res.total;
loading.value = false;
}
}
/**
* 切换指标tab
* @param data
*/
const changeTab = async (data: string) => {
if ('waiting' === data) {
loading.value = true;
const res = await expiredList(queryParams.value);
psmStorageList.value = res.rows;
total.value = res.total;
loading.value = false;
} else {
loading.value = true;
const res = await expiringList(queryParams.value);
psmStorageList.value = res.rows;
total.value = res.total;
loading.value = false;
}
};
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
}
/** 表单重置 */
const reset = () => {
form.value = {...initFormData};
psmStorageFormRef.value?.resetFields();
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
}
/** 多选框选中数据 */
const handleSelectionChange = (selection: PsmStorageVO[]) => {
ids.value = selection.map(item => item.objid);
single.value = selection.length != 1;
multiple.value = !selection.length;
}
/** 新增按钮操作 */
const handleAdd = () => {
reset();
dialog.visible = true;
dialog.title = "添加成品库存";
}
/** 修改按钮操作 */
const handleUpdate = async (row?: PsmStorageVO) => {
reset();
const _objid = row?.objid || ids.value[0]
const res = await getPsmStorage(_objid);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = "修改成品库存";
}
/** 提交按钮 */
const submitForm = () => {
psmStorageFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.objid) {
await updatePsmStorage(form.value).finally(() => buttonLoading.value = false);
} else {
await addPsmStorage(form.value).finally(() => buttonLoading.value = false);
}
proxy?.$modal.msgSuccess("操作成功");
dialog.visible = false;
await getList();
}
});
}
/** 删除按钮操作 */
const handleDelete = async (row?: PsmStorageVO) => {
const _objids = row?.objid || ids.value;
await proxy?.$modal.confirm('是否确认删除成品库存编号为"' + _objids + '"的数据项?').finally(() => loading.value = false);
await delPsmStorage(_objids);
proxy?.$modal.msgSuccess("删除成功");
await getList();
}
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download('system/psmStorage/export', {
...queryParams.value
}, `psmStorage_${new Date().getTime()}.xlsx`)
}
onMounted(() => {
getMaterialList();
getList();
});
</script>

@ -249,7 +249,7 @@
</el-col>
</el-row>
<el-table :data="dialogtable" style="width: 100%">
<el-table-column label="物料" prop="materialId">
<el-table-column label="物料编码" prop="materialId">
<template #default="scope">
<el-select
v-model="scope.row.materialId"
@ -258,7 +258,24 @@
>
<el-option
v-for="i in materialList"
:label="i.materialCode"
:label="i.materialCode+'('+i.materialName+')'"
:value="i.materialId"
:key="i.materialId"
/>
</el-select>
</template>
</el-table-column>
<el-table-column label="物料">
<template #default="scope">
<el-select
v-model="scope.row.materialId"
placeholder="选择物料"
style="width: 240px"
:disabled="true"
>
<el-option
v-for="i in materialList"
:label="i.materialName"
:value="i.materialId"
:key="i.materialId"
/>
@ -414,7 +431,7 @@ import { getBaseSupplierInfoList } from '@/api/mes/baseSupplierInfo'
import { listWmsPurchaseOrderDetail, getWmsPurchaseOrderDetail, delWmsPurchaseOrderDetail, addWmsPurchaseOrderDetail, updateWmsPurchaseOrderDetail } from '@/api/wms/wmsPurchaseOrderDetail';
import { WmsPurchaseOrderDetailVO, WmsPurchaseOrderDetailQuery, WmsPurchaseOrderDetailForm } from '@/api/wms/wmsPurchaseOrderDetail/types';
import {
getMaterialList
getMaterialList, getInstockMaterialList
} from '@/api/wms/linkage'
const {proxy} = getCurrentInstance() as ComponentInternalInstance;
@ -618,7 +635,7 @@ const parentTableDelete = async (e) => {
//
const setMaterialList = (materialCategories) => {
getMaterialList({materialCategories}).then(e => {
getInstockMaterialList({materialCategories}).then(e => {
materialList.value = e.data
})
}

Loading…
Cancel
Save