From 3fb6872538bbe1b5fde8695d926f44a4732e9b53 Mon Sep 17 00:00:00 2001 From: Lei OT Date: Fri, 9 Aug 2024 14:22:07 +0800 Subject: [PATCH] test: --- src/views/products/Detail/ProductInfo.jsx | 7 +++++-- src/views/products/Detail/ProductInfoQuotation.jsx | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/views/products/Detail/ProductInfo.jsx b/src/views/products/Detail/ProductInfo.jsx index 95e759a..1d3172c 100644 --- a/src/views/products/Detail/ProductInfo.jsx +++ b/src/views/products/Detail/ProductInfo.jsx @@ -39,7 +39,8 @@ const ProductInfo = ({ ...props }) => { setInfoEditable(topPerm || (!hasHT && hasEditPer)); const _priceEditable = [-1, 3].includes(activeAgency?.audit_state_id) || isEmpty(editingProduct?.info?.id); - setPriceEditable(topPerm || (_priceEditable && hasEditPer)); + // setPriceEditable(topPerm || (_priceEditable && hasEditPer)); + setPriceEditable(true); // debug: 0 const showExtras = topPerm && hasHT; // !isEmpty(editingProduct) && setExtrasVisible(showExtras); @@ -50,7 +51,7 @@ const ProductInfo = ({ ...props }) => { values.travel_agency_id = activeAgency.travel_agency_id; const copyNewProduct = structuredClone(newProductRecord); const poster = { - ...(topPerm ? {} : { 'audit_state': -1 }), // 高级权限: 不变更状态值 + // ...(topPerm ? { } : { 'audit_state': -1 }), // 高级权限: 不变更状态值 // "create_date": dayjs().format('YYYY-MM-DD HH:mm:ss'), // "created_by": userId, 'travel_agency_id': activeAgency.travel_agency_id, @@ -96,6 +97,8 @@ const ProductInfo = ({ ...props }) => { items={[ { title: productsTypesMapVal[editingProduct?.info?.product_type_id]?.label || editingProduct?.info?.product_type_name }, { title: editingProduct?.info?.title ?? t('New') }, + { title: 'htID: ' + editingProduct?.info?.htid }, + { title: 'ID: ' + editingProduct?.info?.id }, ]} /> diff --git a/src/views/products/Detail/ProductInfoQuotation.jsx b/src/views/products/Detail/ProductInfoQuotation.jsx index db3854d..a459412 100644 --- a/src/views/products/Detail/ProductInfoQuotation.jsx +++ b/src/views/products/Detail/ProductInfoQuotation.jsx @@ -200,6 +200,8 @@ const ProductInfoQuotation = ({ editable, ...props }) => { } const quotationColumns = [ + { title: 'id', dataIndex: 'id', width: 40, className: 'italic text-gray-400' }, // test: 0 + { title: 'WPI_SN', dataIndex: 'WPI_SN', width: 40, className: 'italic text-gray-400' }, // test: 0 { title: t('products:adultPrice'), dataIndex: 'adult_cost', width: '4rem' }, { title: t('products:childrenPrice'), dataIndex: 'child_cost', width: '4rem' }, { title: t('products:currency'), dataIndex: 'currency', width: '4rem' }, @@ -229,7 +231,8 @@ const ProductInfoQuotation = ({ editable, ...props }) => { dataIndex: 'operation', width: '3%', render: (_, quotation) => { - const _rowEditable = [-1,3].includes(quotation.audit_state_id); + // const _rowEditable = [-1,3].includes(quotation.audit_state_id); + const _rowEditable = true; // test: 0 return (