fix

src/pages/mpEstate/estateList/edite/components/businessOpenInfo.tsx

@@ -260,13 +260,13 @@ const BusinessOpenInfoComponent = (props: any) => {
             form={form}
             initialValues={{
               ...firstOpenInfo,
-              license_date: moment(firstOpenInfo.license_date || new Date(), 'YYYY-MM-DD HH:mm:ss'),
-              ground_deliver_time: moment(firstOpenInfo.ground_deliver_time || new Date(), 'YYYY-MM-DD HH:mm:ss'),
-              ground_open_time: moment(firstOpenInfo.ground_open_time || new Date(), 'YYYY-MM-DD HH:mm:ss'),
-              single_deliver_time: moment(firstOpenInfo.single_deliver_time || new Date(), 'YYYY-MM-DD HH:mm:ss'),
-              single_open_time: moment(firstOpenInfo.single_open_time || new Date(), 'YYYY-MM-DD HH:mm:ss'),
-              centralized_deliver_time: moment(firstOpenInfo.centralized_deliver_time || new Date(), 'YYYY-MM-DD HH:mm:ss'),
-              centralized_open_time: moment(firstOpenInfo.centralized_open_time || new Date(), 'YYYY-MM-DD HH:mm:ss'),
+              license_date: firstOpenInfo.license_date && firstOpenInfo.license_date !== 'Invalid date' ? moment(firstOpenInfo.license_date, 'YYYY-MM-DD HH:mm:ss') : '',
+              ground_deliver_time: firstOpenInfo.ground_deliver_time && firstOpenInfo.ground_deliver_time !== 'Invalid date' ? moment(firstOpenInfo.ground_deliver_time, 'YYYY-MM-DD HH:mm:ss') : '',
+              ground_open_time: firstOpenInfo.ground_open_time && firstOpenInfo.ground_open_time !== 'Invalid date' ? moment(firstOpenInfo.ground_open_time, 'YYYY-MM-DD HH:mm:ss') : '',
+              single_deliver_time: firstOpenInfo.single_deliver_time && firstOpenInfo.single_deliver_time !== 'Invalid date' ? moment(firstOpenInfo.single_deliver_time, 'YYYY-MM-DD HH:mm:ss') : '',
+              single_open_time: firstOpenInfo.single_open_time && firstOpenInfo.single_open_time !== 'Invalid date' ? moment(firstOpenInfo.single_open_time, 'YYYY-MM-DD HH:mm:ss') : '',
+              centralized_deliver_time: firstOpenInfo.centralized_deliver_time && firstOpenInfo.centralized_deliver_time !== 'Invalid date' ? moment(firstOpenInfo.centralized_deliver_time, 'YYYY-MM-DD HH:mm:ss') : '',
+              centralized_open_time: firstOpenInfo.centralized_open_time && firstOpenInfo.centralized_open_time !== 'Invalid date' ? moment(firstOpenInfo.centralized_open_time, 'YYYY-MM-DD HH:mm:ss') : '',
             }}
             {...formItemLayout}
           >
@@ -345,12 +345,6 @@ const BusinessOpenInfoComponent = (props: any) => {
                     key={index}
                     name={item.key}
                     label={item.name}
-                    rules={[
-                      {
-                        required: true,
-                        message: `输入${item.name}`,
-                      },
-                    ]}
                   >
                     {item.component === 'inputNumber' ? (
                       <InputNumber />
@@ -375,12 +369,6 @@ const BusinessOpenInfoComponent = (props: any) => {
                     key={index}
                     name={item.key}
                     label={item.name}
-                    rules={[
-                      {
-                        required: true,
-                        message: `输入${item.name}`,
-                      },
-                    ]}
                   >
                     {item.component === 'inputNumber' ? (
                       <InputNumber />
@@ -405,12 +393,6 @@ const BusinessOpenInfoComponent = (props: any) => {
                     key={index}
                     name={item.key}
                     label={item.name}
-                    rules={[
-                      {
-                        required: true,
-                        message: `输入${item.name}`,
-                      },
-                    ]}
                   >
                     {item.component === 'inputNumber' ? (
                       <InputNumber />

src/pages/mpEstate/estateList/edite/components/houseOpenInfo.tsx

@@ -239,8 +239,8 @@ const HouseOpenInfoComponent = (props: any) => {
           form={form}
           initialValues={{
             ...firstOpenInfo,
-            license_date: moment(firstOpenInfo.license_date || new Date(), 'YYYY-MM-DD HH:mm:ss'),
-            compelete_date: moment(firstOpenInfo.compelete_date || new Date(), 'YYYY-MM-DD HH:mm:ss'),
+            license_date: firstOpenInfo.license_date && firstOpenInfo.license_date !== 'Invalid date' ? moment(firstOpenInfo.license_date, 'YYYY-MM-DD HH:mm:ss') : '',
+            compelete_date: firstOpenInfo.compelete_date && firstOpenInfo.compelete_date !== 'Invalid date' ? moment(firstOpenInfo.compelete_date, 'YYYY-MM-DD HH:mm:ss') : '',
           }}
           {...formItemLayout}
         >
@@ -252,12 +252,6 @@ const HouseOpenInfoComponent = (props: any) => {
                 name="project_name"
                 label="项目名称"
                 initialValue={baseData.name}
-                rules={[
-                  {
-                    required: true,
-                    message: '输入项目名称',
-                  },
-                ]}
               >
                 <Input />
               </FormItem>
@@ -265,12 +259,6 @@ const HouseOpenInfoComponent = (props: any) => {
               <FormItem
                 name="id"
                 label="本期开盘序号（记录ID）"
-                rules={[
-                  {
-                    required: true,
-                    message: '填写本期开盘序号（记录ID）',
-                  },
-                ]}
               >
                 <InputNumber disabled />
               </FormItem>
@@ -280,12 +268,6 @@ const HouseOpenInfoComponent = (props: any) => {
                   key={index}
                   name={item.key}
                   label={item.name}
-                  rules={[
-                    {
-                      required: true,
-                      message: `输入${item.name}`,
-                    },
-                  ]}
                 >
                   {item.component === 'inputNumber' ? (
                     <InputNumber />
@@ -320,12 +302,6 @@ const HouseOpenInfoComponent = (props: any) => {
                       key={index}
                       name={item.key}
                       label={item.name}
-                      rules={[
-                        {
-                          required: true,
-                          message: `输入${item.name}`,
-                        },
-                      ]}
                     >
                       <InputNumber />
                     </FormItem>

src/pages/mpEstate/estateList/edite/components/officeOpenInfo.tsx

@@ -260,10 +260,10 @@ const OfficeOpenInfoComponent = (props: any) => {
             form={form}
             initialValues={{
               ...firstOpenInfo,
-              license_date: moment(firstOpenInfo.license_date || new Date(), 'YYYY-MM-DD HH:mm:ss'),
-              soho_deliver_time: moment(firstOpenInfo.soho_deliver_time || new Date(), 'YYYY-MM-DD HH:mm:ss'),
-              loft_deliver_time: moment(firstOpenInfo.loft_deliver_time || new Date(), 'YYYY-MM-DD HH:mm:ss'),
-              office_deliver_time: moment(firstOpenInfo.office_deliver_time || new Date(), 'YYYY-MM-DD HH:mm:ss'),
+              license_date: firstOpenInfo.license_date && firstOpenInfo.license_date !== 'Invalid date' ? moment(firstOpenInfo.license_date, 'YYYY-MM-DD HH:mm:ss') : '',
+              soho_deliver_time: firstOpenInfo.soho_deliver_time && firstOpenInfo.soho_deliver_time !== 'Invalid date' ? moment(firstOpenInfo.soho_deliver_time, 'YYYY-MM-DD HH:mm:ss') : '',
+              loft_deliver_time: firstOpenInfo.loft_deliver_time && firstOpenInfo.loft_deliver_time !== 'Invalid date' ? moment(firstOpenInfo.loft_deliver_time, 'YYYY-MM-DD HH:mm:ss') : '',
+              office_deliver_time: firstOpenInfo.office_deliver_time && firstOpenInfo.office_deliver_time !== 'Invalid date' ? moment(firstOpenInfo.office_deliver_time, 'YYYY-MM-DD HH:mm:ss') : '',
             }}
             {...formItemLayout}
           >
@@ -342,12 +342,6 @@ const OfficeOpenInfoComponent = (props: any) => {
                     key={index}
                     name={item.key}
                     label={item.name}
-                    rules={[
-                      {
-                        required: true,
-                        message: `输入${item.name}`,
-                      },
-                    ]}
                   >
                     {item.component === 'inputNumber' ? (
                       <InputNumber />
@@ -372,12 +366,6 @@ const OfficeOpenInfoComponent = (props: any) => {
                     key={index}
                     name={item.key}
                     label={item.name}
-                    rules={[
-                      {
-                        required: true,
-                        message: `输入${item.name}`,
-                      },
-                    ]}
                   >
                     {item.component === 'inputNumber' ? (
                       <InputNumber />
@@ -402,12 +390,6 @@ const OfficeOpenInfoComponent = (props: any) => {
                     key={index}
                     name={item.key}
                     label={item.name}
-                    rules={[
-                      {
-                        required: true,
-                        message: `输入${item.name}`,
-                      },
-                    ]}
                   >
                     {item.component === 'inputNumber' ? (
                       <InputNumber />

src/pages/mpEstate/estateList/index.tsx

@@ -245,6 +245,40 @@ const EstateList: React.FC<any> = (props) => {
       )
     }
   }, {
+    title: '是否合作楼盘',
+    dataIndex: 'is_partner',
+    key: 'is_partner',
+    width: 150,
+    render: (text: any, record: any) => {
+      const statusMap = {
+        1: true,
+        0: false,
+      }
+
+      return (
+        <Switch checked={statusMap[text]} onChange={(val) => { changeStatus({
+          is_partner: val ? 1 : 0,
+        }, record.id) }} />
+      )
+    }
+  }, {
+    title: '是否热门楼盘',
+    dataIndex: 'is_hot',
+    key: 'is_hot',
+    width: 150,
+    render: (text: any, record: any) => {
+      const statusMap = {
+        1: true,
+        0: false,
+      }
+
+      return (
+        <Switch checked={statusMap[text]} onChange={(val) => { changeStatus({
+          is_hot: val ? 1 : 0,
+        }, record.id) }} />
+      )
+    }
+  }, {
     title: '操作',
     dataIndex: 'operate',
     key: 'operate',
@@ -286,7 +320,7 @@ const EstateList: React.FC<any> = (props) => {
           columns={projectColumns}
           onChange={handleStandardTableChange}
           pagination={estateData.pagination}
-          scroll={{ x: 1150 }}
+          scroll={{ x: 1450 }}
         />
       </Card>
     </PageHeaderWrapper>