dingxin 5 years ago
parent
commit
839942bf59
2 changed files with 27 additions and 15 deletions
  1. 8
    3
      src/pages/building/type/edi.jsx
  2. 19
    12
      src/pages/customer/customerlist/index.jsx

+ 8
- 3
src/pages/building/type/edi.jsx View File

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

+ 19
- 12
src/pages/customer/customerlist/index.jsx View File

@@ -201,7 +201,12 @@ function body(props) {
201 201
       align: 'center',
202 202
       width: '10%',
203 203
       // eslint-disable-next-line no-nested-ternary
204
-      render: (_, record) => <><span>{record.reportRecommendStatus === 0 ? '未报备' : record.reportRecommendStatus === 1 ? '报备' : record.reportRecommendStatus === 2 ? '推荐' : ''}</span></>,
204
+      render: (text, records) => {
205
+        if (records.status === 1) { return '报备' }
206
+        if (records.status === 2) { return '到访' }
207
+        if (records.status === 3) { return '认筹' }
208
+        if (records.status === 4) { return '签约' }
209
+      },
205 210
     },
206 211
     {
207 212
       title: '操作',
@@ -232,21 +237,23 @@ function body(props) {
232 237
 
233 238
   return (
234 239
     <>
240
+    {console.log('customerType', customerType)}
235 241
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
236
-        <Form.Item>
242
+      {customerType === 'private' && <Form.Item>
237 243
           {getFieldDecorator('buildingId')(
238 244
             <BuildSelect />,
239 245
           )}
240
-        </Form.Item>
241
-        <Form.Item>
242
-          {getFieldDecorator('reportRecommendStatus')(
246
+        </Form.Item>}
247
+        {customerType === 'private' && <Form.Item>
248
+          {getFieldDecorator('status')(
243 249
             <Select style={{ width: '180px' }} placeholder="状态" onChange={handleSelectChange}>
244
-              <Option value={0}>未报备</Option>
245 250
               <Option value={1}>报备</Option>
246
-              <Option value={2}>推荐</Option>
251
+              <Option value={2}>到访</Option>
252
+              <Option value={3}>认筹</Option>
253
+              <Option value={4}>签约</Option>
247 254
             </Select>,
248 255
           )}
249
-        </Form.Item>
256
+        </Form.Item>}
250 257
         <Form.Item>
251 258
           {getFieldDecorator('name')(
252 259
             <Input
@@ -263,16 +270,16 @@ function body(props) {
263 270
             />,
264 271
           )}
265 272
         </Form.Item>
266
-        <Form.Item>
273
+        {customerType === 'private' && <Form.Item>
267 274
           {getFieldDecorator('consultName')(
268 275
             <Input placeholder="置业顾问" />,
269 276
           )}
270
-        </Form.Item>
271
-        <Form.Item>
277
+        </Form.Item>}
278
+        {customerType === 'private' && <Form.Item>
272 279
           {getFieldDecorator('consultTel')(
273 280
             <Input placeholder="置业顾问电话" />,
274 281
           )}
275
-        </Form.Item>
282
+        </Form.Item>}
276 283
         <Form.Item>
277 284
             <Button type="primary" htmlType="submit" >
278 285
               查询