Merge branch 'master' into shibei_master

package.json

@@ -45,6 +45,7 @@
     "throttle-debounce": "^3.0.1",
     "v-distpicker": "^1.2.2",
     "vue": "^2.6.11",
+    "vue-baidu-map": "^0.21.22",
     "vue-i18n": "^8.12.0",
     "vue-quill-editor": "^3.0.6",
     "vue-router": "^3.0.7",

public/index.html

@@ -8,6 +8,7 @@
 
   <link rel="shortcut icon" href="<%= BASE_URL %>favicon.ico" />
   <script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&libraries=service&key=LWBBZ-TIGC3-VFP3L-YNMWH-FJB7T-JFBLO"></script>
+  <script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&key=OB4BZ-D4W3U-B7VVO-4PJWW-6TKDJ-WPB77"></script>
   <!-- f2图表 -->
   <!-- <script src="https://gw.alipayobjects.com/os/lib/antv/f2/3.8.1/dist/f2.min.js"></script> -->
 

src/assets/scss/modules/visual/people.scss

@@ -263,9 +263,10 @@
       }
 
       .tab {
+        @include toe;
         margin: 0 5px;
         min-width: 80px;
-        padding: 0 10px;
+        padding: 0 8px;
         height: 36px;
         background: rgba(255, 255, 255, 0);
         border: 1px solid #1257c9;

src/assets/scss/people-info.scss

@@ -104,9 +104,10 @@
             }
 
             .tab {
+                @include toe;
                 margin: 0 5px;
                 min-width: 80px;
-                padding: 0 10px;
+                padding: 0 8px;
                 height: 36px;
                 background: #fff;
                 border: 1px solid #eee;

src/views/modules/base/community/roomTable.vue

@@ -244,7 +244,7 @@ export default {
         this.ownerPhone = null
         this.rentFlag = null
       } else if (source === 'search') {//来源于查询
-
+        this.agencyObj = treeObj
         this.ownerName = ownerName
         this.ownerPhone = ownerPhone
         this.rentFlag = rentFlag

src/views/modules/shequ/cpts/fangwu-info.vue

@@ -9,7 +9,7 @@
         class="form"
       >
         <el-form-item
-          label="所属小区"
+          label="所属小区："
           label-width="150px"
           style="display: block"
         >
@@ -17,7 +17,7 @@
         </el-form-item>
 
         <el-form-item
-          label="所属楼栋"
+          label="所属楼栋："
           label-width="150px"
           style="display: block"
         >
@@ -25,7 +25,7 @@
         </el-form-item>
 
         <el-form-item
-          label="单元号"
+          label="单元号："
           prop="buildingUnitId"
           label-width="150px"
           style="display: block"
@@ -34,7 +34,7 @@
         </el-form-item>
 
         <el-form-item
-          label="门牌号"
+          label="门牌号："
           prop="doorName"
           label-width="150px"
           style="display: block"
@@ -43,7 +43,7 @@
         </el-form-item>
 
         <el-form-item
-          label="房屋类型"
+          label="房屋类型："
           prop="houseType"
           label-width="150px"
           style="display: block"
@@ -52,7 +52,7 @@
         </el-form-item>
 
         <el-form-item
-          label="房屋用途"
+          label="房屋用途："
           prop="purpose"
           label-width="150px"
           style="display: block"
@@ -61,7 +61,7 @@
         </el-form-item>
 
         <el-form-item
-          label="是否出租"
+          label="房屋状态："
           prop="rentFlag"
           label-width="150px"
           style="display: block"
@@ -70,7 +70,7 @@
         </el-form-item>
 
         <el-form-item
-          label="房主姓名"
+          label="房主姓名："
           prop="ownerName"
           label-width="150px"
           style="display: block"
@@ -78,7 +78,7 @@
           <span>{{ dataForm.ownerName }}</span>
         </el-form-item>
         <el-form-item
-          label="房主电话"
+          label="房主电话："
           prop="ownerPhone"
           label-width="150px"
           style="display: block"
@@ -86,7 +86,7 @@
           <span>{{ dataForm.ownerPhone }}</span>
         </el-form-item>
         <el-form-item
-          label="房主身份证"
+          label="房主身份证："
           prop="ownerIdCard"
           label-width="150px"
           style="display: block"
@@ -118,7 +118,7 @@ export default {
         doorName: "", //门牌号
         houseType: "", //房屋类型【楼房，平房，别墅】
         purpose: "", //房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
-        rentFlag: 1, //是否出租【是：1，否：0】
+        rentFlag: 1, //房屋状态【是：1，否：0】
         ownerPhone: "", //房主电话
         ownerName: "", //房主名字
         ownerIdCard: "", //房主身份证
@@ -151,7 +151,7 @@ export default {
         doorName: "", //门牌号
         houseType: "1", //房屋类型【楼房，平房，别墅】
         purpose: "1", //房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
-        rentFlag: 1, //是否出租【是：1，否：0】
+        rentFlag: 1, //房屋状态【是：1，否：0】
         ownerPhone: "", //房主电话
         ownerName: "", //房主名字
         ownerIdCard: "", //房主身份证
@@ -191,7 +191,7 @@ export default {
 
 .div_btn {
   display: flex;
-  justify-content: flex-end;
+  justify-content: center;
 }
 .el-tabs {
   margin: 0 20px;

src/views/modules/shequ/cpts/xuqiu-info.vue

@@ -8,12 +8,12 @@
         :disabled="formType === 'detail'"
         class="form"
       >
-        <el-form-item label="状态" label-width="150px" style="display: block">
+        <el-form-item label="状态：" label-width="150px" style="display: block">
           <span>{{ dataForm.statusName }}</span>
         </el-form-item>
 
         <el-form-item
-          label="所属网格"
+          label="所属网格："
           label-width="150px"
           style="display: block"
         >
@@ -21,7 +21,7 @@
         </el-form-item>
 
         <el-form-item
-          label="需求类型"
+          label="需求类型："
           label-width="150px"
           style="display: block"
         >
@@ -29,7 +29,7 @@
         </el-form-item>
 
         <el-form-item
-          label="需求内容"
+          label="需求内容："
           label-width="150px"
           style="display: block"
         >
@@ -37,32 +37,32 @@
         </el-form-item>
 
         <el-form-item
-          label="上报类型"
+          label="上报类型："
           label-width="150px"
           style="display: block"
         >
           <span>{{ dataForm.reportTypeName }}</span>
         </el-form-item>
 
-        <el-form-item label="上报人" label-width="150px" style="display: block">
+        <el-form-item label="上报人：" label-width="150px" style="display: block">
           <span>{{ dataForm.reportUserName }}</span>
         </el-form-item>
 
         <el-form-item
-          label="上报时间"
+          label="上报时间："
           label-width="150px"
           style="display: block"
         >
           <span>{{ dataForm.reportTime }}</span>
         </el-form-item>
 
-        <el-form-item label="需求人" label-width="150px" style="display: block">
+        <el-form-item label="需求人：" label-width="150px" style="display: block">
           <span>{{ dataForm.demandUserName }}</span>
         </el-form-item>
 
         <el-form-item
           v-if="dataForm.serviceShowName"
-          label="服务方"
+          label="服务方："
           label-width="150px"
           style="display: block"
         >
@@ -71,7 +71,7 @@
 
         <el-form-item
           v-if="dataForm.wantServiceTime"
-          label="服务时间"
+          label="服务时间："
           label-width="150px"
           style="display: block"
         >
@@ -84,7 +84,7 @@
             dataForm.serviceEndTime &&
             dataForm.status == 'finished'
           "
-          label="实际服务时间"
+          label="实际服务时间："
           label-width="150px"
           style="display: block"
         >
@@ -97,7 +97,7 @@
 
         <el-form-item
           v-if="dataForm.finishResult && dataForm.status == 'finished'"
-          label="完成情况"
+          label="完成情况："
           label-width="150px"
           style="display: block"
         >
@@ -108,7 +108,7 @@
 
         <el-form-item
           v-if="dataForm.score && dataForm.status == 'finished'"
-          label="评价得分"
+          label="评价得分："
           label-width="150px"
           style="display: block"
         >
@@ -117,7 +117,7 @@
 
         <el-form-item
           v-if="dataForm.finishDesc && dataForm.status == 'finished'"
-          label="评价备注"
+          label="评价备注："
           label-width="150px"
           style="display: block"
         >
@@ -126,7 +126,7 @@
 
         <el-form-item
           v-if="dataForm.cancelTime && dataForm.status == 'canceled'"
-          label="取消时间"
+          label="取消时间："
           label-width="150px"
           style="display: block"
         >
@@ -208,7 +208,7 @@ export default {
 
 .div_btn {
   display: flex;
-  justify-content: flex-end;
+  justify-content: center;
 }
 .el-tabs {
   margin: 0 20px;

src/views/modules/shequ/index.vue

@@ -138,7 +138,7 @@
                                    label="用途">
                   </el-table-column>
                   <el-table-column prop="rentFlag"
-                                   label="是否出租">
+                                   label="房屋状态">
                   </el-table-column>
                   <el-table-column prop="ownerName"
                                    label="房主姓名">

src/views/modules/visual/communityParty/community.vue

@@ -352,6 +352,18 @@ export default {
           4: {
             color: 'rgba(192, 21, 195, 1)',
             icon: require('../../../../assets/img/shuju/measure/qita.png')
+          },
+          5: {
+            color: '#ee7801',
+            icon: require('../../../../assets/img/shuju/measure/minban.png')
+          },
+          6: {
+            color: '#e70683',
+            icon: require('../../../../assets/img/shuju/measure/jijin.png')
+          },
+          7: {
+            color: '#0189d5',
+            icon: require('../../../../assets/img/shuju/measure/other.png')
           }
         }
         this.partyItem = data.map((item, index) => {
@@ -511,8 +523,14 @@ export default {
             item.urlIndex = 2
           } else if (item.type === '机关直属部门') {
             item.urlIndex = 3
-          } else if (item.type === '其他') {
+          } else if (item.type === '社会团体') {
             item.urlIndex = 4
+          } else if (item.type === '民办非企业单位') {
+            item.urlIndex = 5
+          } else if (item.type === '基金会') {
+            item.urlIndex = 6
+          } else if (item.type === '其他') {
+            item.urlIndex = 7
           }
         });
 
@@ -522,7 +540,10 @@ export default {
           require('../../../../assets/img/shuju/measure/lxzz.png'),//两新组织
           require('../../../../assets/img/shuju/measure/qydw.png'),//区域单位党建
           require('../../../../assets/img/shuju/measure/jgzs.png'),//机关直属部门
-          require('../../../../assets/img/shuju/measure/qita.png')//其他
+          require('../../../../assets/img/shuju/measure/qita.png'),//社会团体
+          require('../../../../assets/img/shuju/measure/minban.png'),//民办
+          require('../../../../assets/img/shuju/measure/jijin.png'),//基金
+          require('../../../../assets/img/shuju/measure/other.png')//其他
         ]
 
 

src/views/pages/caijisuccess.vue

@@ -76,37 +76,37 @@ export default {
     let query = this.$route.query
     this.formData = query.formData
 
-    this.formData = {
+    // this.formData = {
-      shequName: '清江路社区',
+    //   shequName: '清江路社区',
-      address: "金玉良缘1花好月圆1单元3123123金玉良缘1花好月圆1单元3123123",
+    //   address: "金玉良缘1花好月圆1单元3123123金玉良缘1花好月圆1单元3123123",
-      buildId: "1494482424728395778",
+    //   buildId: "1494482424728395778",
-      buildName: "花好月圆",
+    //   buildName: "花好月圆",
-      customerId: "45687aa479955f9d06204d415238f7cc",
+    //   customerId: "45687aa479955f9d06204d415238f7cc",
-      homeId: "other",
+    //   homeId: "other",
-      homeName: "3123123",
+    //   homeName: "3123123",
-      houseHolderName: "张三",
+    //   houseHolderName: "张三",
-      houseType: "1",
+    //   houseType: "1",
-      memberList: [
+    //   memberList: [
-        {
+    //     {
-          customerId: "45687aa479955f9d06204d415238f7cc",
+    //       customerId: "45687aa479955f9d06204d415238f7cc",
-          domicilePlace: "23123",
+    //       domicilePlace: "23123",
-          heSuanCount: "2",
+    //       heSuanCount: "2",
-          idNum: "312312",
+    //       idNum: "312312",
-          mobile: "15111111111",
+    //       mobile: "15111111111",
-          name: "张三",
+    //       name: "张三",
-        },
+    //     },
-        {
+    //     {
-          customerId: "45687aa479955f9d06204d415238f7cc",
+    //       customerId: "45687aa479955f9d06204d415238f7cc",
-          domicilePlace: "123123",
+    //       domicilePlace: "123123",
-          heSuanCount: null,
+    //       heSuanCount: null,
-          idNum: "王二麻",
+    //       idNum: "王二麻",
-          mobile: "3123123123",
+    //       mobile: "3123123123",
-          name: "李四",
+    //       name: "李四",
-        }
+    //     }
-      ]
+    //   ]
-
+
-    }
+    // }
-    console.log(this.formData)
+    // console.log(this.formData)
 
   },