zlisen 3 年之前
父節點
當前提交
bb8fc1a87b

+ 2
- 1
src/pages/building/Developers/Edit.jsx 查看文件

186
         </Form.Item>
186
         </Form.Item>
187
         <Form.Item label="开发商简介">
187
         <Form.Item label="开发商简介">
188
           {getFieldDecorator('brandRemark', {
188
           {getFieldDecorator('brandRemark', {
189
-            rules: [{ required: true, message: '请输入开发商简介' }],
189
+            rules: [{ required: true, message: '请输入开发商简介' },
190
+           { max: 120, message: '简介请勿超过120个字' }],
190
           })(<Input.TextArea style={{ width: 400 }} placeholder="120字内的简介" />)}
191
           })(<Input.TextArea style={{ width: 400 }} placeholder="120字内的简介" />)}
191
         </Form.Item>
192
         </Form.Item>
192
 
193
 

+ 9
- 6
src/pages/building/Edit/Apartment/List.jsx 查看文件

2
 import { Button, Table, Popconfirm } from 'antd'
2
 import { Button, Table, Popconfirm } from 'antd'
3
 import AuthButton from '@/components/AuthButton'
3
 import AuthButton from '@/components/AuthButton'
4
 import moment from 'moment'
4
 import moment from 'moment'
5
+import { getImgURL } from '@/utils/image'
6
+// import ImgPreview from '@/components/ImgPreview'
5
 
7
 
6
 const saleType = [
8
 const saleType = [
7
   {
9
   {
70
       key: 'buildingArea',
72
       key: 'buildingArea',
71
       render: (buildingArea, _) => <span>{`${buildingArea === 0 || buildingArea === null ? "-" : buildingArea + "m²"}`}</span>,
73
       render: (buildingArea, _) => <span>{`${buildingArea === 0 || buildingArea === null ? "-" : buildingArea + "m²"}`}</span>,
72
     },
74
     },
73
-    {
74
-      title: '使用面积',
75
-      dataIndex: 'insideArea',
76
-      key: 'insideArea',
77
-      render: (insideArea, _) => <span>{`${insideArea === 0 || insideArea === null ? "-" : insideArea + "m²"}`}</span>,
78
-    },
75
+    // {
76
+    //   title: '户型图',
77
+    //   dataIndex: 'buildingImgList',
78
+    //   key: 'buildingImgList',
79
+    //   render: (buildingImgList, _) =>  <ImgPreview images={[{ src:getImgURL(buildingImgList[0].url) }]}></ImgPreview>  ,
80
+    // },
81
+    // <Zmage src={getImgURL(buildingImgList[0].url)}   />
79
     {
82
     {
80
       title: '创建时间',
83
       title: '创建时间',
81
       dataIndex: 'createDate',
84
       dataIndex: 'createDate',

+ 2
- 0
src/pages/building/Edit/Basic/form.js 查看文件

74
   // 项目标签
74
   // 项目标签
75
   data.tag = (tag || []).map((item, _) => ({ tagName: item }))
75
   data.tag = (tag || []).map((item, _) => ({ tagName: item }))
76
 
76
 
77
+  data.brandId = data.brandId || ''
78
+
77
   const request = fetch(data.buildingId ? apis.building.updateBuilding : apis.building.addBuilding)
79
   const request = fetch(data.buildingId ? apis.building.updateBuilding : apis.building.addBuilding)
78
   return request({ data })
80
   return request({ data })
79
 }
81
 }

+ 6
- 4
src/pages/building/Edit/SpecialRoom/Form.jsx 查看文件

25
 
25
 
26
   function submitData(e) {
26
   function submitData(e) {
27
     e.preventDefault();
27
     e.preventDefault();
28
+    
28
     validateFields((err, values) => {
29
     validateFields((err, values) => {
29
       if (err) {
30
       if (err) {
30
         console.error(err);
31
         console.error(err);
31
         return;
32
         return;
32
       }
33
       }
34
+      console.log(values,'-----values-----')
33
       values.buildingId = props.buildingId;
35
       values.buildingId = props.buildingId;
34
       values.startTime = values.time[0]
36
       values.startTime = values.time[0]
35
       values.endTime = values.time[1]
37
       values.endTime = values.time[1]
88
             { required: true, message: '请填写面积' },
90
             { required: true, message: '请填写面积' },
89
             { validator: validMinNum },
91
             { validator: validMinNum },
90
           ],
92
           ],
91
-        })(<InputNumber min={0} precision={0.01} step={1} placeholder="请填写建筑面积" addonAfter="㎡"/>)}
93
+        })(<InputNumber min={0} precision={2} step={0.01} placeholder="请填写建筑面积" addonAfter="㎡"/>)}
92
       </Form.Item>
