diff --git a/src/locales/en.ts b/src/locales/en.ts index abea4982..07f9d69e 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -111,6 +111,7 @@ export default { price: 'Amount', totalPrice: 'Total Price', inType: 'Inbound Type', + file: 'Attachment', tabProduct: 'Product Inbound', tabMaterial: 'Material Inbound', tabPart: 'Part Inbound', @@ -218,6 +219,34 @@ export default { validatorWarehouseRequired: 'Warehouse name is required' } }, + Record: { + product: 'Product', + warehouse: 'Warehouse', + bizType: 'Type', + bizNo: 'Business No', + categoryProduct: 'Product', + categoryMaterial: 'Material', + categorySpare: 'Spare Part', + categoryTool: 'Tool', + categoryConsumable: 'Consumable', + categoryOther: 'Other', + productName: 'Product Name', + categoryName: 'Product Category', + unitName: 'Unit', + warehouseName: 'Warehouse Code', + count: 'In/Out Quantity', + totalCount: 'Stock Quantity', + recordTime: 'In/Out Date', + createTime: 'Create Date', + creatorName: 'Operator', + placeholderProduct: 'Please select product', + placeholderWarehouse: 'Please select warehouse', + placeholderBizType: 'Please select type', + placeholderBizNo: 'Please input business no', + placeholderCreateTimeStart: 'Start Date', + placeholderCreateTimeEnd: 'End Date', + exportName: 'ProductStockRecord.xls' + }, Move: { no: 'Transfer No', product: 'Product', @@ -502,6 +531,8 @@ export default { detail: 'Detail', export: 'Export', import: 'Import', + approve: 'Approve', + unapprove: 'Unapprove', generate: 'Generate', logout: 'Login Out', test: 'Test', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index b87ad8fa..492a4986 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -111,6 +111,7 @@ export default { price: '金额', totalPrice: '合计金额', inType: '入库类型', + file: '附件', tabProduct: '产品入库', tabMaterial: '原料入库', tabPart: '备件入库', @@ -218,6 +219,34 @@ export default { validatorWarehouseRequired: '仓库名字不能为空' } }, + Record: { + product: '产品', + warehouse: '仓库', + bizType: '类型', + bizNo: '业务单号', + categoryProduct: '产品', + categoryMaterial: '原料', + categorySpare: '备件', + categoryTool: '工具', + categoryConsumable: '耗材', + categoryOther: '其他', + productName: '产品名称', + categoryName: '产品分类', + unitName: '产品单位', + warehouseName: '仓库编号', + count: '出入库数量', + totalCount: '库存量', + recordTime: '出入库日期', + createTime: '创建日期', + creatorName: '操作人', + placeholderProduct: '请选择产品', + placeholderWarehouse: '请选择仓库', + placeholderBizType: '请选择类型', + placeholderBizNo: '请输入业务单号', + placeholderCreateTimeStart: '开始日期', + placeholderCreateTimeEnd: '结束日期', + exportName: '产品库存明细.xls' + }, Move: { no: '调拨单号', product: '产品', @@ -504,6 +533,8 @@ export default { detail: '详情', export: '导出', import: '导入', + approve: '审批', + unapprove: '反审批', generate: '生成', logout: '强制退出', test: '测试', diff --git a/src/views/erp/stock/in/StockInForm.vue b/src/views/erp/stock/in/StockInForm.vue index 7e57f3aa..76b110b0 100644 --- a/src/views/erp/stock/in/StockInForm.vue +++ b/src/views/erp/stock/in/StockInForm.vue @@ -4,45 +4,45 @@ ref="formRef" :model="formData" :rules="formRules" - label-width="100px" + label-width="auto" v-loading="formLoading" :disabled="disabled" > - - - - - - - -
- -
- - - + + + + + + + +
+ +
+ + + - + - + @@ -85,17 +85,17 @@ --> - + - + @@ -104,16 +104,16 @@ - + @@ -144,8 +144,8 @@ const formData = ref({ no: undefined }) const formRules = reactive({ - inTime: [{ required: true, message: '入库时间不能为空', trigger: 'blur' }], - inType: [{ required: true, message: '入库类型不能为空', trigger: 'blur' }] + inTime: [{ required: true, message: t('ErpStock.In.validatorInTimeRequired'), trigger: 'blur' }], + inType: [{ required: true, message: t('ErpStock.In.validatorInTypeRequired'), trigger: 'blur' }] }) const disabled = computed(() => formType.value === 'detail') const formRef = ref() // 表单 Ref @@ -153,12 +153,11 @@ const supplierList = ref([]) // 供应商列表 const options = [ { value: '其他入库', - label: '其他入库', + label: t('ErpStock.In.tabOther') }, { value: '备件入库', - label: '备件入库', - + label: t('ErpStock.In.tabPart') }, // { // value: '原料入库', @@ -166,7 +165,7 @@ const options = [ // }, { value: '产品入库', - label: '产品入库', + label: t('ErpStock.In.tabProduct') }, // { // value: '生产入库', diff --git a/src/views/erp/stock/in/components/StockInItemForm.vue b/src/views/erp/stock/in/components/StockInItemForm.vue index d107ddf3..830f9a1e 100644 --- a/src/views/erp/stock/in/components/StockInItemForm.vue +++ b/src/views/erp/stock/in/components/StockInItemForm.vue @@ -9,8 +9,8 @@ :disabled="disabled" > - - + + - + - + - + - + - + - + - + - + - +