From 86d0d175d3ecb7bc136d3fb81b0040bdf07fb06f Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 5 Aug 2024 10:29:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86:=20?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86:=20=E7=BC=96=E8=BE=91title?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/useProductsSets.js                  |  2 +-
 src/views/products/Detail/ProductInfo.jsx     |  7 +++----
 src/views/products/Detail/ProductInfoForm.jsx | 12 ++++++++++--
 3 files changed, 14 insertions(+), 7 deletions(-)

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
         <Form.Item hidden name={'id'} label={'ID'}>
           <Input />
         </Form.Item>
-        <Form.Item hidden name={'title'} label={'title'}>
+        {/* <Form.Item hidden name={'title'} label={'title'}>
           <Input />
-        </Form.Item>
+        </Form.Item> */}
         {editable && (
           <Form.Item>
             <div className='flex justify-around'>
@@ -173,6 +173,14 @@ function getFields(props) {
   };
   let baseChildren = [];
   baseChildren = [
+    item(
+      'title',
+      99,
+      <Form.Item name='title' label={t('Title')} {...fieldProps.title} rules={[{ required: true }]}>
+        <Input allowClear {...fieldComProps.title} {...styleProps} {...editableProps('title')} />
+      </Form.Item>,
+      fieldProps?.title?.col || midCol
+    ),
     item(
       'code',
       99,