Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

 Conflicts:

	src/views/sunVillage_info/list_cbfsq.vue

package-lock.json

@@ -4281,7 +4281,7 @@
     "fastclick": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/fastclick/-/fastclick-1.0.6.tgz",
-      "integrity": "sha512-cXyDBT4g0uWl/Xe75QspBDAgAWQ0lkPi/zgp6YFEUHj6WV6VIZl7R6TiDZhdOVU3W4ehp/8tG61Jev1jit+ztQ==",
+      "integrity": "sha1-FhYlsnsaWAZAWTa9qaLBkm0Gvmo=",
       "dev": true
     },
     "fastparse": {
@@ -4436,7 +4436,7 @@
     "font-awesome.css": {
       "version": "4.7.2",
       "resolved": "https://registry.npmjs.org/font-awesome.css/-/font-awesome.css-4.7.2.tgz",
-      "integrity": "sha512-FIyRbig4PDY15NGzejM3b8OQ/lWvId8PHnE4CnuDtc8/YYs07cvnqLCyfvIJPwJl5SA/Rq+9jAe9W+Fr1pv0DA=="
+      "integrity": "sha1-B1pCARQo8gJyVO9phgx1ergWyVI="
     },
     "for-in": {
       "version": "1.0.2",
@@ -12350,7 +12350,7 @@
     "vue-html5-editor": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/vue-html5-editor/-/vue-html5-editor-1.1.1.tgz",
-      "integrity": "sha512-Ckmb8djta+XQMUQaxRcCUNBXEzjPF5p6c2nQ5ICcIuR8eYz4b0HAGzXlSDfL3ZxkrVHO2Hx0VrUORLu2Lwem4g==",
+      "integrity": "sha1-WRAhCoMNjI00eaHx/shHMZKqA7M=",
       "dev": true
     },
     "vue-lazyload": {

src/views/homesteadSurvey/add.vue

@@ -852,10 +852,13 @@ export default {
         if(this.form.id == null){
 
           let surveyItem = JSON.parse(localStorage.getItem("surveyItem"));
-          this.$set(this.form, 'theGeomJson', JSON.parse( this.form.theGeomJson));
-          if(this.form.theGeomJson.hasOwnProperty('coordinates')) // 从后台获取的
-          this.$set(this.form, 'theGeomJson',this.form.theGeomJson.coordinates);
-          this.$set(this.form, 'theGeomJson', JSON.stringify( this.form.theGeomJson));
+          if(this.form.theGeomJson instanceof Array){
+            this.$set(this.form, 'theGeomJson', JSON.stringify( this.form.theGeomJson));
+          }else if(typeof this.form.theGeomJson === 'string'){
+            let theGeometry  = JSON.parse( this.form.theGeomJson);
+            if(theGeometry.hasOwnProperty('coordinates')) // 从后台获取的
+              this.$set(this.form, 'theGeomJson', JSON.stringify(theGeometry.coordinates));
+          }
           this.$set(this.form, 'surveyId', surveyItem.id)
           addZjdzd(this.form).then(response => {
             let _this =this;

src/views/homesteadSurvey/fsssAdd.vue

@@ -44,7 +44,7 @@
         </van-row>
       </div>
     </van-sticky>
-    <van-form ref = "form">
+    <van-form ref="form">
       <div style="margin:1.6rem auto;background: #ffffff;width: 95%;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);border-radius:15px;padding-top: 20px;">
         <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">附属设施信息</p>
         <!--<van-field
@@ -209,10 +209,13 @@ export default {
     },
     submitzjd(){
       this.$refs.form.validate().then(() => {
-        this.$set(this.form, 'theGeomJson', JSON.parse( this.form.theGeomJson));
-        if(this.form.theGeomJson.hasOwnProperty('coordinates')) // 从后台获取的
-        this.$set(this.form, 'theGeomJson',this.form.theGeomJson.coordinates);
-        this.$set(this.form, 'theGeomJson', JSON.stringify( this.form.theGeomJson));
+        if(this.form.theGeomJson instanceof Array){
+          this.$set(this.form, 'theGeomJson', JSON.stringify( this.form.theGeomJson));
+        }else if(typeof this.form.theGeomJson === 'string'){
+          let theGeometry  = JSON.parse( this.form.theGeomJson);
+          if(theGeometry.hasOwnProperty('coordinates')) // 从后台获取的
+            this.$set(this.form, 'theGeomJson', JSON.stringify(theGeometry.coordinates));
+        }
       if(this.form.id == null){
         addFsss(this.form).then(response => {
           let _this =this

src/views/homesteadSurvey/nhDetails.vue

@@ -1485,7 +1485,7 @@
         submitzjd(){
           this.$refs.form.validate().then(() => {
             if(this.form.id == null){
-              addNh(this.form).then(response => {
+              addNhhncy(this.form).then(response => {
                 let _this =this
                 this.$toast({
                   icon: 'success', // 找到自己需要的图标
@@ -1497,7 +1497,7 @@
                 })
               });
             }else{
-              updateNh(this.form).then(response => {
+              updateNhhncy(this.form).then(response => {
                 let _this =this
                 this.$toast({
                   icon: 'success', // 找到自己需要的图标

src/views/homesteadSurvey/nhcyList.vue

@@ -55,6 +55,7 @@
         <p style="display: flex;align-items: center;">
           <img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 5px;">
           <span style="line-height: 1;font-size: 16px;">{{item.xm}}</span>
+          <span style="line-height: 1;font-size: 16px;margin-left: 70%;">{{formatDict(yhzgxList,item.yhzgx)}}</span>
         </p>
         <div style="display:flex;line-height:20px;margin-top: 15px;font-size: 14px;color: #999999;">
           <p style="flex:1;text-align:left;">证件号码:</p>
@@ -135,6 +136,7 @@ export default {
       // 使用权人列表
       shyqrData:{},
       hnnylist:[],
+      yhzgxList:[],
       permission:false,
       guohuData: {
         visible: false,
@@ -145,6 +147,9 @@ export default {
     };
   },
   created(){
+    this.houseGetDicts("family_status").then((response) => {
+      this.yhzgxList = response.data;
+    });
     this.shyqrData = this.$route.query;
     this.permission = localStorage.getItem("executePermission");
     this.getList();
@@ -172,6 +177,9 @@ export default {
       this.$router.push({name: this.$router.back(-1)});
       // }
     },
+    formatDict(dict, value) {
+      return this.selectDictLabel(dict, value);
+    },
     handleToHuzhu(row) {
       const ids = row.id || this.ids;
       Dialog.confirm({

src/views/homesteadSurvey/wcnhList.vue

@@ -21,7 +21,7 @@
               <img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 5px;">
               <span style="line-height: 1;">{{item.hzxm}}</span>
             </p>
-            <p style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;border-bottom: 1px dashed #22B7F2;" @click="showPopuphncylist(item)"><img src="../../assets/images/housesteadSurvey/list09.png" alt="" style="margin-right: 3px;">成员</p>
+<!--            <p style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;border-bottom: 1px dashed #22B7F2;" @click="showPopuphncylist(item)"><img src="../../assets/images/housesteadSurvey/list09.png" alt="" style="margin-right: 3px;">成员</p>-->
 
           </div>
         </template>

src/views/homesteadSurvey/zrzAdd.vue

@@ -270,10 +270,17 @@ export default {
     submitzjd(){
       this.$refs.form.validate().then(() => {
       if(this.form.id == null){
-        this.$set(this.form, 'theGeomJson', JSON.parse( this.form.theGeomJson));
-        if(this.form.theGeomJson.hasOwnProperty('coordinates')) // 从后台获取的
-        this.$set(this.form, 'theGeomJson',this.form.theGeomJson.coordinates);
-        this.$set(this.form, 'theGeomJson', JSON.stringify( this.form.theGeomJson));
+        // this.$set(this.form, 'theGeomJson', JSON.parse( this.form.theGeomJson));
+        // if(this.form.theGeomJson.hasOwnProperty('coordinates')) // 从后台获取的
+        // this.$set(this.form, 'theGeomJson',this.form.theGeomJson.coordinates);
+        // this.$set(this.form, 'theGeomJson', JSON.stringify( this.form.theGeomJson));
+          if(this.form.theGeomJson instanceof Array){
+            this.$set(this.form, 'theGeomJson', JSON.stringify( this.form.theGeomJson));
+          }else if(typeof this.form.theGeomJson === 'string'){
+            let theGeometry  = JSON.parse( this.form.theGeomJson);
+            if(theGeometry.hasOwnProperty('coordinates')) // 从后台获取的
+              this.$set(this.form, 'theGeomJson', JSON.stringify(theGeometry.coordinates));
+          }
         addZrz(this.form).then(response => {
           let _this =this
           this.$toast({
@@ -332,7 +339,7 @@ export default {
     onMapDrawFinished(data) {
       console.info(data);
      this.drawInsert = data;
-      this.form.theGeomJson = JSON.stringify(this.drawInsert);
+      this.form.theGeomJson = this.drawInsert;
     },
     // 当申请地图被重置时
     onMapDrawReseted() {