合并

src/pages/building/type/edi.jsx

@@ -66,10 +66,15 @@ function body(props) {
 
     // 修改
     function updateType(row) {
-      const { url, method } = apis.buildingType.update
-      const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(row.buildingTypeId)
+      // const { url, method } = apis.buildingType.update
+      // const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(row.buildingTypeId)
 
-      request({ url: tempUrl, method, data: { ...row } }).then(() => {
+      // request({ url: tempUrl, method, data: { ...row } }).then(() => {
+      //   router.go(-1)
+      // })
+      request({ ...apis.buildingType.update, urlData: { id: row.buildingTypeId }, data: { ...row } }).then(() => {
+        // eslint-disable-next-line no-unused-expressions
+        openNotificationWithIcon('success', '操作成功')
         router.go(-1)
       })
     }

src/pages/customer/customerlist/index.jsx

@@ -201,7 +201,12 @@ function body(props) {
       align: 'center',
       width: '10%',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span>{record.reportRecommendStatus === 0 ? '未报备' : record.reportRecommendStatus === 1 ? '报备' : record.reportRecommendStatus === 2 ? '推荐' : ''}</span></>,
+      render: (text, records) => {
+        if (records.status === 1) { return '报备' }
+        if (records.status === 2) { return '到访' }
+        if (records.status === 3) { return '认筹' }
+        if (records.status === 4) { return '签约' }
+      },
     },
     {
       title: '操作',
@@ -232,21 +237,23 @@ function body(props) {
 
   return (
     <>
+    {console.log('customerType', customerType)}
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-        <Form.Item>
+      {customerType === 'private' && <Form.Item>
           {getFieldDecorator('buildingId')(
             <BuildSelect />,
           )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('reportRecommendStatus')(
+        </Form.Item>}
+        {customerType === 'private' && <Form.Item>
+          {getFieldDecorator('status')(
             <Select style={{ width: '180px' }} placeholder="状态" onChange={handleSelectChange}>
-              <Option value={0}>未报备</Option>
               <Option value={1}>报备</Option>
-              <Option value={2}>推荐</Option>
+              <Option value={2}>到访</Option>
+              <Option value={3}>认筹</Option>
+              <Option value={4}>签约</Option>
             </Select>,
           )}
-        </Form.Item>
+        </Form.Item>}
         <Form.Item>
           {getFieldDecorator('name')(
             <Input
@@ -263,16 +270,16 @@ function body(props) {
             />,
           )}
         </Form.Item>
-        <Form.Item>
+        {customerType === 'private' && <Form.Item>
           {getFieldDecorator('consultName')(
             <Input placeholder="置业顾问" />,
           )}
-        </Form.Item>
-        <Form.Item>
+        </Form.Item>}
+        {customerType === 'private' && <Form.Item>
           {getFieldDecorator('consultTel')(
             <Input placeholder="置业顾问电话" />,
           )}
-        </Form.Item>
+        </Form.Item>}
         <Form.Item>
             <Button type="primary" htmlType="submit" >
               查询