fix

src/pages/building/Developers/Edit.jsx

@@ -186,7 +186,8 @@ function Edit(props) {
         </Form.Item>
         <Form.Item label="开发商简介">
           {getFieldDecorator('brandRemark', {
-            rules: [{ required: true, message: '请输入开发商简介' }],
+            rules: [{ required: true, message: '请输入开发商简介' },
+           { max: 120, message: '简介请勿超过120个字' }],
           })(<Input.TextArea style={{ width: 400 }} placeholder="120字内的简介" />)}
         </Form.Item>
 

src/pages/building/Edit/Apartment/List.jsx

@@ -2,6 +2,8 @@ import React from 'react'
 import { Button, Table, Popconfirm } from 'antd'
 import AuthButton from '@/components/AuthButton'
 import moment from 'moment'
+import { getImgURL } from '@/utils/image'
+// import ImgPreview from '@/components/ImgPreview'
 
 const saleType = [
   {
@@ -70,12 +72,13 @@ export default (props) => {
       key: 'buildingArea',
       render: (buildingArea, _) => <span>{`${buildingArea === 0 || buildingArea === null ? "-" : buildingArea + "m²"}`}</span>,
     },
-    {
-      title: '使用面积',
-      dataIndex: 'insideArea',
-      key: 'insideArea',
-      render: (insideArea, _) => <span>{`${insideArea === 0 || insideArea === null ? "-" : insideArea + "m²"}`}</span>,
-    },
+    // {
+    //   title: '户型图',
+    //   dataIndex: 'buildingImgList',
+    //   key: 'buildingImgList',
+    //   render: (buildingImgList, _) =>  <ImgPreview images={[{ src:getImgURL(buildingImgList[0].url) }]}></ImgPreview>  ,
+    // },
+    // <Zmage src={getImgURL(buildingImgList[0].url)}   />
     {
       title: '创建时间',
       dataIndex: 'createDate',

src/pages/building/Edit/Basic/form.js

@@ -74,6 +74,8 @@ export function saveData(formData) {
   // 项目标签
   data.tag = (tag || []).map((item, _) => ({ tagName: item }))
 
+  data.brandId = data.brandId || ''
+
   const request = fetch(data.buildingId ? apis.building.updateBuilding : apis.building.addBuilding)
   return request({ data })
 }

src/pages/building/Edit/SpecialRoom/Form.jsx

@@ -25,11 +25,13 @@ const AMForm = (props) => {
 
   function submitData(e) {
     e.preventDefault();
+    
     validateFields((err, values) => {
       if (err) {
         console.error(err);
         return;
       }
+      console.log(values,'-----values-----')
       values.buildingId = props.buildingId;
       values.startTime = values.time[0]
       values.endTime = values.time[1]
@@ -88,7 +90,7 @@ const AMForm = (props) => {
             { required: true, message: '请填写面积' },
             { validator: validMinNum },
           ],
-        })(<InputNumber min={0} precision={0.01} step={1} placeholder="请填写建筑面积" addonAfter="㎡"/>)}
+        })(<InputNumber min={0} precision={2} step={0.01} placeholder="请填写建筑面积" addonAfter="㎡"/>)}
       </Form.Item>
       <Form.Item label="时间">
       {getFieldDecorator('time', {
@@ -106,21 +108,21 @@ const AMForm = (props) => {
           rules: [
             { required: true, message: '请填写原始价' },
           ],
-        })(<InputNumber min={0} precision={0.01} step={1} placeholder="请填写原始总价" addonAfter="元"/>)}
+        })(<InputNumber min={0} precision={2} step={1} placeholder="请填写原始总价" addonAfter="元"/>)}
       </Form.Item>
       <Form.Item label="现价">
         {getFieldDecorator('currentPrice', {
           rules: [
             { required: true, message: '请填写现价' },
           ],
-        })(<InputNumber min={0} precision={0.01} step={1} placeholder="请填写现总价"  addonAfter="元"/>)}
+        })(<InputNumber min={0} precision={2} step={1} placeholder="请填写现总价"  addonAfter="元"/>)}
       </Form.Item>
       <Form.Item label="节省价">
         {getFieldDecorator('thriftPrice', {
           rules: [
             { required: true, message: '请填写节省价' },
           ],
-        })(<InputNumber min={0} precision={0.01} step={1} placeholder="请填写节省总价" addonAfter="元"/>)}
+        })(<InputNumber min={0} precision={2} step={1} placeholder="请填写节省总价" addonAfter="元"/>)}
       </Form.Item>
       <Form.Item label=" " colon={false} style={{marginTop: '2em'}}>
         <AuthButton name="building.special.edit">

src/pages/building/List/searchFields.js

@@ -36,7 +36,7 @@ export default () => [
       {label: '未开盘', value: '未开盘'},
       {label: '在售', value: '在售'},
       {label: '售罄', value: '售罄'},
-      {label: '在租', value: '在租'},
+      // {label: '在租', value: '在租'},
     ]
   },
   {

src/pages/staff/staff/Edit/index.jsx

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

src/pages/staff/staff/list/index.jsx

@@ -173,7 +173,7 @@ export default props => {
       render: (_, record) => (
         <Avatar
           shape="square"
-          src={record?.avatar}
+          src={record?.photo ||record?.avatar}
           size={64}
           icon="user"
         />