94
       </Form.Item>
93
       <Form.Item label="时间">
95
       <Form.Item label="时间">
94
       {getFieldDecorator('time', {
96
       {getFieldDecorator('time', {
106
           rules: [
108
           rules: [
107
             { required: true, message: '请填写原始价' },
109
             { required: true, message: '请填写原始价' },
108
           ],
110
           ],
109
-        })(<InputNumber min={0} precision={0.01} step={1} placeholder="请填写原始总价" addonAfter="元"/>)}
111
+        })(<InputNumber min={0} precision={2} step={1} placeholder="请填写原始总价" addonAfter="元"/>)}
110
       </Form.Item>
112
       </Form.Item>
111
       <Form.Item label="现价">
113
       <Form.Item label="现价">
112
         {getFieldDecorator('currentPrice', {
114
         {getFieldDecorator('currentPrice', {
113
           rules: [
115
           rules: [
114
             { required: true, message: '请填写现价' },
116
             { required: true, message: '请填写现价' },
115
           ],
117
           ],
116
-        })(<InputNumber min={0} precision={0.01} step={1} placeholder="请填写现总价"  addonAfter="元"/>)}
118
+        })(<InputNumber min={0} precision={2} step={1} placeholder="请填写现总价"  addonAfter="元"/>)}
117
       </Form.Item>
119
       </Form.Item>
118
       <Form.Item label="节省价">
120
       <Form.Item label="节省价">
119
         {getFieldDecorator('thriftPrice', {
121
         {getFieldDecorator('thriftPrice', {
120
           rules: [
122
           rules: [
121
             { required: true, message: '请填写节省价' },
123
             { required: true, message: '请填写节省价' },
122
           ],
124
           ],
123
-        })(<InputNumber min={0} precision={0.01} step={1} placeholder="请填写节省总价" addonAfter="元"/>)}
125
+        })(<InputNumber min={0} precision={2} step={1} placeholder="请填写节省总价" addonAfter="元"/>)}
124
       </Form.Item>
126
       </Form.Item>
125
       <Form.Item label=" " colon={false} style={{marginTop: '2em'}}>
127
       <Form.Item label=" " colon={false} style={{marginTop: '2em'}}>
126
         <AuthButton name="building.special.edit">
128
         <AuthButton name="building.special.edit">

+ 1
- 1
src/pages/building/List/searchFields.js 查看文件

36
       {label: '未开盘', value: '未开盘'},
36
       {label: '未开盘', value: '未开盘'},
37
       {label: '在售', value: '在售'},
37
       {label: '在售', value: '在售'},
38
       {label: '售罄', value: '售罄'},
38
       {label: '售罄', value: '售罄'},
39
-      {label: '在租', value: '在租'},
39
+      // {label: '在租', value: '在租'},
40
     ]
40
     ]
41
   },
41
   },
42
   {
42
   {

+ 2
- 2
src/pages/staff/staff/Edit/index.jsx 查看文件

117
   const fields = [
117
   const fields = [
118
     {
118
     {
119
       label: '头像',
119
       label: '头像',
120
-      name: 'avatar',
120
+      name: 'photo',
121
       type: FieldTypes.ImageUploader,
121
       type: FieldTypes.ImageUploader,
122
       extra: '建议图片尺寸:320*320px,比例1:1,格式:jpg,用于置业顾问头像,限制大小:100k',
122
       extra: '建议图片尺寸:320*320px,比例1:1,格式:jpg,用于置业顾问头像,限制大小:100k',
123
-      value: userData.avatar,
123
+      value: userData.photo||userData.avatar,
124
       beforeUpload: e => photoBeforeUpload(e),
124
       beforeUpload: e => photoBeforeUpload(e),
125
       // rules: [{ required: true, message: '请选择头像' }],
125
       // rules: [{ required: true, message: '请选择头像' }],
126
     },
126
     },

+ 1
- 1
src/pages/staff/staff/list/index.jsx 查看文件

173
       render: (_, record) => (
173
       render: (_, record) => (
174
         <Avatar
174
         <Avatar
175
           shape="square"
175
           shape="square"
176
-          src={record?.avatar}
176
+          src={record?.photo ||record?.avatar}
177
           size={64}
177
           size={64}
178
           icon="user"
178
           icon="user"
179
         />
179
         />