Merge branch 'dev' of http://git.omniview.pro/fangdi/housemanage/web/majorproject into dev

src/router/xuhuiRoutes.json

 {
   "Layout": [
     {
-      "path": "/order/disposal", "name": "Disposal",
-      "meta": { "title": "处置单列表", "menuPath":false, "menuIcon": "profile","hideInBread":false},
-      "children":[
-        { 
-          "path": "/order/disposal/disposalList", "name": "disposalList",
-          "meta": { "title": "处置单列表", "menuPath":false, "menuIcon": "profile","hideInBread":false},
-          "children": [
-            {
-              "path": "/order/disposal/disposalView/:id", "name": "DisposalView",
-              "meta": { "title": "处置单详情", "menuPath":false, "hideInBread":false }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "path": "/order/month", "name": "month",
+      "path": "/question/month", "name": "month",
       "meta": { "title": "检查单","menuIcon": "profile", "menuPath":false, "hideInBread":false },
       "children":[
         {
-          "path": "/order/month/monthList", "name": "month",
+          "path": "/question/month/monthList", "name": "month",
           "meta": { "title": "房办月查列表","menuIcon": "profile", "menuPath":false, "hideInBread":false },
           "children": [
             {
-              "path": "/order/month/monthInfo", "name": "monthInfo",
+              "path": "/question/month/monthInfo", "name": "monthInfo",
               "meta": { "title": "检查详情", "menuPath":false, "hideInBread":false }
             }
           ]

src/views/houseData/feeStandard.vue

@@ -35,6 +35,14 @@
             <span slot="charges" slot-scope="text, record">
               {{changeMeaning('charges', record.charges)}}
             </span>
+
+            <span slot="area" slot-scope="text, record">
+              {{text + `（㎡）`}}
+            </span>
+
+            <span slot="charges" slot-scope="text, record">
+              {{text + `（元/月·㎡）`}}
+            </span>
           </a-table>
         </div>
     </div>
@@ -50,11 +58,11 @@ export default {
     return {
       columns: [ // 表格展示的列
         {
-          title: '是否较前一份物业服务合同调整过物业服务费',
-          dataIndex: 'changedCosts',
-          key: 'changedCosts',
+          title: '建筑类型',
+          dataIndex: 'buildingType',
+          key: 'buildingType',
           scopedSlots: {
-            customRender: 'changedCosts'
+            customRender: 'buildingType'
           }
         },
         {
@@ -66,11 +74,11 @@ export default {
           }
         },
         {
-          title: '建筑类型',
-          dataIndex: 'buildingType',
-          key: 'buildingType',
+          title: '是否较前一份物业服务合同调整过物业服务费',
+          dataIndex: 'changedCosts',
+          key: 'changedCosts',
           scopedSlots: {
-            customRender: 'buildingType'
+            customRender: 'changedCosts'
           }
         },
         {
@@ -89,15 +97,21 @@ export default {
             customRender: 'houseUse'
           }
         },
-        {
-          title: '物业费收费标准',
-          dataIndex: 'charges',
-          key: 'charges',
-        },
         {
           title: '可收费面积',
           dataIndex: 'area',
           key: 'area',
+          scopedSlots: {
+            customRender: 'area'
+          }
+        },
+        {
+          title: '物业费收费标准',
+          dataIndex: 'charges',
+          key: 'charges',
+          scopedSlots: {
+            customRender: 'charges'
+          }
         },
         {
           title: '可收费户数/车位数（个）',

src/views/houseData/propertyInfoView.vue

@@ -295,7 +295,7 @@
                   </a-row>
                   <a-row type="flex" justify="start" class="detailsPartLine">
                     <a-col span="24">
-                      <DetailsItem :labelSpan='12' :textSpan="12" :label='"项目经理手机号"' :text='detail.csmPhone'/>
+                      <DetailsItem :labelSpan='12' :textSpan="12" :label='"项目总自然幢数"' :text='detail.stTotBuilds'/>
                     </a-col>
                   </a-row>
                 </a-col>
@@ -312,7 +312,7 @@
                   </a-row>
                   <a-row type="flex" justify="start" class="detailsPartLine">
                     <a-col span="24">
-                      <DetailsItem :labelSpan='12' :textSpan="12" :label='"项目总建筑面积类型"' :text='detail.stCnstAreaTypeName'/>
+                      <DetailsItem :labelSpan='12' :textSpan="12" :label='"项目类型"' :text='detail.stUseType'/>
                     </a-col>
                   </a-row>
                   <a-row type="flex" justify="start" class="detailsPartLine">
@@ -347,7 +347,7 @@
                   </a-row>
                     <a-row type="flex" justify="start" class="detailsPartLine">
                     <a-col span="24">
-                      <DetailsItem :labelSpan='12' :textSpan="12" :label='"项目总自然幢数"' :text='detail.stTotBuilds'/>
+                      <DetailsItem :labelSpan='12' :textSpan="12" :label='"项目经理手机号"' :text='detail.csmPhone'/>
                     </a-col>
                   </a-row>
                   <a-row type="flex" justify="start" class="detailsPartLine">