zls

src/pages/activity/drainage/DrainageList.jsx

@@ -19,21 +19,6 @@ const toEditList = (row) => () => {
   });
 }
 
-
-
-const data = [
-
-  {
-    Id: '1',
-    name: 'zls',
-    // StartTime:'',
-    // EndTime:'',
-    number: 33,
-  }
-
-
-];
-
 const header = (props) => {
   // const [data, setData] = useState({ data: [] })
   const [datas, setDatas] = useState([])//表格数据
@@ -90,14 +75,18 @@ const header = (props) => {
       dataIndex: 'name',
       key: 'name',
       align: 'center',
-      render: (text, datas) => <AuthButton name="admin.taDrainage.id.put" noRight={null}><div style={{ color: '#66B3FF' }} onClick={() => addshowModal(datas)} >{datas.name}</div></AuthButton>
+      render: (text, datas) => <>
+
+        <div style={{ color: '#66B3FF' }} onClick={() => addshowModal(datas)} >{datas.name}</div>
+
+      </>
     },
     {
       title: 'appid',
       dataIndex: 'appid',
       key: 'appid',
       align: 'center',
-      // render: (text, datas) => <div style={ { color: '#66B3FF' } } onClick= {() => addshowModal(datas)} >{ datas.name }</div>,
+      // render: (text, datas) => <div style={ { color: '#66B3FF' } } onClick= {() => addshowModal(datas)} >{ datas.name }</div>, 
     },
     {
       title: 'secret',
@@ -158,61 +147,49 @@ const header = (props) => {
   const Forms = props => {
 
     console.log(date, '---------------')
-    console.log(formsdate, '---------------')
+    console.log(formsdate.name, '---------------')
     console.log(formsdate, '22222222')
-    const fields = [
-      {
-        label: 'H5项目名称',
-        name: 'name',
-        type: FieldTypes.Text,
-        placeholder: "请输入H5项目名称",
-        value: formsdate.name,
-
-      },
-      {
-        label: '截止时间',
-        name: 'endDate',
-        type: FieldTypes.DatePicker,
-        value: formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm') : null
-        // render: <DatePicker placeholder="截止时间" value= {formsdate.endDate} />,
-      },
-
-
-    ]
-
-    const handleSubmit = val => {
-      console.log(date, '111---------------')
-      console.log(formsdate, '111---------------')
-      console.log(formsdate, '11122222222')
-      // data: { ...submitValue }
-
-      console.log(formsdate.drainageId, '9999999999999')
-      if (formsdate.drainageId) {
-        // { ...apis.activity.deletetaDrainage,urlData: { id: drainageIid }, }
-        request({ ...apis.activity.updatetaDrainage, urlData: { id: formsdate.drainageId }, data: val }).then((data) => {
-          message.info('操作成功！')
-          // gettaDrainage({ pageNum: 1, pageSize: 10 })
-        }).catch((err) => {
-          console.log('111111', err)
-          message.info(err.msg || err.message)
-        })
-
-      } else {
-
-
 
-        request({ ...apis.activity.addtaDrainage, data: val }).then((data) => {
-          message.info("保存成功")
-          console.log(data, '22222')
 
-        }).catch((err) => {
-          message.error(err.msg || err.message)
-        })
+    const { formsDate } = props
+    useEffect(() => {
+      if (formsDate) {
+        props.form.setFieldsValue({ name: formsdate.name, endDate: formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm') : null })
       }
-      setDate({
-        visible: false,
+    }, [formsDate])
+
+
+    const handleSubmit = e => {
+      e.preventDefault();
+      props.form.validateFields((err, values) => {
+        if (!err) {
+          if (formsDate.drainageId) {
+            // { ...apis.activity.deletetaDrainage,urlData: { id: drainageIid }, }
+            request({ ...apis.activity.updatetaDrainage, urlData: { id: formsDate.drainageId }, data: values }).then((data) => {
+              message.info('操作成功！')
+              gettaDrainage({ pageNum: 1, pageSize: 10 })
+              setDate({
+                visible: false,
+              });
+            }).catch((err) => {
+              console.log('111111', err)
+              message.info(err.msg || err.message)
+            })
+
+          } else {
+
+            request({ ...apis.activity.addtaDrainage, data: values }).then((data) => {
+              message.info("操作成功")
+              gettaDrainage({ pageNum: 1, pageSize: 10 })
+              setDate({
+                visible: false,
+              });
+            }).catch((err) => {
+              message.error(err.msg || err.message)
+            })
+          }
+        }
       });
-      gettaDrainage({ pageNum: 1, pageSize: 10 })
     }
 
     const handleCancel = val => {
@@ -221,10 +198,53 @@ const header = (props) => {
       });
     }
 
-    return <XForm onSubmit={handleSubmit} onCancel={handleCancel} fields={fields}></XForm>
+    const formItemLayout = {
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 8 },
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 },
+      },
+    };
+
+    const { getFieldDecorator } = props.form;
+    {/* <XForm onSubmit={handleSubmit} onCancel={handleCancel} fields={fields} ></XForm> */ }
+
+    return <Form {...formItemLayout} onSubmit={handleSubmit}>
+
+
+      <Form.Item label="H5项目名称">
+        {getFieldDecorator('name')(
+          <Input
+            placeholder="请输入H5项目名称"
+          />,
+        )}
+      </Form.Item>
+      <Form.Item label="截止时间">
+        {getFieldDecorator('endDate')(
+          <DatePicker
+          // prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+          // placeholder={formsdate.endDate}
+          // value= formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm') : null
+          />,
+        )}
+      </Form.Item>
+      <Form.Item>
+        <AuthButton name="admin.taDrainage.id.put" noRight={null}>
+          <Button type="primary" htmlType="submit" className={styles.searchBtn} onClick>
+            确定
+    </Button>
+        </AuthButton>
+        <Button style={{ marginLeft: 8 }} onClick={handleCancel}>
+          取消
+      </Button>
+      </Form.Item>
+    </Form>
 
   }
-
+  const Formss = Form.create({ name: 'Forms' })(Forms);
 
 
 
@@ -247,7 +267,13 @@ const header = (props) => {
     console.log(formsdate, '22222222')
     setDate({
       visible: true,
+      title: "修改H5项目"
     });
+
+
+    console.log('form :', props.form)
+
+
   };
   function showModal () {
     setFormsDate({
@@ -257,6 +283,7 @@ const header = (props) => {
     })
     setDate({
       visible: true,
+      title: '新建H5项目'
     });
   };
   const changePageNum = pageNumber => {
@@ -296,7 +323,7 @@ const header = (props) => {
   }
 
   const { getFieldDecorator } = props.form;
-  const { visible, confirmLoading, ModalText } = date;
+  const { visible, confirmLoading, ModalText, title } = date;
   return (
     <>
       <div>
@@ -332,14 +359,15 @@ const header = (props) => {
           <Button type="danger" className={styles.addBtn} onClick={showModal}>新增</Button>
         </AuthButton>
         <Modal
-          title="新建H5项目"
+          title={title}
+
           visible={visible}
           //  onOk={handleOk}
           confirmLoading={confirmLoading}
           onCancel={handleCancel}
           footer={null}
         >
-          <Forms />
+          <Formss formsDate={formsdate} />
         </Modal>
         <Table columns={columns} dataSource={datas.records} pagination={false} rowKey="drainageList" />
         <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>

src/pages/customer/independentList/index.jsx

@@ -112,13 +112,15 @@ class ModalTable extends React.Component {
         title: '状态',
         // eslint-disable-next-line consistent-return
         render: (text, records) => {
-          if (records.status === 1) { return '报备' }
+          console.log("retrun", records)
+          if (records.status === 1) { if(records.reportRecommendStatus === 1) {return '报备'} if(records.reportRecommendStatus === 2) {return '推荐'}  }
           if (records.status === 2) { return '到访' }
           if (records.status === 3) { return '认购' }
           if (records.status === 4) { return '签约' }
           if (records.verifyStatus === 1) { return '待审核' }
           if (records.verifyStatus === 2) { return '审核同意' }
           if (records.verifyStatus === 3) { return '签约' }
+          // reportRecommendStatus
         },
       },
     ]