Browse Source

Merge branch 'master' of lizhiqi/yongxu-web into master

lizhiqi 11 months ago
parent
commit
619c3eb76d

+ 1 - 15
src/pages/ReportHomeManagement/check.tsx

@@ -46,21 +46,7 @@ const Check: React.FC<checkProps> = (props) => {
         <Descriptions.Item label="楼栋号">{data?.building}</Descriptions.Item>
         <Descriptions.Item label="单元">{data?.unit}</Descriptions.Item>
         <Descriptions.Item label="门牌号">{data?.doorplate}</Descriptions.Item>
-        <Descriptions.Item label="空调类型">
-          {
-            {
-              1: '组合式方案',
-              2: '供暖机组',
-              3: '雅居多联机',
-              4: '多联机系列',
-              5: '螺杆机系列',
-              6: '热水机系列',
-              7: '离心机系列',
-              8: '地源热泵',
-              9: '模块机系列',
-            }[data?.air_conditioner_type]
-          }
-        </Descriptions.Item>
+        <Descriptions.Item label="空调类型">{data?.air_conditioner_type}</Descriptions.Item>
         <Descriptions.Item label="业主姓名">{data?.proprietor_name}</Descriptions.Item>
         <Descriptions.Item label="联系方式">{data?.phone}</Descriptions.Item>
         <Descriptions.Item label="客户分类">{data?.customer_type}</Descriptions.Item>

+ 10 - 26
src/pages/ReportHomeManagement/edit.tsx

@@ -190,40 +190,24 @@ const Edit: React.FC<userEditPros> = (props) => {
                 placeholder="请选择空调类型"
                 options={[
                   {
-                    value: '1',
-                    label: '组合式方案',
+                    value: '6s水机',
+                    label: '6s水机',
                   },
                   {
-                    value: '2',
-                    label: '供暖机组',
+                    value: '8s水机',
+                    label: '8s水机',
                   },
                   {
-                    value: '3',
-                    label: '雅居多联机',
+                    value: '7.2kw氟机',
+                    label: '7.2kw氟机',
                   },
                   {
-                    value: '4',
-                    label: '多联机系列',
+                    value: '12kw氟机',
+                    label: '12kw氟机',
                   },
                   {
-                    value: '5',
-                    label: '螺杆机系列',
-                  },
-                  {
-                    value: '6',
-                    label: '热水机系列',
-                  },
-                  {
-                    value: '7',
-                    label: '离心机系列',
-                  },
-                  {
-                    value: '8',
-                    label: '地源热泵',
-                  },
-                  {
-                    value: '9',
-                    label: '模块机系列',
+                    value: '12kw水机',
+                    label: '12kw水机',
                   },
                 ]}
               />

+ 3 - 3
src/pages/ReportHomeManagement/index.tsx

@@ -175,9 +175,9 @@ const CommunityManagement: React.FC = () => {
       key: 'community_name',
     },
     {
-      title: '地址',
-      dataIndex: 'address',
-      key: 'address',
+      title: '门牌号',
+      dataIndex: 'doorplate',
+      key: 'doorplate',
     },
     {
       title: '详细地址',

+ 1 - 15
src/pages/ReportingManagement/check.tsx

@@ -89,21 +89,7 @@ const Check: React.FC<checkProps> = (props) => {
             }[data?.project_progress]
           }
         </Descriptions.Item>
-        <Descriptions.Item label="空调类型">
-          {
-            {
-              1: '组合式方案',
-              2: '供暖机组',
-              3: '雅居多联机',
-              4: '多联机系列',
-              5: '螺杆机系列',
-              6: '热水机系列',
-              7: '离心机系列',
-              8: '地源热泵',
-              9: '模块机系列',
-            }[data?.air_conditioner_type]
-          }
-        </Descriptions.Item>
+        <Descriptions.Item label="空调类型">{data?.air_conditioner_type}</Descriptions.Item>
         <Descriptions.Item label="甲方联系人">{data?.contact_person}</Descriptions.Item>
         <Descriptions.Item label="联系方式">{data?.phone}</Descriptions.Item>
         <Descriptions.Item label="计划成交日期">

+ 10 - 26
src/pages/ReportingManagement/edit.tsx

@@ -365,40 +365,24 @@ const Edit: React.FC<userEditPros> = (props) => {
                 placeholder="请选择空调类型"
                 options={[
                   {
-                    value: '1',
-                    label: '组合式方案',
+                    value: '6s水机',
+                    label: '6s水机',
                   },
                   {
-                    value: '2',
-                    label: '供暖机组',
+                    value: '8s水机',
+                    label: '8s水机',
                   },
                   {
-                    value: '3',
-                    label: '雅居多联机',
+                    value: '7.2kw氟机',
+                    label: '7.2kw氟机',
                   },
                   {
-                    value: '4',
-                    label: '多联机系列',
+                    value: '12kw氟机',
+                    label: '12kw氟机',
                   },
                   {
-                    value: '5',
-                    label: '螺杆机系列',
-                  },
-                  {
-                    value: '6',
-                    label: '热水机系列',
-                  },
-                  {
-                    value: '7',
-                    label: '离心机系列',
-                  },
-                  {
-                    value: '8',
-                    label: '地源热泵',
-                  },
-                  {
-                    value: '9',
-                    label: '模块机系列',
+                    value: '12kw水机',
+                    label: '12kw水机',
                   },
                 ]}
               />