diff --git a/web/src/locales/lang/en/retail.ts b/web/src/locales/lang/en/retail.ts index 4e94636d..c22d7c7d 100644 --- a/web/src/locales/lang/en/retail.ts +++ b/web/src/locales/lang/en/retail.ts @@ -38,6 +38,7 @@ export default { receiptDate: 'Receipt date', inputReceiptDate: 'Please select receipt date', receiptNumber: 'Receipt number', + inputReceiptNumber: 'Please enter the receipt number', collectionType: 'Collection type', inputCollectionType: 'Please select collection type', scanCodeData: 'Scan code to enter data', diff --git a/web/src/locales/lang/en/sales.ts b/web/src/locales/lang/en/sales.ts index edc042ee..ec00c938 100644 --- a/web/src/locales/lang/en/sales.ts +++ b/web/src/locales/lang/en/sales.ts @@ -33,6 +33,7 @@ export default { receiptDate: 'Receipt date', inputReceiptDate: 'Please select receipt date', receiptNumber: 'Receipt number', + inputReceiptNumber: 'Please enter the receipt number', salesPerson: 'Sales Person', inputSalesPerson: 'Please select sales person', scanCodeData: 'Scan code to enter data', diff --git a/web/src/locales/lang/zh-CN/retail.ts b/web/src/locales/lang/zh-CN/retail.ts index b964bfb0..d13acb1a 100644 --- a/web/src/locales/lang/zh-CN/retail.ts +++ b/web/src/locales/lang/zh-CN/retail.ts @@ -38,6 +38,7 @@ export default { receiptDate: '单据日期', inputReceiptDate: '请选择单据日期', receiptNumber: '单据编号', + inputReceiptNumber: '请输入单据编号', collectionType: '收款方式', inputCollectionType: '请选择收款方式', scanCodeData: '扫码录入数据', diff --git a/web/src/locales/lang/zh-CN/sales.ts b/web/src/locales/lang/zh-CN/sales.ts index 331964db..f0ec42b9 100644 --- a/web/src/locales/lang/zh-CN/sales.ts +++ b/web/src/locales/lang/zh-CN/sales.ts @@ -33,6 +33,7 @@ export default { receiptDate: '单据日期', inputReceiptDate: '请选择单据日期', receiptNumber: '单据编号', + inputReceiptNumber: '请输入单据编号', salesPerson: '销售人员', inputSalesPerson: '请选择销售人员', scanCodeData: '扫码录入数据', diff --git a/web/src/views/financial/advance-charge/components/AdvanceChargeModal.vue b/web/src/views/financial/advance-charge/components/AdvanceChargeModal.vue index 0cbe88e8..4f0b724e 100644 --- a/web/src/views/financial/advance-charge/components/AdvanceChargeModal.vue +++ b/web/src/views/financial/advance-charge/components/AdvanceChargeModal.vue @@ -40,8 +40,8 @@ - + data-title="单据编号" :rules="[{ required: true}]"> + @@ -354,6 +354,10 @@ export default defineComponent({ createMessage.warn(t('financial.advance.form.inputReceiptDate')); return; } + if (!formState.receiptNumber) { + createMessage.warn(t('sales.order.form.inputReceiptNumber')); + return; + } if (tableData.value.length === 0) { createMessage.warn(t('financial.advance.form.noticeFour')); return; diff --git a/web/src/views/financial/collection/components/AddEditCollectionModal.vue b/web/src/views/financial/collection/components/AddEditCollectionModal.vue index f376a406..d48a969c 100644 --- a/web/src/views/financial/collection/components/AddEditCollectionModal.vue +++ b/web/src/views/financial/collection/components/AddEditCollectionModal.vue @@ -41,8 +41,8 @@ - + data-intro="单据编号自动生成、自动累加、开头是单据类型的首字母缩写，累加的规则是每次打开页面会自动占用一个新的编号" :rules="[{ required: true}]"> + @@ -399,6 +399,10 @@ export default defineComponent({ createMessage.warn(t('financial.collection.form.inputReceiptDate')); return; } + if (!collectionFormState.receiptNumber) { + createMessage.warn(t('sales.order.form.inputReceiptNumber')); + return; + } if (!collectionFormState.collectionAccountId) { createMessage.warn(t('financial.collection.form.noticeTwo')); return; diff --git a/web/src/views/financial/expense/components/AddEditExpenseModal.vue b/web/src/views/financial/expense/components/AddEditExpenseModal.vue index e2e00dc9..6d64772d 100644 --- a/web/src/views/financial/expense/components/AddEditExpenseModal.vue +++ b/web/src/views/financial/expense/components/AddEditExpenseModal.vue @@ -41,8 +41,8 @@ - + data-intro="单据编号自动生成、自动累加、开头是单据类型的首字母缩写，累加的规则是每次打开页面会自动占用一个新的编号" :rules="[{ required: true}]"> + @@ -384,6 +384,10 @@ export default defineComponent({ createMessage.warn(t('financial.expense.form.inputReceiptDate')); return; } + if (!expenseFormState.receiptNumber) { + createMessage.warn(t('sales.order.form.inputReceiptNumber')); + return; + } if (!expenseFormState.expenseAccountId) { createMessage.warn(t('financial.expense.form.inputExpenseAccount')); return; diff --git a/web/src/views/financial/income/components/AddEditIncomeModal.vue b/web/src/views/financial/income/components/AddEditIncomeModal.vue index f06e641a..1bb7c1ff 100644 --- a/web/src/views/financial/income/components/AddEditIncomeModal.vue +++ b/web/src/views/financial/income/components/AddEditIncomeModal.vue @@ -41,8 +41,8 @@ - + data-intro="单据编号自动生成、自动累加、开头是单据类型的首字母缩写，累加的规则是每次打开页面会自动占用一个新的编号" :rules="[{ required: true}]"> + @@ -391,6 +391,10 @@ export default defineComponent({ createMessage.warn(t('financial.income.form.inputReceiptDate')); return; } + if (!incomeFormState.receiptNumber) { + createMessage.warn(t('sales.order.form.inputReceiptNumber')); + return; + } if (!incomeFormState.incomeAccountId) { createMessage.warn(t('financial.income.form.inputIncomeAccount')); return; diff --git a/web/src/views/financial/payment/components/AddEditPaymentModal.vue b/web/src/views/financial/payment/components/AddEditPaymentModal.vue index 55cae9b8..f6caa0a9 100644 --- a/web/src/views/financial/payment/components/AddEditPaymentModal.vue +++ b/web/src/views/financial/payment/components/AddEditPaymentModal.vue @@ -41,8 +41,8 @@ - + data-intro="单据编号自动生成、自动累加、开头是单据类型的首字母缩写，累加的规则是每次打开页面会自动占用一个新的编号" :rules="[{ required: true}]"> + @@ -399,6 +399,10 @@ export default defineComponent({ createMessage.warn(t('financial.payment.form.inputReceiptDate')); return; } + if (!paymentFormState.receiptNumber) { + createMessage.warn(t('sales.order.form.inputReceiptNumber')); + return; + } if (!paymentFormState.paymentAccountId) { createMessage.warn(t('financial.payment.form.inputPaymentAccount')); return; diff --git a/web/src/views/financial/transfer/components/AddEditTransferModal.vue b/web/src/views/financial/transfer/components/AddEditTransferModal.vue index 61e60f9f..f5700b81 100644 --- a/web/src/views/financial/transfer/components/AddEditTransferModal.vue +++ b/web/src/views/financial/transfer/components/AddEditTransferModal.vue @@ -30,8 +30,8 @@ - + data-intro="单据编号自动生成、自动累加、开头是单据类型的首字母缩写，累加的规则是每次打开页面会自动占用一个新的编号" :rules="[{ required: true}]"> + @@ -350,6 +350,10 @@ export default defineComponent({ createMessage.warn(t('financial.transfer.form.inputReceiptDate')); return; } + if (!transferFormState.receiptNumber) { + createMessage.warn(t('sales.order.form.inputReceiptNumber')); + return; + } if (!transferFormState.paymentAccountId) { createMessage.warn(t('financial.transfer.form.inputPaymentAccount')); return; diff --git a/web/src/views/purchase/order/components/AddEditModal.vue b/web/src/views/purchase/order/components/AddEditModal.vue index 6225f302..c068047c 100644 --- a/web/src/views/purchase/order/components/AddEditModal.vue +++ b/web/src/views/purchase/order/components/AddEditModal.vue @@ -51,8 +51,8 @@ - + data-intro="单据编号自动生成、自动累加、开头是单据类型的首字母缩写，累加的规则是每次打开页面会自动占用一个新的编号" :rules="[{ required: true}]"> + @@ -592,6 +592,10 @@ export default defineComponent({ createMessage.warn(t('purchase.order.form.inputSupplier')); return; } + if (!purchaseOrderFormState.receiptNumber) { + createMessage.warn(t('sales.order.form.inputReceiptNumber')); + return; + } if(table) { const insertRecords = table.getInsertRecords() if(insertRecords.length === 0) { diff --git a/web/src/views/purchase/refund/components/AddEditModal.vue b/web/src/views/purchase/refund/components/AddEditModal.vue index 13177ae3..e411d4c7 100644 --- a/web/src/views/purchase/refund/components/AddEditModal.vue +++ b/web/src/views/purchase/refund/components/AddEditModal.vue @@ -50,8 +50,8 @@ - + data-intro="单据编号自动生成、自动累加、开头是单据类型的首字母缩写，累加的规则是每次打开页面会自动占用一个新的编号" :rules="[{ required: true}]"> + @@ -653,6 +653,10 @@ export default defineComponent({ createMessage.warn(t('purchase.refund.form.inputSupplier')); return; } + if (!purchaseRefundFormState.receiptNumber) { + createMessage.warn(t('sales.order.form.inputReceiptNumber')); + return; + } if (purchaseRefundFormState.accountId === 0) { if(!multipleAccounts.value.accountOne && !multipleAccounts.value.accountTwo) { createMessage.warn(t('purchase.refund.form.noticeSeven')); diff --git a/web/src/views/purchase/storage/components/AddEditModal.vue b/web/src/views/purchase/storage/components/AddEditModal.vue index a4d3cfb6..c0f8fdee 100644 --- a/web/src/views/purchase/storage/components/AddEditModal.vue +++ b/web/src/views/purchase/storage/components/AddEditModal.vue @@ -52,9 +52,8 @@ - + data-intro="单据编号自动生成、自动累加、开头是单据类型的首字母缩写，累加的规则是每次打开页面会自动占用一个新的编号" :rules="[{ required: true}]"> + @@ -668,6 +667,10 @@ export default defineComponent({ createMessage.warn(t('purchase.storage.form.inputSupplier')); return; } + if (!purchaseStorageFormState.receiptNumber) { + createMessage.warn(t('sales.order.form.inputReceiptNumber')); + return; + } if (purchaseStorageFormState.accountId === 0) { if (!multipleAccounts.value.accountOne && !multipleAccounts.value.accountTwo) { createMessage.warn(t('purchase.storage.form.noticeSeven')); diff --git a/web/src/views/retail/refund/components/AddEditModal.vue b/web/src/views/retail/refund/components/AddEditModal.vue index 15fdf4b7..1f3f7051 100644 --- a/web/src/views/retail/refund/components/AddEditModal.vue +++ b/web/src/views/retail/refund/components/AddEditModal.vue @@ -52,8 +52,8 @@ - + data-intro="单据编号自动生成、自动累加、开头是单据类型的首字母缩写，累加的规则是每次打开页面会自动占用一个新的编号" :rules="[{ required: true}]"> + @@ -576,6 +576,10 @@ export default defineComponent({ createMessage.warn(t('retail.refund.form.inputReceiptDate')); return; } + if (!formState.receiptNumber) { + createMessage.warn(t('retail.shipments.form.inputReceiptNumber')); + return; + } if (!formState.accountId) { createMessage.warn(t('retail.refund.view.inputPaymentAccount')); return; diff --git a/web/src/views/retail/shipments/components/AddEditModal.vue b/web/src/views/retail/shipments/components/AddEditModal.vue index 193c291d..8d44e095 100644 --- a/web/src/views/retail/shipments/components/AddEditModal.vue +++ b/web/src/views/retail/shipments/components/AddEditModal.vue @@ -55,8 +55,8 @@ - + data-intro="单据编号自动生成、自动累加、开头是单据类型的首字母缩写，累加的规则是每次打开页面会自动占用一个新的编号" :rules="[{ required: true}]"> + @@ -597,6 +597,10 @@ export default defineComponent({ createMessage.warn(t('retail.shipments.form.inputReceiptDate')); return; } + if (!formState.receiptNumber) { + createMessage.warn(t('retail.shipments.form.inputReceiptNumber')); + return; + } if (!formState.accountId) { createMessage.warn(t('retail.shipments.view.inputCollectionAccount')); return; diff --git a/web/src/views/sales/order/components/AddEditModal.vue b/web/src/views/sales/order/components/AddEditModal.vue index 36593584..2314f5ec 100644 --- a/web/src/views/sales/order/components/AddEditModal.vue +++ b/web/src/views/sales/order/components/AddEditModal.vue @@ -52,8 +52,9 @@ - + @@ -617,6 +618,10 @@ export default defineComponent({ createMessage.warn(t('sales.order.form.inputCustomer')); return; } + if (!formState.receiptNumber) { + createMessage.warn(t('sales.order.form.inputReceiptNumber')); + return; + } if(table) { const insertRecords = table.getInsertRecords() if(insertRecords.length === 0) { diff --git a/web/src/views/sales/refund/components/AddEditModal.vue b/web/src/views/sales/refund/components/AddEditModal.vue index 7aa92d7a..40512484 100644 --- a/web/src/views/sales/refund/components/AddEditModal.vue +++ b/web/src/views/sales/refund/components/AddEditModal.vue @@ -53,8 +53,8 @@ - + data-intro="单据编号自动生成、自动累加、开头是单据类型的首字母缩写，累加的规则是每次打开页面会自动占用一个新的编号" :rules="[{ required: true}]"> + @@ -673,6 +673,10 @@ export default defineComponent({ createMessage.warn(t('sales.refund.form.inputCustomer')); return; } + if (!saleRefundFormState.receiptNumber) { + createMessage.warn(t('sales.order.form.inputReceiptNumber')); + return; + } if (saleRefundFormState.accountId === 0) { if(!multipleAccounts.value.accountOne && !multipleAccounts.value.accountTwo) { createMessage.warn(t('sales.refund.form.noticeFive')); diff --git a/web/src/views/sales/shipments/components/AddEditModal.vue b/web/src/views/sales/shipments/components/AddEditModal.vue index 7aa8d6fb..50bb1c2b 100644 --- a/web/src/views/sales/shipments/components/AddEditModal.vue +++ b/web/src/views/sales/shipments/components/AddEditModal.vue @@ -53,8 +53,8 @@ - + data-intro="单据编号自动生成、自动累加、开头是单据类型的首字母缩写，累加的规则是每次打开页面会自动占用一个新的编号" :rules="[{ required: true}]"> + @@ -255,7 +255,7 @@ import { RowVO, xGrid, tableData, - gridOptions, getTaxTotalPrice, formState, + gridOptions, getTaxTotalPrice, } from '/src/views/sales/model/addEditModel'; import {getCustomerList} from "@/api/basic/customer"; import {CustomerResp} from "@/api/basic/model/customerModel"; @@ -675,6 +675,10 @@ export default defineComponent({ createMessage.warn(t('sales.shipments.form.inputCustomer')); return; } + if (!saleShipmentsFormState.receiptNumber) { + createMessage.warn(t('sales.order.form.inputReceiptNumber')); + return; + } if (saleShipmentsFormState.accountId === 0) { if(!multipleAccounts.value.accountOne && !multipleAccounts.value.accountTwo) { createMessage.warn(t('sales.shipments.form.noticeFive')); diff --git a/web/src/views/warehouse/allot/components/AddEditAllotShipmentsModal.vue b/web/src/views/warehouse/allot/components/AddEditAllotShipmentsModal.vue index ad712c2c..de16be87 100644 --- a/web/src/views/warehouse/allot/components/AddEditAllotShipmentsModal.vue +++ b/web/src/views/warehouse/allot/components/AddEditAllotShipmentsModal.vue @@ -30,8 +30,8 @@ - + data-intro="单据编号自动生成、自动累加、开头是单据类型的首字母缩写，累加的规则是每次打开页面会自动占用一个新的编号" :rules="[{ required: true}]"> + @@ -370,6 +370,10 @@ export default defineComponent({ createMessage.warn(t('warehouse.allotShipments.form.inputReceiptDate')) return; } + if (!allotShipmentsFormState.receiptNumber) { + createMessage.warn(t('sales.order.form.inputReceiptNumber')); + return; + } const table = xGrid.value if(table) { const insertRecords = table.getInsertRecords() diff --git a/web/src/views/warehouse/assemble/components/AddEditAssembleModal.vue b/web/src/views/warehouse/assemble/components/AddEditAssembleModal.vue index df2e1ffe..cd29d4ae 100644 --- a/web/src/views/warehouse/assemble/components/AddEditAssembleModal.vue +++ b/web/src/views/warehouse/assemble/components/AddEditAssembleModal.vue @@ -30,8 +30,8 @@ - + data-intro="单据编号自动生成、自动累加、开头是单据类型的首字母缩写，累加的规则是每次打开页面会自动占用一个新的编号" :rules="[{ required: true}]"> + @@ -390,6 +390,10 @@ export default defineComponent({ createMessage.warn(t('warehouse.assemble.form.inputReceiptDate')); return; } + if (!assembleFormState.receiptNumber) { + createMessage.warn(t('sales.order.form.inputReceiptNumber')); + return; + } const table = xGrid.value if(table) { const insertRecords = table.getInsertRecords() diff --git a/web/src/views/warehouse/disassemble/components/AddEditDisassembleModal.vue b/web/src/views/warehouse/disassemble/components/AddEditDisassembleModal.vue index 8ef33994..dbe7cb54 100644 --- a/web/src/views/warehouse/disassemble/components/AddEditDisassembleModal.vue +++ b/web/src/views/warehouse/disassemble/components/AddEditDisassembleModal.vue @@ -30,8 +30,8 @@ - + data-intro="单据编号自动生成、自动累加、开头是单据类型的首字母缩写，累加的规则是每次打开页面会自动占用一个新的编号" :rules="[{ required: true}]"> + @@ -391,6 +391,10 @@ export default defineComponent({ createMessage.error(t('warehouse.disassemble.form.inputReceiptDate')); return; } + if (!disAssembleFormState.receiptNumber) { + createMessage.warn(t('sales.order.form.inputReceiptNumber')); + return; + } const table = xGrid.value if(table) { const insertRecords = table.getInsertRecords() diff --git a/web/src/views/warehouse/shipments/components/AddEditOtherShipmentsModal.vue b/web/src/views/warehouse/shipments/components/AddEditOtherShipmentsModal.vue index ff45d73d..d3cfafe2 100644 --- a/web/src/views/warehouse/shipments/components/AddEditOtherShipmentsModal.vue +++ b/web/src/views/warehouse/shipments/components/AddEditOtherShipmentsModal.vue @@ -50,8 +50,8 @@ - + data-intro="单据编号自动生成、自动累加、开头是单据类型的首字母缩写，累加的规则是每次打开页面会自动占用一个新的编号" :rules="[{ required: true}]"> + @@ -410,6 +410,10 @@ export default defineComponent({ createMessage.warn(t('warehouse.otherShipments.form.inputReceiptDate')); return; } + if (!otherShipmentFormState.receiptNumber) { + createMessage.warn(t('sales.order.form.inputReceiptNumber')); + return; + } const table = xGrid.value if(table) { const insertRecords = table.getInsertRecords() diff --git a/web/src/views/warehouse/storage/components/AddEditOtherStorageModal.vue b/web/src/views/warehouse/storage/components/AddEditOtherStorageModal.vue index dadda178..c91b8835 100644 --- a/web/src/views/warehouse/storage/components/AddEditOtherStorageModal.vue +++ b/web/src/views/warehouse/storage/components/AddEditOtherStorageModal.vue @@ -50,8 +50,9 @@ - + data-intro="单据编号自动生成、自动累加、开头是单据类型的首字母缩写，累加的规则是每次打开页面会自动占用一个新的编号" + :rules="[{ required: true}]"> + @@ -413,6 +414,10 @@ export default defineComponent({ createMessage.warn(t('warehouse.otherStorage.form.inputReceiptDate')); return; } + if (!otherStorageFormState.receiptNumber) { + createMessage.warn(t('sales.order.form.inputReceiptNumber')); + return; + } const table = xGrid.value if(table) { const insertRecords = table.getInsertRecords()