suixy
/
MOM-UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改 半制品库存字段

Browse Source
master
wanghao 3 months ago
parent 474f4f28e7
commit 4190426587
6 changed files with 286 additions and 229 deletions
Show Stats Download Patch File Download Diff File

6
src/api/wms/hppStorageDetail/types.ts
Unescape Escape View File

@ -27,7 +27,7 @@ export interface HppStorageDetailVO {
/** /**
* 库位id * 库位id
*/ */
storePlaceId: string | number; storePlaceCode: string ;
/** /**
* 密炼来料数量 * 密炼来料数量
@ -70,7 +70,7 @@ export interface HppStorageDetailForm extends BaseEntity {
/** /**
* 库位id * 库位id
*/ */
storePlaceId?: string | number; storePlaceCode?: string ;
/** /**
* 密炼来料数量 * 密炼来料数量
@ -114,7 +114,7 @@ export interface HppStorageDetailQuery extends PageQuery {
/** /**
* 库位id * 库位id
*/ */
storePlaceId?: string | number; storePlaceCode?: string ;
/** /**
* 密炼来料数量 * 密炼来料数量

10
src/views/wms/hppInStockDetail/index.vue
Unescape Escape View File

@ -10,7 +10,7 @@
<el-form-item label="工装架子号" prop="shelfNo"> <el-form-item label="工装架子号" prop="shelfNo">
<el-input v-model="queryParams.shelfNo" placeholder="请输入工装架子号" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.shelfNo" placeholder="请输入工装架子号" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="库位id" prop="storePlaceId"> <el-form-item label="库位" prop="storePlaceId">
<el-select v-model="queryParams.storePlaceId" placeholder="请选择所属仓库"> <el-select v-model="queryParams.storePlaceId" placeholder="请选择所属仓库">
<el-option <el-option
v-for="item in baseStoreList" v-for="item in baseStoreList"
@ -133,8 +133,8 @@
<el-form-item label="工装架子号" prop="shelfNo"> <el-form-item label="工装架子号" prop="shelfNo">
<el-input v-model="form.shelfNo" placeholder="请输入工装架子号" /> <el-input v-model="form.shelfNo" placeholder="请输入工装架子号" />
</el-form-item> </el-form-item>
<el-form-item label="库位id" prop="storePlaceId"> <el-form-item label="库位" prop="storePlaceId">
<el-input v-model="form.storePlaceId" placeholder="请输入库位id" /> <el-input v-model="form.storePlaceId" placeholder="请输入库位" />
</el-form-item> </el-form-item>
<el-form-item label="品级编号,0:合格,1:不合格" prop="gradeCode"> <el-form-item label="品级编号,0:合格,1:不合格" prop="gradeCode">
<el-input v-model="form.gradeCode" placeholder="请输入品级编号,0:合格,1:不合格" /> <el-input v-model="form.gradeCode" placeholder="请输入品级编号,0:合格,1:不合格" />
@ -203,7 +203,7 @@ const columns = ref<FieldOption[]>([
{ key: 5, label: `租户`, visible: true }, { key: 5, label: `租户`, visible: true },
{ key: 6, label: `流水卡号`, visible: true }, { key: 6, label: `流水卡号`, visible: true },
{ key: 7, label: `工装架子号`, visible: true }, { key: 7, label: `工装架子号`, visible: true },
{ key: 8, label: `库位id`, visible: true }, { key: 8, label: `库位`, visible: true },
{ key: 9, label: `品级编号,0:合格,1:不合格`, visible: true }, { key: 9, label: `品级编号,0:合格,1:不合格`, visible: true },
{ key: 10, label: `产品类别：0：半成品，1：成型`, visible: true }, { key: 10, label: `产品类别：0：半成品，1：成型`, visible: true },
{ key: 11, label: `物料`, visible: true }, { key: 11, label: `物料`, visible: true },
@ -250,7 +250,7 @@ const data = reactive<PageData<HppInStockDetailForm, HppInStockDetailQuery>>({
{ required: true, message: "工装架子号不能为空", trigger: "blur" } { required: true, message: "工装架子号不能为空", trigger: "blur" }
], ],
storePlaceId: [ storePlaceId: [
{ required: true, message: "库位id不能为空", trigger: "blur" } { required: true, message: "库位不能为空", trigger: "blur" }
], ],
gradeCode: [ gradeCode: [
{ required: true, message: "品级编号,0:合格,1:不合格不能为空", trigger: "blur" } { required: true, message: "品级编号,0:合格,1:不合格不能为空", trigger: "blur" }

10
src/views/wms/hppOutStockDetail/index.vue
Unescape Escape View File

@ -78,7 +78,7 @@
<!-- <el-table-column label="主键id" align="center" prop="objId" v-if="columns[0].visible"/> --> <!-- <el-table-column label="主键id" align="center" prop="objId" v-if="columns[0].visible"/> -->
<el-table-column label="流水卡号" align="center" prop="cardNo" v-if="columns[6].visible"/> <el-table-column label="流水卡号" align="center" prop="cardNo" v-if="columns[6].visible"/>
<el-table-column label="工装架子号" align="center" prop="shelfNo" v-if="columns[7].visible"/> <el-table-column label="工装架子号" align="center" prop="shelfNo" v-if="columns[7].visible"/>
<el-table-column label="库位id" align="center" prop="storePlaceCode" v-if="columns[8].visible"/> <el-table-column label="库位" align="center" prop="storePlaceCode" v-if="columns[8].visible"/>
<el-table-column label="品级编号" align="center" prop="gradeCode" v-if="columns[9].visible"> <el-table-column label="品级编号" align="center" prop="gradeCode" v-if="columns[9].visible">
<template #default="scope"> <template #default="scope">
<dict-tag :options="wms_grade_code" :value="scope.row.gradeCode"/> <dict-tag :options="wms_grade_code" :value="scope.row.gradeCode"/>
@ -113,8 +113,8 @@
<el-form-item label="工装架子号" prop="shelfNo"> <el-form-item label="工装架子号" prop="shelfNo">
<el-input v-model="form.shelfNo" placeholder="请输入工装架子号" /> <el-input v-model="form.shelfNo" placeholder="请输入工装架子号" />
</el-form-item> </el-form-item>
<el-form-item label="库位id" prop="storePlaceId"> <el-form-item label="库位" prop="storePlaceId">
<el-input v-model="form.storePlaceId" placeholder="请输入库位id" /> <el-input v-model="form.storePlaceId" placeholder="请输入库位" />
</el-form-item> </el-form-item>
<el-form-item label="品级编号,0:合格,1:不合格" prop="gradeCode"> <el-form-item label="品级编号,0:合格,1:不合格" prop="gradeCode">
<el-input v-model="form.gradeCode" placeholder="请输入品级编号,0:合格,1:不合格" /> <el-input v-model="form.gradeCode" placeholder="请输入品级编号,0:合格,1:不合格" />
@ -176,7 +176,7 @@ const columns = ref<FieldOption[]>([
{ key: 5, label: `租户`, visible: true }, { key: 5, label: `租户`, visible: true },
{ key: 6, label: `流水卡号`, visible: true }, { key: 6, label: `流水卡号`, visible: true },
{ key: 7, label: `工装架子号`, visible: true }, { key: 7, label: `工装架子号`, visible: true },
{ key: 8, label: `库位id`, visible: true }, { key: 8, label: `库位`, visible: true },
{ key: 9, label: `品级编号,0:合格,1:不合格`, visible: true }, { key: 9, label: `品级编号,0:合格,1:不合格`, visible: true },
{ key: 10, label: `出库类型`, visible: true }, { key: 10, label: `出库类型`, visible: true },
{ key: 11, label: `目的库位`, visible: true }, { key: 11, label: `目的库位`, visible: true },
@ -217,7 +217,7 @@ const data = reactive<PageData<HppOutStockDetailForm, HppOutStockDetailQuery>>({
{ required: true, message: "工装架子号不能为空", trigger: "blur" } { required: true, message: "工装架子号不能为空", trigger: "blur" }
], ],
storePlaceId: [ storePlaceId: [
{ required: true, message: "库位id不能为空", trigger: "blur" } { required: true, message: "库位不能为空", trigger: "blur" }
], ],
gradeCode: [ gradeCode: [
{ required: true, message: "品级编号,0:合格,1:不合格不能为空", trigger: "blur" } { required: true, message: "品级编号,0:合格,1:不合格不能为空", trigger: "blur" }

88
src/views/wms/hppStorageDetail/index.vue
Unescape Escape View File

@ -1,14 +1,16 @@
<template> <template>
<div class="p-2"> <div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave"> <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
:leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]"> <div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover"> <el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true"> <el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="流水卡号" prop="cardNo"> <el-form-item label="流水卡号" prop="cardNo">
<el-input v-model="queryParams.cardNo" placeholder="请输入流水卡号" clearable @keyup.enter="handleQuery"/> <el-input v-model="queryParams.cardNo" placeholder="请输入流水卡号" clearable @keyup.enter="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item label="工装架子号" prop="shelfNo"> <el-form-item label="工装架子" prop="shelfNo">
<el-input v-model="queryParams.shelfNo" placeholder="请输入工装架子号" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.shelfNo" placeholder="请输入工装架子号" clearable
@keyup.enter="handleQuery"/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="入库类型" prop="instockType"> <!-- <el-form-item label="入库类型" prop="instockType">
<el-select v-model="queryParams.instockType" placeholder="请选择入库类型" clearable > <el-select v-model="queryParams.instockType" placeholder="请选择入库类型" clearable >
@ -25,16 +27,12 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="库位" prop="storePlaceId"> <el-form-item label="库位编码" prop="storePlaceCode">
<el-select v-model="queryParams.storePlaceId" placeholder="请选择所属仓库"> <el-input v-model="queryParams.storePlaceCode" placeholder="请选择所属仓库" clearable
<el-option @keyup.enter="handleQuery"/>
v-for="item in baseStoreList"
:key="item.objId"
:label="item.storePlaceCode"
:value="item.objId"
></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@ -57,15 +55,18 @@
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:hppStorageDetail:remove']">删除</el-button> <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-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:hppStorageDetail:export']">导出</el-button> <el-button type="warning" plain icon="Download" @click="handleExport"
v-hasPermi="['system:hppStorageDetail:export']">导出
</el-button>
</el-col> </el-col>
<right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar> <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true"
@queryTable="getList"></right-toolbar>
</el-row> </el-row>
</template> </template>
<el-table v-loading="loading" :data="hppStorageDetailList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="hppStorageDetailList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/> <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="objId" v-if="columns[0].visible"/>
<el-table-column label="流水卡号" align="center" prop="cardNo" v-if="columns[6].visible"/> <el-table-column label="流水卡号" align="center" prop="cardNo" v-if="columns[6].visible"/>
<el-table-column label="工装架子号" align="center" prop="shelfNo" v-if="columns[7].visible"/> <el-table-column label="工装架子号" align="center" prop="shelfNo" v-if="columns[7].visible"/>
<el-table-column label="入库类型" align="center" prop="instockType" v-if="columns[8].visible"> <el-table-column label="入库类型" align="center" prop="instockType" v-if="columns[8].visible">
@ -77,19 +78,22 @@
<el-table-column label="库位" align="center" prop="storePlaceCode" v-if="columns[10].visible"/> <el-table-column label="库位" align="center" prop="storePlaceCode" v-if="columns[10].visible"/>
<el-table-column label="密炼来料数量" align="center" prop="sourceNum" v-if="columns[11].visible"/> <el-table-column label="密炼来料数量" align="center" prop="sourceNum" v-if="columns[11].visible"/>
<el-table-column label="库存数量" align="center" prop="storageNum" v-if="columns[12].visible"/> <el-table-column label="库存数量" align="center" prop="storageNum" v-if="columns[12].visible"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-tooltip content="修改" placement="top"> <el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:hppStorageDetail:edit']"></el-button> <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:hppStorageDetail:edit']"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip content="删除" placement="top"> <el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:hppStorageDetail:remove']"></el-button> <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:hppStorageDetail:remove']"></el-button>
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>-->
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" /> <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" @pagination="getList"/>
</el-card> </el-card>
<!-- 添加或修改半成品库存对话框 --> <!-- 添加或修改半成品库存对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body> <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
@ -116,12 +120,12 @@
<el-form-item label="物料Id" prop="materialId"> <el-form-item label="物料Id" prop="materialId">
<el-input v-model="form.materialId" placeholder="请输入物料Id"/> <el-input v-model="form.materialId" placeholder="请输入物料Id"/>
</el-form-item> </el-form-item>
<el-form-item label="库位id" prop="storePlaceId"> <el-form-item label="库位" prop="storePlaceId">
<el-input v-model="form.storePlaceId" placeholder="请输入库位id" /> <el-input v-model="form.storePlaceCode" placeholder="请输入库位"/>
</el-form-item>
<el-form-item label="密炼来料数量" prop="sourceNum">
<el-input v-model="form.sourceNum" placeholder="请输入密炼来料数量" />
</el-form-item> </el-form-item>
<!-- <el-form-item label="密炼来料数量" prop="sourceNum">-->
<!-- <el-input v-model="form.sourceNum" placeholder="请输入密炼来料数量" />-->
<!-- </el-form-item>-->
<el-form-item label="库存数量" prop="storageNum"> <el-form-item label="库存数量" prop="storageNum">
<el-input v-model="form.storageNum" placeholder="请输入库存数量"/> <el-input v-model="form.storageNum" placeholder="请输入库存数量"/>
</el-form-item> </el-form-item>
@ -137,10 +141,17 @@
</template> </template>
<script setup name="HppStorageDetail" lang="ts"> <script setup name="HppStorageDetail" lang="ts">
import { listHppStorageDetail, getHppStorageDetail, delHppStorageDetail, addHppStorageDetail, updateHppStorageDetail } from '@/api/wms/hppStorageDetail'; import {
listHppStorageDetail,
getHppStorageDetail,
delHppStorageDetail,
addHppStorageDetail,
updateHppStorageDetail
} from '@/api/wms/hppStorageDetail';
import {HppStorageDetailVO, HppStorageDetailQuery, HppStorageDetailForm} from '@/api/wms/hppStorageDetail/types'; import {HppStorageDetailVO, HppStorageDetailQuery, HppStorageDetailForm} from '@/api/wms/hppStorageDetail/types';
import {getWmsHppStorePlaceList} from '@/api/wms/hppStorePlace'; import {getWmsHppStorePlaceList} from '@/api/wms/hppStorePlace';
import {getMaterialListVo} from '@/api/wms/instockDetail'; import {getMaterialListVo} from '@/api/wms/instockDetail';
const {proxy} = getCurrentInstance() as ComponentInternalInstance; const {proxy} = getCurrentInstance() as ComponentInternalInstance;
const {wms_halfproduct_instock_type} = toRefs<any>(proxy?.useDict('wms_halfproduct_instock_type')); const {wms_halfproduct_instock_type} = toRefs<any>(proxy?.useDict('wms_halfproduct_instock_type'));
const hppStorageDetailList = ref<HppStorageDetailVO[]>([]); const hppStorageDetailList = ref<HppStorageDetailVO[]>([]);
@ -162,7 +173,7 @@ const dialog = reactive<DialogOption>({
// 列显隐信息 // 列显隐信息
const columns = ref<FieldOption[]>([ const columns = ref<FieldOption[]>([
{ key: 0, label: `主键`, visible: true }, {key: 0, label: `主键`, visible: false},
{key: 1, label: `创建人`, visible: true}, {key: 1, label: `创建人`, visible: true},
{key: 2, label: `创建时间`, visible: true}, {key: 2, label: `创建时间`, visible: true},
{key: 3, label: `更新人`, visible: true}, {key: 3, label: `更新人`, visible: true},
@ -172,8 +183,8 @@ const columns = ref<FieldOption[]>([
{key: 7, label: `工装架子号`, visible: true}, {key: 7, label: `工装架子号`, visible: true},
{key: 8, label: `入库类型`, visible: true}, {key: 8, label: `入库类型`, visible: true},
{key: 9, label: `物料Id`, visible: true}, {key: 9, label: `物料Id`, visible: true},
{ key: 10, label: `库位id`, visible: true }, {key: 10, label: `库位`, visible: true},
{ key: 11, label: `密炼来料数量`, visible: true }, {key: 11, label: `密炼来料数量`, visible: false},
{key: 12, label: `库存数量`, visible: true}, {key: 12, label: `库存数量`, visible: true},
]); ]);
@ -183,7 +194,7 @@ const initFormData: HppStorageDetailForm = {
shelfNo: undefined, shelfNo: undefined,
instockType: undefined, instockType: undefined,
materialId: undefined, materialId: undefined,
storePlaceId: undefined, storePlaceCode: undefined,
sourceNum: undefined, sourceNum: undefined,
storageNum: undefined storageNum: undefined
} }
@ -197,11 +208,10 @@ const data = reactive<PageData<HppStorageDetailForm, HppStorageDetailQuery>>({
shelfNo: undefined, shelfNo: undefined,
instockType: undefined, instockType: undefined,
materialId: undefined, materialId: undefined,
storePlaceId: undefined, storePlaceCode: undefined,
sourceNum: undefined, sourceNum: undefined,
storageNum: undefined, storageNum: undefined,
params: { params: {}
}
}, },
rules: { rules: {
objId: [ objId: [
@ -220,7 +230,7 @@ const data = reactive<PageData<HppStorageDetailForm, HppStorageDetailQuery>>({
{required: true, message: "物料Id不能为空", trigger: "blur"} {required: true, message: "物料Id不能为空", trigger: "blur"}
], ],
storePlaceId: [ storePlaceId: [
{ required: true, message: "库位id不能为空", trigger: "blur" } {required: true, message: "库位不能为空", trigger: "blur"}
], ],
sourceNum: [ sourceNum: [
{required: true, message: "密炼来料数量不能为空", trigger: "blur"} {required: true, message: "密炼来料数量不能为空", trigger: "blur"}
@ -238,10 +248,10 @@ const getMaterialList = async () => {
console.log(res.data); console.log(res.data);
materialList.value = res.data; materialList.value = res.data;
} }
const getStorePlaceList = async () => { // const getStorePlaceList = async () => {
let res = await getWmsHppStorePlaceList(null); // let res = await getWmsHppStorePlaceList(null);
baseStoreList.value = res.data; // baseStoreList.value = res.data;
}; // };
/** 查询半成品库存列表 */ /** 查询半成品库存列表 */
const getList = async () => { const getList = async () => {
loading.value = true; loading.value = true;
@ -334,7 +344,7 @@ const handleExport = () => {
onMounted(() => { onMounted(() => {
getMaterialList(); getMaterialList();
getStorePlaceList(); // getStorePlaceList();
getList(); getList();
}); });
</script> </script>

78
src/views/wms/hppStore/index.vue
Unescape Escape View File

@ -23,12 +23,12 @@
<el-form-item label="sap代码" prop="sapCode"> <el-form-item label="sap代码" prop="sapCode">
<el-input v-model="queryParams.sapCode" placeholder="请输入sap代码" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.sapCode" placeholder="请输入sap代码" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="仓库等级" prop="storeLevel"> <!-- <el-form-item label="仓库等级" prop="storeLevel">-->
<el-input v-model="queryParams.storeLevel" placeholder="请输入仓库等级" clearable @keyup.enter="handleQuery" /> <!-- <el-input v-model="queryParams.storeLevel" placeholder="请输入仓库等级" clearable @keyup.enter="handleQuery" />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="上级目录" prop="storeHigherLevel"> <!-- <el-form-item label="上级目录" prop="storeHigherLevel">-->
<el-input v-model="queryParams.storeHigherLevel" placeholder="请输入上级目录" clearable @keyup.enter="handleQuery" /> <!-- <el-input v-model="queryParams.storeHigherLevel" placeholder="请输入上级目录" clearable @keyup.enter="handleQuery" />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@ -59,8 +59,10 @@
<el-table v-loading="loading" :data="hppStoreList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="hppStoreList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="仓库名" align="center" prop="storeName" v-if="columns[6].visible"/> <el-table-column label="主键" align="center" prop="objId" v-if="columns[5].visible"/>
<el-table-column label="仓库代码" align="center" prop="storeCode" v-if="columns[7].visible"/> <el-table-column label="仓库代码" align="center" prop="storeCode" v-if="columns[7].visible"/>
<el-table-column label="仓库名" align="center" prop="storeName" v-if="columns[6].visible"/>
<el-table-column label="仓库类型" align="center" prop="storeType" v-if="columns[8].visible"> <el-table-column label="仓库类型" align="center" prop="storeType" v-if="columns[8].visible">
<template #default="scope"> <template #default="scope">
<dict-tag :options="wms_store_type" :value="scope.row.storeType"/> <dict-tag :options="wms_store_type" :value="scope.row.storeType"/>
@ -72,8 +74,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="sap代码" align="center" prop="sapCode" v-if="columns[10].visible"/> <el-table-column label="sap代码" align="center" prop="sapCode" v-if="columns[10].visible"/>
<el-table-column label="仓库等级" align="center" prop="storeLevel" v-if="columns[11].visible"/> <!-- <el-table-column label="仓库等级" align="center" prop="storeLevel" v-if="columns[11].visible"/>-->
<el-table-column label="上级目录" align="center" prop="storeHigherLevel" v-if="columns[12].visible"/> <!-- <el-table-column label="上级目录" align="center" prop="storeHigherLevel" v-if="columns[12].visible"/>-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-tooltip content="修改" placement="top"> <el-tooltip content="修改" placement="top">
@ -107,7 +109,21 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="sap代码" prop="sapCode">
<el-form-item label="是否启用" >
<el-select v-model="form.usedFlag" placeholder="请选择仓库类型">
<el-option
v-for="dict in wms_halfproduct_used"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="sap代码" prop="sapCode">
<el-input v-model="form.sapCode" placeholder="请输入sap代码" /> <el-input v-model="form.sapCode" placeholder="请输入sap代码" />
</el-form-item> </el-form-item>
<el-form-item label="仓库等级" prop="storeLevel"> <el-form-item label="仓库等级" prop="storeLevel">
@ -115,7 +131,7 @@
</el-form-item> </el-form-item>
<el-form-item label="上级目录" prop="storeHigherLevel"> <el-form-item label="上级目录" prop="storeHigherLevel">
<el-input v-model="form.storeHigherLevel" placeholder="请输入上级目录" /> <el-input v-model="form.storeHigherLevel" placeholder="请输入上级目录" />
</el-form-item> </el-form-item>-->
</el-form> </el-form>
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
@ -157,15 +173,15 @@ const columns = ref<FieldOption[]>([
{ key: 2, label: `更新人`, visible: true }, { key: 2, label: `更新人`, visible: true },
{ key: 3, label: `更新时间`, visible: true }, { key: 3, label: `更新时间`, visible: true },
{ key: 4, label: `租户`, visible: true }, { key: 4, label: `租户`, visible: true },
{ key: 5, label: `主键`, visible: true }, { key: 5, label: `主键`, visible: false },
{ key: 6, label: `仓库名`, visible: true }, { key: 6, label: `仓库名`, visible: true },
{ key: 7, label: `仓库代码`, visible: true }, { key: 7, label: `仓库代码`, visible: true },
{ key: 8, label: `仓库类型`, visible: true }, { key: 8, label: `仓库类型`, visible: true },
{ key: 9, label: `使用状态`, visible: true }, { key: 9, label: `使用状态`, visible: true },
{ key: 10, label: `sap代码`, visible: true }, { key: 10, label: `sap代码`, visible: true },
{ key: 11, label: `仓库等级`, visible: true }, // { key: 11, label: `仓库等级`, visible: true },
{ key: 12, label: `上级目录`, visible: true }, // { key: 12, label: `上级目录`, visible: true },
{ key: 13, label: `创建部门`, visible: true }, // { key: 13, label: `创建部门`, visible: true },
]); ]);
const initFormData: HppStoreForm = { const initFormData: HppStoreForm = {
@ -195,9 +211,9 @@ const data = reactive<PageData<HppStoreForm, HppStoreQuery>>({
} }
}, },
rules: { rules: {
objId: [ // objId: [
{ required: true, message: "主键不能为空", trigger: "blur" } // { required: true, message: "主键不能为空", trigger: "blur" }
], // ],
storeName: [ storeName: [
{ required: true, message: "仓库名不能为空", trigger: "blur" } { required: true, message: "仓库名不能为空", trigger: "blur" }
], ],
@ -207,18 +223,18 @@ const data = reactive<PageData<HppStoreForm, HppStoreQuery>>({
storeType: [ storeType: [
{ required: true, message: "仓库类型不能为空", trigger: "change" } { required: true, message: "仓库类型不能为空", trigger: "change" }
], ],
usedFlag: [ // usedFlag: [
{ required: true, message: "使用状态不能为空", trigger: "blur" } // { required: true, message: "使用状态不能为空", trigger: "blur" }
], // ],
sapCode: [ // sapCode: [
{ required: true, message: "sap代码不能为空", trigger: "blur" } // { required: true, message: "sap代码不能为空", trigger: "blur" }
], // ],
storeLevel: [ // storeLevel: [
{ required: true, message: "仓库等级不能为空", trigger: "blur" } // { required: true, message: "仓库等级不能为空", trigger: "blur" }
], // ],
storeHigherLevel: [ // storeHigherLevel: [
{ required: true, message: "上级目录不能为空", trigger: "blur" } // { required: true, message: "上级目录不能为空", trigger: "blur" }
], // ],
} }
}); });
@ -259,7 +275,7 @@ const resetQuery = () => {
/** 多选框选中数据 */ /** 多选框选中数据 */
const handleSelectionChange = (selection: HppStoreVO[]) => { const handleSelectionChange = (selection: HppStoreVO[]) => {
ids.value = selection.map(item => item.createBy); ids.value = selection.map(item => item.objId);
single.value = selection.length != 1; single.value = selection.length != 1;
multiple.value = !selection.length; multiple.value = !selection.length;
} }

121
src/views/wms/inventoryCheckRecord/index.vue
Unescape Escape View File

@ -1,6 +1,7 @@
<template> <template>
<div class="p-2"> <div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave"> <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
:leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]"> <div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover"> <el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true"> <el-form ref="queryFormRef" :model="queryParams" :inline="true">
@ -17,22 +18,27 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="盘点单号" prop="checkCode"> <el-form-item label="盘点单号" prop="checkCode">
<el-input v-model="queryParams.checkCode" placeholder="请输入盘点单号" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.checkCode" placeholder="请输入盘点单号" clearable
@keyup.enter="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item label="批次码" prop="batchCode"> <el-form-item label="批次码" prop="batchCode">
<el-input v-model="queryParams.batchCode" placeholder="请输入批次码" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.batchCode" placeholder="请输入批次码" clearable
@keyup.enter="handleQuery"/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="物料id" prop="materialId"> <!-- <el-form-item label="物料id" prop="materialId">
<el-input v-model="queryParams.materialId" placeholder="请输入物料id" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.materialId" placeholder="请输入物料id" clearable @keyup.enter="handleQuery" />
</el-form-item> --> </el-form-item> -->
<el-form-item label="库位编码" prop="locationCode"> <el-form-item label="库位编码" prop="locationCode">
<el-input v-model="queryParams.locationCode" placeholder="请输入库位编码" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.locationCode" placeholder="请输入库位编码" clearable
@keyup.enter="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item label="物料编码" prop="materialCode"> <el-form-item label="物料编码" prop="materialCode">
<el-input v-model="queryParams.materialCode" placeholder="请输入物料编码" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.materialCode" placeholder="请输入物料编码" clearable
@keyup.enter="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item label="物料名称" prop="materialName"> <el-form-item label="物料名称" prop="materialName">
<el-input v-model="queryParams.materialName" placeholder="请输入物料名称" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.materialName" placeholder="请输入物料名称" clearable
@keyup.enter="handleQuery"/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="库存数量" prop="inventoryQty"> <!-- <el-form-item label="库存数量" prop="inventoryQty">
<el-input v-model="queryParams.inventoryQty" placeholder="请输入库存数量" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.inventoryQty" placeholder="请输入库存数量" clearable @keyup.enter="handleQuery" />
@ -107,17 +113,20 @@
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:inventoryCheckRecord:remove']">删除</el-button> <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:inventoryCheckRecord:remove']">删除</el-button>
</el-col> --> </el-col> -->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:inventoryCheckRecord:export']">导出</el-button> <el-button type="warning" plain icon="Download" @click="handleExport"
v-hasPermi="['system:inventoryCheckRecord:export']">导出
</el-button>
</el-col> </el-col>
<right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar> <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true"
@queryTable="getList"></right-toolbar>
</el-row> </el-row>
</template> </template>
<el-table v-loading="loading" :data="inventoryCheckRecordList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="inventoryCheckRecordList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="盘点记录主键" align="center" prop="icRecordId" v-if="columns[0].visible"/> <!-- <el-table-column label="盘点记录主键" align="center" prop="icRecordId" v-if="columns[0].visible"/>-->
<el-table-column label="物料大类" align="center" prop="materialCategoryName" v-if="columns[1].visible"> <!-- <el-table-column label="物料大类" align="center" prop="materialCategoryName" v-if="columns[1].visible">-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="盘点单号" align="center" prop="checkCode" v-if="columns[2].visible"/> <el-table-column label="盘点单号" align="center" prop="checkCode" v-if="columns[2].visible"/>
<el-table-column label="批次码" align="center" prop="batchCode" v-if="columns[3].visible"/> <el-table-column label="批次码" align="center" prop="batchCode" v-if="columns[3].visible"/>
<el-table-column label="库位编码" align="center" prop="locationCode" v-if="columns[5].visible"/> <el-table-column label="库位编码" align="center" prop="locationCode" v-if="columns[5].visible"/>
@ -127,55 +136,58 @@
<el-table-column label="盘点数量" align="center" prop="checkQty" v-if="columns[9].visible"/> <el-table-column label="盘点数量" align="center" prop="checkQty" v-if="columns[9].visible"/>
<el-table-column label="盘点状态" align="center" prop="checkStatus" v-if="columns[12].visible"> <el-table-column label="盘点状态" align="center" prop="checkStatus" v-if="columns[12].visible">
<template #default="scope"> <template #default="scope">
<dict-tag :options="wms_stockadjust_status" :value="scope.row.checkStatus"/> <dict-tag :options="wms_stock_result" :value="scope.row.checkStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="erp同步状态" align="center" prop="erpSynchronousStatus" v-if="columns[13].visible"> <!-- <el-table-column label="erp同步状态" align="center" prop="erpSynchronousStatus" v-if="columns[13].visible">-->
<template #default="scope"> <!-- <template #default="scope">-->
<dict-tag :options="erp_synchronous_status" :value="scope.row.erpSynchronousStatus"/> <!-- <dict-tag :options="erp_synchronous_status" :value="scope.row.erpSynchronousStatus"/>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="erp同步数量" align="center" prop="erpSynchronousQty" v-if="columns[14].visible"/> <!-- <el-table-column label="erp同步数量" align="center" prop="erpSynchronousQty" v-if="columns[14].visible"/>-->
<el-table-column label="是否发起调整" align="center" prop="isAdjust" v-if="columns[15].visible"> <el-table-column label="是否发起调整" align="center" prop="isAdjust" v-if="columns[15].visible">
<template #default="scope"> <template #default="scope">
<dict-tag :options="wms_stock_if" :value="scope.row.isAdjust"/> <dict-tag :options="wms_stock_if" :value="scope.row.isAdjust"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审核人" align="center" prop="auditBy" v-if="columns[16].visible"/> <!-- <el-table-column label="审核人" align="center" prop="auditBy" v-if="columns[16].visible"/>-->
<el-table-column label="审核时间" align="center" prop="auditTime" width="180" v-if="columns[17].visible"> <!-- <el-table-column label="审核时间" align="center" prop="auditTime" width="180" v-if="columns[17].visible">-->
<template #default="scope"> <!-- <template #default="scope">-->
<span>{{ parseTime(scope.row.auditTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <!-- <span>{{ parseTime(scope.row.auditTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="审核状态" align="center" prop="auditStatus" v-if="columns[18].visible"> <!-- <el-table-column label="审核状态" align="center" prop="auditStatus" v-if="columns[18].visible">-->
<template #default="scope"> <!-- <template #default="scope">-->
<dict-tag :options="approve_status" :value="scope.row.auditStatus"/> <!-- <dict-tag :options="approve_status" :value="scope.row.auditStatus"/>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="审核意见" align="center" prop="auditComments" v-if="columns[19].visible"/> <!-- <el-table-column label="审核意见" align="center" prop="auditComments" v-if="columns[19].visible"/>-->
<el-table-column label="调整状态" align="center" prop="adjustStatus" v-if="columns[20].visible"> <el-table-column label="调整状态" align="center" prop="adjustStatus" v-if="columns[20].visible">
<template #default="scope"> <template #default="scope">
<dict-tag :options="wms_stockadjust_status" :value="scope.row.adjustStatus"/> <dict-tag :options="wms_stockadjust_status" :value="scope.row.adjustStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="调整类型" align="center" prop="adjustType" v-if="columns[21].visible"> <!-- <el-table-column label="调整类型" align="center" prop="adjustType" v-if="columns[21].visible">-->
<template #default="scope"> <!-- <template #default="scope">-->
<dict-tag :options="wms_stockadjust_type" :value="scope.row.adjustType"/> <!-- <dict-tag :options="wms_stockadjust_type" :value="scope.row.adjustType"/>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-tooltip content="修改" placement="top"> <el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:inventoryCheckRecord:edit']"></el-button> <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:inventoryCheckRecord:edit']"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip content="删除" placement="top"> <el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:inventoryCheckRecord:remove']"></el-button> <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:inventoryCheckRecord:remove']"></el-button>
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" /> <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" @pagination="getList"/>
</el-card> </el-card>
<!-- 添加或修改盘点记录和调整工单对话框 --> <!-- 添加或修改盘点记录和调整工单对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body> <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
@ -243,7 +255,8 @@
v-for="dict in wms_stock_if" v-for="dict in wms_stock_if"
:key="dict.value" :key="dict.value"
:value="dict.value" :value="dict.value"
>{{dict.label}}</el-radio> >{{ dict.label }}
</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="审核人" prop="auditBy"> <el-form-item label="审核人" prop="auditBy">
@ -284,7 +297,8 @@
v-for="dict in wms_stockadjust_type" v-for="dict in wms_stockadjust_type"
:key="dict.value" :key="dict.value"
:value="dict.value" :value="dict.value"
>{{dict.label}}</el-radio> >{{ dict.label }}
</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -299,14 +313,32 @@
</template> </template>
<script setup name="InventoryCheckRecord" lang="ts"> <script setup name="InventoryCheckRecord" lang="ts">
import { listInventoryCheckRecord, getInventoryCheckRecord, delInventoryCheckRecord, addInventoryCheckRecord, updateInventoryCheckRecord } from '@/api/wms/inventoryCheckRecord'; import {
import { InventoryCheckRecordVO, InventoryCheckRecordQuery, InventoryCheckRecordForm } from '@/api/wms/inventoryCheckRecord/types'; listInventoryCheckRecord,
getInventoryCheckRecord,
delInventoryCheckRecord,
addInventoryCheckRecord,
updateInventoryCheckRecord
} from '@/api/wms/inventoryCheckRecord';
import {
InventoryCheckRecordVO,
InventoryCheckRecordQuery,
InventoryCheckRecordForm
} from '@/api/wms/inventoryCheckRecord/types';
import {getBaseMaterialCategoryListInWMS} from '@/api/wms/baseMaterialCategory'; import {getBaseMaterialCategoryListInWMS} from '@/api/wms/baseMaterialCategory';
const {proxy} = getCurrentInstance() as ComponentInternalInstance; const {proxy} = getCurrentInstance() as ComponentInternalInstance;
const { wms_stocking_type, wms_stockadjust_type, approve_status, erp_synchronous_status, wms_stockadjust_status, wms_stock_if } = toRefs<any>(proxy?.useDict( 'wms_stocking_type','wms_stockadjust_type','approve_status','erp_synchronous_status','wms_stockadjust_status','wms_stock_if')); const {
wms_stocking_type,
wms_stockadjust_type,
approve_status,
erp_synchronous_status,
wms_stock_result,
wms_stockadjust_status,
wms_stock_if
} = toRefs<any>(proxy?.useDict('wms_stocking_type', 'wms_stockadjust_type', 'approve_status', 'erp_synchronous_status', 'wms_stockadjust_status', 'wms_stock_if', 'wms_stock_result'));
const inventoryCheckRecordList = ref<InventoryCheckRecordVO[]>([]); const inventoryCheckRecordList = ref<InventoryCheckRecordVO[]>([]);
const buttonLoading = ref(false); const buttonLoading = ref(false);
const loading = ref(true); const loading = ref(true);
@ -399,8 +431,7 @@ const data = reactive<PageData<InventoryCheckRecordForm, InventoryCheckRecordQue
auditComments: undefined, auditComments: undefined,
adjustStatus: undefined, adjustStatus: undefined,
adjustType: undefined, adjustType: undefined,
params: { params: {}
}
}, },
rules: { rules: {
icRecordId: [ icRecordId: [

Write Preview
Loading…
Cancel
Save