diff --git a/src/hooks/useProductsSets.js b/src/hooks/useProductsSets.js index 8c588bf..904c653 100644 --- a/src/hooks/useProductsSets.js +++ b/src/hooks/useProductsSets.js @@ -101,7 +101,7 @@ export const useProductsAuditStatesMapVal = (value) => { export const useProductsTypesFieldsets = (type) => { const [isPermitted] = useAuthStore((state) => [state.isPermitted]); const infoDefault = [['city'], ['title']]; - const infoAdmin = ['code', 'remarks', 'dept']; // 'display_to_c' + const infoAdmin = ['title', 'code', 'remarks', 'dept']; // 'display_to_c' const infoDisplay = isPermitted(PERM_PRODUCTS_MANAGEMENT) ? ['display_to_c'] : []; const infoRecDisplay = isPermitted(PERM_PRODUCTS_MANAGEMENT) ? ['recommends_rate'] : []; const infoTypesMap = { diff --git a/src/views/products/Detail/ProductInfo.jsx b/src/views/products/Detail/ProductInfo.jsx index f35b5c3..79f0eb0 100644 --- a/src/views/products/Detail/ProductInfo.jsx +++ b/src/views/products/Detail/ProductInfo.jsx @@ -50,17 +50,16 @@ const ProductInfo = ({ ...props }) => { // "lastedit_changed": "", }; /** lgc_details */ - const copyFields = pick(editingProduct.info, ['title', 'product_type_id']); - const readyToSubInfo = { ...copyNewProduct.info, ...values.info, ...copyFields, type: copyFields.product_type_id, ...poster }; + const copyFields = pick(editingProduct.info, ['product_type_id']); // 'title', + const readyToSubInfo = { ...copyNewProduct.info, ...editingProduct.info, ...values.info, ...copyFields, type: copyFields.product_type_id, ...poster }; // console.log('onSave', editingProduct.info, readyToSubInfo); const prevLgcDetailsMapped = editingProduct.lgc_details.reduce((r, c) => ({ ...r, [c.lgc]: { ...c, description: c.descriptions } }), {}); // todo: description字段不一致 const mergedLgc = { ...prevLgcDetailsMapped, ...values.lgc_details_mapped }; /** quotation */ - // todo: 报价不能为空 const prevQuotationMapped = editingProduct.quotation.reduce((r, c) => ({ ...r, [c.id]: { ...c, unit: c.unit_id, audit_state: c.audit_state_id } }), {}); const mergedQ = { ...prevQuotationMapped, ...(values.quotation || []) }; - console.log(values); + // console.log(values); // return false; // debug: 0 /** 提交保存 */ setLoading(true); diff --git a/src/views/products/Detail/ProductInfoForm.jsx b/src/views/products/Detail/ProductInfoForm.jsx index 8f95d8c..a3317ed 100644 --- a/src/views/products/Detail/ProductInfoForm.jsx +++ b/src/views/products/Detail/ProductInfoForm.jsx @@ -123,9 +123,9 @@ const InfoForm = ({ onSubmit, onReset, onValuesChange, editable: _editable, show - */} {editable && (
@@ -173,6 +173,14 @@ function getFields(props) { }; let baseChildren = []; baseChildren = [ + item( + 'title', + 99, + + + , + fieldProps?.title?.col || midCol + ), item( 'code', 99,