xins
/
hwmom-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(wms): 调整入库相关页面的物料大类字段显示逻辑

Browse Source 
- 在多个页面中注释掉物料大类相关的代码
- 调整部分字段的可见性设置
-优化部分代码结构以提高可读性
master
zangch@mesnac.com 5 months ago
parent 3a5a840953
commit 10404fb469
7 changed files with 130 additions and 68 deletions
Show Stats Download Patch File Download Diff File

14
src/api/wms/instockPrint/types.ts
Unescape Escape View File

@ -76,6 +76,11 @@ export interface InstockPrintVO {
*/ */
actualInboundTime: string; actualInboundTime: string;
/**
* 创建时间
*/
createTime?: string;
} }
@ -157,6 +162,11 @@ export interface InstockPrintForm extends BaseEntity {
*/ */
actualInboundTime?: string; actualInboundTime?: string;
/**
* 创建时间
*/
createTime?: string;
} }
export interface InstockPrintQuery extends PageQuery { export interface InstockPrintQuery extends PageQuery {
@ -223,6 +233,10 @@ export interface InstockPrintQuery extends PageQuery {
materialCategoryName?: string; materialCategoryName?: string;
/**
* 创建时间
*/
createTime?: string;
/** /**
* 推荐库位id * 推荐库位id

31
src/api/wms/instockRecord/types.ts
Unescape Escape View File

@ -77,6 +77,17 @@ export interface InstockRecordVO {
*/ */
specialType: string | number; specialType: string | number;
/**
* 用户账号
*/
userName: string;
/**
* 用户昵称
*/
nickName: string;
} }
export interface InstockRecordForm extends BaseEntity { export interface InstockRecordForm extends BaseEntity {
@ -157,6 +168,16 @@ export interface InstockRecordForm extends BaseEntity {
*/ */
specialType?: string | number; specialType?: string | number;
/**
* 用户账号
*/
userName?: string;
/**
* 用户昵称
*/
nickName?: string;
} }
export interface InstockRecordQuery extends PageQuery { export interface InstockRecordQuery extends PageQuery {
@ -218,6 +239,16 @@ export interface InstockRecordQuery extends PageQuery {
*/ */
specialType?: string | number; specialType?: string | number;
/**
* 用户账号
*/
userName?: string;
/**
* 用户昵称
*/
nickName?: string;
/** /**
* 日期范围参数 * 日期范围参数
*/ */

27
src/views/wms/instockOrderCopy/index.vue
Unescape Escape View File

@ -64,8 +64,8 @@
<el-table-column type="selection" width="55"/> <el-table-column type="selection" width="55"/>
<!-- <el-table-column label="入库单 主键" align="center" prop="instockId"/> --> <!-- <el-table-column label="入库单 主键" align="center" prop="instockId"/> -->
<el-table-column label="入库单号" align="center" prop="instockCode"/> <el-table-column label="入库单号" align="center" prop="instockCode"/>
<el-table-column label="物料大类" align="center" prop="materialCategoryName"> <!-- <el-table-column label="物料大类" align="center" prop="materialCategoryName">-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="工单类型" align="center" prop="instockType"> <el-table-column label="工单类型" align="center" prop="instockType">
<template #default="scope"> <template #default="scope">
<dict-tag :options="wms_instock_type" :value="scope.row.instockType"/> <dict-tag :options="wms_instock_type" :value="scope.row.instockType"/>
@ -138,8 +138,8 @@
<dict-tag :options="wms_barcode_if" :value="scope.row.codeYesNo"/> <dict-tag :options="wms_barcode_if" :value="scope.row.codeYesNo"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料大类" align="center" prop="materialCategoryName"> <!-- <el-table-column label="物料大类" align="center" prop="materialCategoryName">-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="操作" fixed="right" width="200"> <el-table-column label="操作" fixed="right" width="200">
<template #default="scope"> <template #default="scope">
<el-button size="small" @click="childrenTableUpdate( scope.row)" v-if="auditStatusLoad && partntTableSelectCell.instockType !== '6'"> <el-button size="small" @click="childrenTableUpdate( scope.row)" v-if="auditStatusLoad && partntTableSelectCell.instockType !== '6'">
@ -706,7 +706,8 @@ const childrenTableInfoForm = ref<any>({
printCopies: 1, printCopies: 1,
packageQtyList: [] as number[], packageQtyList: [] as number[],
packageMode: 'average', packageMode: 'average',
batchCode: '' batchCode: '',
createTime: '',
}) })
@ -719,7 +720,7 @@ const queryForm = ref({
instockMethond: '', instockMethond: '',
auditStatus: '', auditStatus: '',
pageNum: 1, pageNum: 1,
pageSize: 10 pageSize: 10,
}) })
// 获取路由实例 // 获取路由实例
@ -734,6 +735,18 @@ if (route.query.instockMethond) {
queryForm.value.instockMethond = instockMethondValue; queryForm.value.instockMethond = instockMethondValue;
routeInstockMethondValue = instockMethondValue; // 保存路由参数值 routeInstockMethondValue = instockMethondValue; // 保存路由参数值
} }
// 初始化时获取路由参数并设置到查询表单
let routeInstockTypeValue = '';
if (route.query.instockType) {
// 确保值是字符串类型，如果是数组则取第一个元素
const instockTypeValue = Array.isArray(route.query.instockType)
? route.query.instockType[0]
: route.query.instockType;
queryForm.value.instockType = instockTypeValue;
routeInstockTypeValue = instockTypeValue; // 保存路由参数值
}
const parentTableRef = ref() const parentTableRef = ref()
const parentTableData = ref([]) const parentTableData = ref([])
@ -923,7 +936,7 @@ const reset = () => {
instockCode: '', instockCode: '',
materialCategoryId: '', materialCategoryId: '',
materialCategoryName: '', materialCategoryName: '',
instockType: '', instockType: routeInstockTypeValue,
instockMethond: routeInstockMethondValue,// 使用保存的路由参数值 instockMethond: routeInstockMethondValue,// 使用保存的路由参数值
auditStatus: '', auditStatus: '',
pageNum: 1, pageNum: 1,

22
src/views/wms/instockPrint/index.vue
Unescape Escape View File

@ -51,17 +51,17 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="物料大类" prop="materialCategoryId"> <!-- <el-form-item label="物料大类" prop="materialCategoryId">-->
<el-select v-model="queryParams.materialCategoryId" placeholder="请选择物料大类"> <!-- <el-select v-model="queryParams.materialCategoryId" placeholder="请选择物料大类">-->
<el-option v-for="item in mategoryOptions" <!-- <el-option v-for="item in mategoryOptions"-->
:key="item.materialCategoryId" <!-- :key="item.materialCategoryId"-->
:label="item.materialCategoryName" <!-- :label="item.materialCategoryName"-->
:value="item.materialCategoryId" <!-- :value="item.materialCategoryId"-->
/> <!-- />-->
</el-select> <!-- </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>
@ -138,6 +138,7 @@
<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>
<el-form ref="instockPrintFormRef" :model="form" :rules="rules" label-width="80px"> <el-form ref="instockPrintFormRef" :model="form" :rules="rules" label-width="80px">
@ -232,6 +233,7 @@ const initFormData: InstockPrintForm = {
inboundStatus: undefined, inboundStatus: undefined,
actualInboundTime: undefined, actualInboundTime: undefined,
} }
const data = reactive<PageData<InstockPrintForm, InstockPrintQuery>>({ const data = reactive<PageData<InstockPrintForm, InstockPrintQuery>>({
form: {...initFormData}, form: {...initFormData},
queryParams: { queryParams: {
@ -335,7 +337,7 @@ const columns = ref<FieldOption[]>([
{ key: 9, label: `物料规格`, visible: true }, { key: 9, label: `物料规格`, visible: true },
{ key: 10, label: `计量单位名称`, visible: true }, { key: 10, label: `计量单位名称`, visible: true },
{ key: 11, label: `是否有条码`, visible: true }, { key: 11, label: `是否有条码`, visible: true },
{ key: 12, label: `物料大类`, visible: true }, { key: 12, label: `物料大类`, visible: false },
// { key: 13, label: `推荐库位id`, visible: inboundStatusdVisble.value }, // { key: 13, label: `推荐库位id`, visible: inboundStatusdVisble.value },
// { key: 14, label: `入库状态(0-待入库,1-已入库,2-入库中)`, visible: inboundStatusdVisble.value }, // { key: 14, label: `入库状态(0-待入库,1-已入库,2-入库中)`, visible: inboundStatusdVisble.value },
// { key: 15, label: `实际入库时间`, visible: inboundStatusdVisble.value }, // { key: 15, label: `实际入库时间`, visible: inboundStatusdVisble.value },

26
src/views/wms/instockRecord/index.vue
Unescape Escape View File

@ -26,15 +26,15 @@
<!-- <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="materialCategoryId"> <!-- <el-form-item label="物料大类" prop="materialCategoryId">-->
<el-select v-model="queryParams.materialCategoryId" placeholder="请选择物料大类" clearable > <!-- <el-select v-model="queryParams.materialCategoryId" placeholder="请选择物料大类" clearable >-->
<el-option v-for="item in mategoryOptions" <!-- <el-option v-for="item in mategoryOptions"-->
:key="item.materialCategoryId" <!-- :key="item.materialCategoryId"-->
:label="item.materialCategoryName" <!-- :label="item.materialCategoryName"-->
:value="item.materialCategoryId" <!-- :value="item.materialCategoryId"-->
/> <!-- />-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="erp同步状态" prop="erpSynchronousStatus" label-width="120px"> <el-form-item label="erp同步状态" prop="erpSynchronousStatus" label-width="120px">
<el-select v-model="queryParams.erpSynchronousStatus" placeholder="请选择erp同步状态" clearable > <el-select v-model="queryParams.erpSynchronousStatus" placeholder="请选择erp同步状态" clearable >
<el-option v-for="dict in sys_common_status" :key="dict.value" :label="dict.label" :value="dict.value"/> <el-option v-for="dict in sys_common_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
@ -83,7 +83,7 @@
<el-table-column label="入库数量" align="center" prop="instockQty" v-if="columns[8].visible"/> <el-table-column label="入库数量" align="center" prop="instockQty" v-if="columns[8].visible"/>
<el-table-column label="物料大类" align="center" prop="materialCategoryName" v-if="columns[9].visible"> <el-table-column label="物料大类" align="center" prop="materialCategoryName" v-if="columns[9].visible">
</el-table-column> </el-table-column>
<el-table-column label="入库人" align="center" prop="createBy" v-if="columns[10].visible"/> <el-table-column label="入库人" align="center" prop="userName" v-if="columns[10].visible"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[11].visible"> <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[11].visible">
<template #default="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@ -221,11 +221,11 @@ const columns = ref<FieldOption[]>([
{ 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: false },
{ key: 10, label: `入库人`, visible: true }, { key: 10, label: `入库人`, visible: true },
{ key: 11, label: `创建时间`, visible: true }, { key: 11, label: `创建时间`, visible: true },
{ key: 12, label: `erp同步状态`, visible: false }, { key: 12, label: `erp同步状态`, visible: false },
{ key: 13, label: `erp同步数量`, visible: false }, { key: 13, label: `erp同步数量`, visible: false },
// { key: 14, label: `修改人`, visible: true }, // { key: 14, label: `修改人`, visible: true },
{ key: 14, label: `同步时间`, visible: true }, { key: 14, label: `同步时间`, visible: true },
{ key: 15, label: `特殊标识`, visible: true }, { key: 15, label: `特殊标识`, visible: true },
@ -248,6 +248,7 @@ const initFormData: InstockRecordForm = {
erpSynchronousQty: undefined, erpSynchronousQty: undefined,
specialType: undefined, specialType: undefined,
} }
const data = reactive<PageData<InstockRecordForm, InstockRecordQuery>>({ const data = reactive<PageData<InstockRecordForm, InstockRecordQuery>>({
form: {...initFormData}, form: {...initFormData},
queryParams: { queryParams: {
@ -266,6 +267,7 @@ const data = reactive<PageData<InstockRecordForm, InstockRecordQuery>>({
params: { params: {
} }
}, },
rules: { rules: {
erpSynchronousStatus: [ erpSynchronousStatus: [
{ required: true, message: "erp同步状态不能为空", trigger: "change" } { required: true, message: "erp同步状态不能为空", trigger: "change" }

2
src/views/wms/wmsPurchaseOrder/index.vue
Unescape Escape View File

@ -291,7 +291,7 @@ const columns = ref<FieldOption[]>([
{ key: 10, label: `创建时间`, visible: false }, { key: 10, label: `创建时间`, visible: false },
{ key: 11, label: `更新人`, visible: false }, { key: 11, label: `更新人`, visible: false },
{ key: 12, label: `更新时间`, visible: false }, { key: 12, label: `更新时间`, visible: false },
{ key: 13, label: `物料大类`, visible: true }, { key: 13, label: `物料大类`, visible: false },
{ key: 14, label: `审核人`, visible: false }, { key: 14, label: `审核人`, visible: false },
{ key: 15, label: `审核时间`, visible: false }, { key: 15, label: `审核时间`, visible: false },
{ key: 16, label: `审核状态`, visible: false }, { key: 16, label: `审核状态`, visible: false },

30
src/views/wms/wmsPurchaseOrderCopy/index.vue
Unescape Escape View File

@ -15,15 +15,15 @@
<el-option v-for="dict in wms_po_type" :key="dict.value" :label="dict.label" :value="dict.value"/> <el-option v-for="dict in wms_po_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="物料大类" prop="materialCategoryId"> <!-- <el-form-item label="物料大类" prop="materialCategoryId">-->
<el-select v-model="queryForm.materialCategoryId" placeholder="请选择物料大类" clearable> <!-- <el-select v-model="queryForm.materialCategoryId" placeholder="请选择物料大类" clearable>-->
<el-option v-for="item in mategoryOptions" <!-- <el-option v-for="item in mategoryOptions"-->
:key="item.materialCategoryId" <!-- :key="item.materialCategoryId"-->
:label="item.materialCategoryName" <!-- :label="item.materialCategoryName"-->
:value="item.materialCategoryId" <!-- :value="item.materialCategoryId"-->
/> <!-- />-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="审核状态" prop="auditStatus"> <el-form-item label="审核状态" prop="auditStatus">
<el-select v-model="queryForm.auditStatus" placeholder="请选择审核状态" clearable> <el-select v-model="queryForm.auditStatus" placeholder="请选择审核状态" clearable>
<el-option v-for="dict in wms_audit_status" :key="dict.value" :label="dict.label" :value="dict.value"/> <el-option v-for="dict in wms_audit_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
@ -63,11 +63,11 @@
<el-table-column type="selection" width="55"/> <el-table-column type="selection" width="55"/>
<el-table-column label="订单编号" align="center" prop="poNo"/> <el-table-column label="订单编号" align="center" prop="poNo"/>
<!-- <el-table-column label="订单状态" align="center" prop="poStatus">--> <el-table-column label="订单状态" align="center" prop="poStatus">
<!-- <template #default="scope">--> <template #default="scope">
<!-- <dict-tag :options="wms_po_status" :value="scope.row.poStatus"/>--> <dict-tag :options="wms_po_status" :value="scope.row.poStatus"/>
<!-- </template>--> </template>
<!-- </el-table-column>--> </el-table-column>
<el-table-column label="计划交货日期" align="center" prop="planDeliveryDate" width="180"> <el-table-column label="计划交货日期" align="center" prop="planDeliveryDate" width="180">
<template #default="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.planDeliveryDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.planDeliveryDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@ -342,7 +342,7 @@
<el-input v-model="scope.row.purchaseQty" placeholder="请输入采购数量" style="width: 240px"/> <el-input v-model="scope.row.purchaseQty" placeholder="请输入采购数量" style="width: 240px"/>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="送货数量" prop="deliveryQty"> <!-- <el-table-column label="送货数量" prop="deliveryQty" readonly>
<template #default="scope"> <template #default="scope">
<el-input v-model="scope.row.deliveryQty" placeholder="请输入送货数量" style="width: 240px"/> <el-input v-model="scope.row.deliveryQty" placeholder="请输入送货数量" style="width: 240px"/>
</template> </template>

Write Preview
Loading…
Cancel
Save