From 558e1ac63c2ab08c493b96243545d419d0b87328 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 26 Nov 2024 17:10:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/package/index.ts | 4 +- .../customerreceiptRequestMain.data.ts | 4 - .../deliverRecordMain.data.ts | 56 ++++++++ .../inventoryManage/balance/balance.data.ts | 131 ++++++++++++++++++ .../index.vue | 3 + 5 files changed, 192 insertions(+), 6 deletions(-) diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts index c0975c49a..4de2d428a 100644 --- a/src/api/wms/package/index.ts +++ b/src/api/wms/package/index.ts @@ -107,8 +107,8 @@ export const batchPrintingLableGet = async (params: any) => { } // 批量打印标签+创建新标签 -export const batchPrintingBalanceLableForCreate = async (params: any) => { - return await request.get({ url: `/wms/package/batchPrintingBalanceLableForCreate`, params }) +export const batchPrintingBalanceLableForCreate = async (data: any) => { + return await request.post({ url: `/wms/package/batchPrintingBalanceLableForCreate`, data }) } // 批量打印标签多选 export const batchPrintingLables = async (data: any) => { diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts index 7c8e0d094..2051d9ead 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts @@ -415,7 +415,6 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( valueFormat: 'x', } }, - isTable: false, isForm: false }, { @@ -425,7 +424,6 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - isTable: false, isForm: false }, { @@ -734,7 +732,6 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive([ }, isTable: true, }, + { + label: '最后更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + }, // { // label: '任务明细ID', // field: 'jobDetailId', diff --git a/src/views/wms/inventoryManage/balance/balance.data.ts b/src/views/wms/inventoryManage/balance/balance.data.ts index a371bf107..b91e07ca5 100644 --- a/src/views/wms/inventoryManage/balance/balance.data.ts +++ b/src/views/wms/inventoryManage/balance/balance.data.ts @@ -1,6 +1,12 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter, dateFormatter2 } from '@/utils/formatTime' +import * as SupplieritemApi from '@/api/wms/supplieritem' +import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data' + +import * as ProductionlineitemApi from '@/api/wms/productionlineitem' +import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data' +import { validatePositiveNumber } from "@/utils/validator"; /** * @returns {Array} 库存余额 */ @@ -821,3 +827,128 @@ export const BalanceRules = reactive({ { required: true, message: '请选择生产日期', trigger: 'change' } ], }) + +// 表单校验 +export const BalancePackageRules = reactive({ + + batch: [ + { required: true, message: '请输入批次', trigger: 'blur' } + ], + printQty: [ + { required: true, message: '请输入打印数量', trigger: 'blur' }, + { validator: validatePositiveNumber, message: '必须是一个正数', trigger: 'change' } + ], +}) +export const BalancePackage = useCrudSchemas(reactive([ + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + isSearch: true, + table: { + }, + tableForm: { + disabled: true + } + }, + { + label: '批次', + field: 'batch', + sort: 'custom', + isSearch: true, + tableForm: { + type: 'FormDate', + format: 'YYYYMMDD', + valueFormat: 'YYYYMMDD', + } + }, + { + label: '打印数量', + field: 'printQty', + sort: 'custom', + table: { + }, + tableForm: { + type: 'InputNumber', + precision: 6, + min: 0 + } + }, + { + label: '包装规格', + field: 'packUnit', + sort: 'custom', + tableForm: { + disabled: true + } + }, + { + label: '标包数量', + field: 'packQty', + sort: 'custom', + tableForm: { + disabled: true + } + }, + { + label: '计量单位', + field: 'uom', + sort: 'custom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + form: { + component: 'Select' + }, + table: { + }, + tableForm: { + type: 'Select', + disabled: true + } + }, + { + label: '标签生产线代码', + field: 'productionLineCodePackage', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + enterSearch: true, + isInpuFocusShow: true, + searchListPlaceholder: '请选择生产线代码', // 输入框占位文本 + searchField: 'productionLineCode', // 查询弹窗赋值字段 + searchTitle: '生产线物料关系信息', // 查询弹窗标题 + searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类 + searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'itemCode', + value: 'itemCode', + isMainValue: true + }] + } + }, + { + label: '标签供应商代码', + field: 'supplierItemCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + enterSearch: true, + isInpuFocusShow: true, + searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 + searchField: 'supplierCode', // 查询弹窗赋值字段 + searchTitle: '供应商信息', // 查询弹窗标题 + searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类 + searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'itemCode', + value: 'itemCode', + message: '请填写物料代码！', + isMainValue: true + }] + } + }, +])) diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue index aa59a0c38..8715bded9 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue @@ -77,6 +77,9 @@ @searchTableSuccessDetail="searchTableSuccessDetail" :detailValidate="detailValidate" @onBlur="onBlur" + :detailButtonIsShowAdd="false" + :detailButtonIsShowEdit="false" + :detailButtonIsShowDelete="false" />