From 6b396633cbcfda3378263b8957fa32825f8ca187 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Wed, 11 Sep 2024 10:23:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=90=88=E5=90=8C=E5=A4=87=E6=B3=A8=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/products/Detail/ContractRemarksModal.jsx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/views/products/Detail/ContractRemarksModal.jsx b/src/views/products/Detail/ContractRemarksModal.jsx index a9037cc..65178ab 100644 --- a/src/views/products/Detail/ContractRemarksModal.jsx +++ b/src/views/products/Detail/ContractRemarksModal.jsx @@ -41,9 +41,15 @@ export const ContractRemarksModal = () => { getRemarkList() .then(list => { remarksForm.setFieldsValue({remarkList:list}) + setRemarksModalOpen(true) + }) + .catch(ex => { + notification.error({ + message: 'Notification', + description: ex.message, + placement: 'top', + }) }) - - setRemarksModalOpen(true) } const getFieldLabel = (field) => { From 7c3bfdfefef4dbccc122e1ff6a9bd119679e8904 Mon Sep 17 00:00:00 2001 From: Lei OT Date: Wed, 11 Sep 2024 10:33:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20docx:=20=E4=BA=BA=E7=AD=89=E5=8C=B9?= =?UTF-8?q?=E9=85=8D=E9=97=AE=E9=A2=98;=20#=20=E6=B5=99=E6=B1=9F=E4=B8=AD?= =?UTF-8?q?=E9=9D=92=E6=97=85=E6=95=B0=E6=8D=AE=E6=97=A0=E6=B3=95=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/products/Print/AgencyContract_v0903.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/products/Print/AgencyContract_v0903.jsx b/src/views/products/Print/AgencyContract_v0903.jsx index 57150f1..91089d1 100644 --- a/src/views/products/Print/AgencyContract_v0903.jsx +++ b/src/views/products/Print/AgencyContract_v0903.jsx @@ -162,7 +162,7 @@ const chunkBy = (use_year, dataList = [], by = []) => { const matchRange = (ssSets).find((ss) => quoteItem.group_size_min >= ss[0] && quoteItem.group_size_max <= ss[1]); const findEnd = matchRange || ssSets.find((ss) => quoteItem.group_size_max > ss[0] && quoteItem.group_size_max <= ss[1] && ss[1] !== Infinity); const findStart = findEnd || ssSets.find((ss) => quoteItem.group_size_min >= ss[0]); - const finalRange = findStart; + const finalRange = findStart || ssSets[0]; // console.log('find mmm', matchRange, findEnd, findStart, finalRange); // console.log('matchRange ', 'find', [quoteItem.group_size_min, quoteItem.group_size_max], 'matched', finalRange); // console.groupEnd();