diff --git a/src/locales/en.ts b/src/locales/en.ts index 56019626..7e6b3705 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -495,6 +495,12 @@ purchaseUnit: 'Purchase Unit', purchaseUnitConvertQuantity: 'Purchase Convert Qty', defaultSupplier: 'Supplier (Default)', + outboundPurpose: 'Outbound Purpose', + relatedOrder: 'Related Order', + relatedRepairOrder: 'Related Repair Order', + relatedMaintainRecord: 'Related Maintenance Record', + selectRelatedRepairOrder: 'Select Repair Order', + selectRelatedMaintainRecord: 'Select Maintenance Record', inputUnitType: 'Unit Input Type', inputCount: 'Purchase Unit Quantity', count: 'Quantity', @@ -511,13 +517,17 @@ placeholderArea: 'Please select area', placeholderProduct: 'Please select product', placeholderBarcode: 'Please select barcode', + placeholderOutboundPurpose: 'Please select outbound purpose', + placeholderRelatedRepairOrder: 'Please select related repair order', + placeholderRelatedMaintainRecord: 'Please select related maintenance record', placeholderInputUnitType: 'Please select', placeholderCode: 'Please enter code', placeholderName: 'Please enter name', validatorWarehouseRequired: 'Warehouse is required', validatorAreaRequired: 'Please select area', validatorProductRequired: 'Product is required', - validatorCountRequired: 'Quantity is required' + validatorCountRequired: 'Quantity is required', + stockCountExceededWarning: 'Quantity cannot exceed stock. It has been adjusted to stock quantity.' }, Check: { no: 'Check No', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index de456268..8553a215 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -495,6 +495,12 @@ purchaseUnit: '采购单位', purchaseUnitConvertQuantity: '采购换算数量', defaultSupplier: '供应商(默认)', + outboundPurpose: '出库用途', + relatedOrder: '关联单据', + relatedRepairOrder: '关联维修单', + relatedMaintainRecord: '关联保养记录', + selectRelatedRepairOrder: '选择维修单', + selectRelatedMaintainRecord: '选择保养记录', inputUnitType: '单位输入方式', inputCount: '采购单位数量', count: '数量', @@ -511,13 +517,17 @@ placeholderArea: '请选择库区', placeholderProduct: '请选择产品', placeholderBarcode: '请选择编码', + placeholderOutboundPurpose: '请选择出库用途', + placeholderRelatedRepairOrder: '请选择关联维修单', + placeholderRelatedMaintainRecord: '请选择关联保养记录', placeholderInputUnitType: '请选择', placeholderCode: '请输入编码', placeholderName: '请输入名称', validatorWarehouseRequired: '仓库不能为空', validatorAreaRequired: '请选择库区', validatorProductRequired: '产品不能为空', - validatorCountRequired: '产品数量不能为空' + validatorCountRequired: '产品数量不能为空', + stockCountExceededWarning: '数量不能超出库存,已自动调整为库存数量' }, Check: { no: '盘点单号', diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 82e5c6f3..427a7797 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -232,6 +232,7 @@ export enum DICT_TYPE { WAREHOUSE_DOCUMENT_OUT_TYPES = 'warehouse_document_out_types', // 出库单据类型 WAREHOUSE_RECEIVING_STATUS = 'warehouse_receiving_status', // 入库状态 WAREHOUSE_OUTBOUND_STATUS = 'Warehouse_outbound_status', // 出库状态 + WAREHOUSE_OUTBOUND_PURPOSE = 'warehouse_outbound_purpose', // 出库用途 SUBMOLD_TYPE = 'submold_type', // 子模具类型 ERP_MAINTAIN_TYPE = 'maintain_type',// ERP 保养类型 diff --git a/src/views/erp/stock/out/components/StockOutItemForm.vue b/src/views/erp/stock/out/components/StockOutItemForm.vue index 1004c675..85c3470d 100644 --- a/src/views/erp/stock/out/components/StockOutItemForm.vue +++ b/src/views/erp/stock/out/components/StockOutItemForm.vue @@ -110,28 +110,83 @@ v-model="row.productId" :options="productCascaderOptions" :props="productCascade - + - + - + + + + @@ -224,6 +279,103 @@ v-loading="productDialogLoading" :data="productDialogList" row-key="id" :stripe= {{ t('common.cancel') }} + + + + + + + + + +
+ +
+ +