房屋录入数量不符红色字体,房主证件号,查询列表电话字段修改,

3 years ago · ecd8cb9b82
21 changed files with 61 additions and 49 deletions
--- a/src/views/dataBoard/cpts/map/popup.vue
+++ b/src/views/dataBoard/cpts/map/popup.vue
@ -199,7 +199,7 @@
 					<span>{{ info.holder_phone || "--" }}</span>
 				</div>
 				<div class="item">
-					<span class="field">房主身份证：</span>
+					<span class="field">房主证件号：</span>
 					<span>{{ info.holder_idcard || "--" }}</span>
 				</div>
 				<div class="item">
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@ -25,7 +25,7 @@
          :load="lazyLoadTree"
        >
          <span slot-scope="{ node, data }" class="custom-tree-node">
-            <img
+            <!-- <img
              v-if="showIcons(data)"
              src="@/assets/images/index/abnormal.png"
              style="
@ -34,7 +34,7 @@
                margin-right: 5px;
                margin-top: -3px;
              "
-            />
+            /> -->

            <!-- <span v-if="data.level==='building'&&!data.showIcon"
                  style="padding-left:20px;">{{ '   ' }}</span> -->
@ -43,7 +43,7 @@
              <span style="color: red">{{ data.showNum }}</span>
              <span>{{ ")" }}</span>
            </span> -->
-            <span :id="data.id">{{ data.showName }}</span>
+            <span :id="data.id" :style="{'color':showIcons(data)?'#ff4d4f':''}">{{ data.showName }}</span>
          </span>
        </el-tree>
      </el-scrollbar>
@ -153,7 +153,7 @@
              </el-input>
            </el-form-item>

-            <el-form-item label="所属房屋" prop="neighborHoodId">
+            <!-- <el-form-item label="所属房屋" prop="neighborHoodId">
              <el-select
                v-model.trim="neighborHoodId"
                :disabled="vDisabled"
@ -164,14 +164,14 @@
                class="u-item-width-communitycascader"
                @change="handleChangeV"
              >
-                <!-- <div>
+                <div>
                        <el-input
                        placeholder="请输入"
                        v-model="searchAgencyTxt"
                        @keyup.enter.native="handleChangeSerchAgency(searchAgencyTxt)"
                        >
-                      </el-input> -->
-                <!-- </div> -->
+                      </el-input>
+                </div>
                <el-option
                  v-for="item in optionsV"
                  :key="item.value"
@ -233,7 +233,7 @@
                >
                </el-option>
              </el-select>
-            </el-form-item>
+            </el-form-item> -->

            <!-- </div> -->
          </el-form>
--- a/src/views/modules/base/community/roomDetail.vue
+++ b/src/views/modules/base/community/roomDetail.vue
@ -126,7 +126,7 @@ export default {
        rentFlag: 0, //房屋状态【是：1，否：0】	出租1、闲置2、自住	0
        ownerPhone: "", //联系方式
        ownerName: "", //房主名字
-        ownerIdCard: "", //房主身份证
+        ownerIdCard: "", //房主证件号
        remark: "",
        // realPerson: 0,
        coding: "",
@ -219,7 +219,7 @@ export default {
        rentFlag: 0, //是否出租【是：1，否：0】
        ownerPhone: "", //联系方式
        ownerName: "", //房主名字
-        ownerIdCard: "", //房主身份证
+        ownerIdCard: "", //房主证件号
        remark: "", // 备注
        coding: "",
        sysCoding: "",
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@ -157,11 +157,11 @@
                    v-model="dataForm.ownerPhone">
          </el-input>
        </el-form-item>
-        <el-form-item label="房主身份证"
+        <el-form-item label="房主证件号"
                      prop="ownerIdCard"
                      style="display: block">
          <el-input class="u-edit-width-normal"
-                    placeholder="请输入房主身份证"
+                    placeholder="请输入房主证件号"
                    v-model="dataForm.ownerIdCard">
          </el-input>
        </el-form-item>
@ -217,7 +217,7 @@ export default {
        rentFlag: 0,//房屋状态【是：1，否：0】	出租1、闲置2、自住	0
        ownerPhone: '', //联系方式
        ownerName: '', //房主名字
-        ownerIdCard: '', //房主身份证
+        ownerIdCard: '', //房主证件号
        remark: '',
        // realPerson: 0,
        coding: '',
@ -403,7 +403,7 @@ export default {
        rentFlag: 0,//是否出租【是：1，否：0】
        ownerPhone: '', //联系方式
        ownerName: '', //房主名字
-        ownerIdCard: '', //房主身份证
+        ownerIdCard: '', //房主证件号
        remark: '', // 备注
        coding: '',
        sysCoding: ''
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@ -194,7 +194,7 @@
 									? `${scope.row.idNum.substr(0, 11)}` +
 									  "******" +
 									  `${scope.row.idNum.substr(16, 2)}`
-									: ""
+									: "--"
 							}}
 						</div>
 						<div v-else-if="item.columnName == 'mobile'">
@ -203,7 +203,7 @@
 									? `${scope.row.mobile.substr(0, 3)}` +
 									  "******" +
 									  `${scope.row.mobile.substr(7, 4)}`
-									: ""
+									: "--"
 							}}
 						</div>
 						<div v-else-if="item.columnName == 'categoryInfo'">
@ -696,6 +696,7 @@ export default {
 			},

 			queryConditions: [],
+			searchFlag:false
 		};
 	},

@ -787,7 +788,7 @@ export default {
 			let obj = this.$refs.myResiSearch.form;
 			let categoryArr = this.$refs.myResiSearch.form.categoryKey;
 			let agencyId = this.$refs.myResiSearch.form.agencyId;
-			
+			this.searchFlag = true
 			if (
 				typeof obj.categoryKey == "object" &&
 				obj.categoryKey.length != 0
@ -1009,7 +1010,11 @@ export default {
 				obj.agencyId = "";
 			}
 			this.currentPage = val;
+			if(this.searchFlag){
 			this.getTableData(obj);
+			}else{
+			this.getTableData();
+			}
 			this.$refs.myResiSearch.form.categoryKey = categoryArr;
 			this.$refs.myResiSearch.form.agencyId = agencyId;
 		},
@ -1026,6 +1031,7 @@ export default {
 		},

 		resetSearchForm() {
+			this.searchFlag = false
 			for (const n in this.$refs.myResiSearch.form) {
 				this.$refs.myResiSearch.form[n] = "";

--- a/src/views/modules/base/roomForm.vue
+++ b/src/views/modules/base/roomForm.vue
@ -145,12 +145,12 @@
                    v-model="dataForm.ownerPhone">
          </el-input>
        </el-form-item>
-        <el-form-item label="房主身份证"
+        <el-form-item label="房主证件号"
                      prop="ownerIdCard"
                      label-width="150px"
                      style="display: block">
          <el-input class="item_width_1"
-                    placeholder="请输入房主身份证"
+                    placeholder="请输入房主证件号"
                    v-model="dataForm.ownerIdCard">
          </el-input>
        </el-form-item>
@ -206,7 +206,7 @@ export default {
        rentFlag: 0,//房屋状态【是：1，否：0】	出租1、闲置2、自住	0
        ownerPhone: '', //联系方式
        ownerName: '', //房主名字
-        ownerIdCard: '', //房主身份证
+        ownerIdCard: '', //房主证件号
        remark: '',
        // realPerson: 0,
        coding: '',
@ -357,7 +357,7 @@ export default {
        rentFlag: 0,//是否出租【是：1，否：0】
        ownerPhone: '', //联系方式
        ownerName: '', //房主名字
-        ownerIdCard: '', //房主身份证
+        ownerIdCard: '', //房主证件号
        remark: '', // 备注
        coding: '',
        sysCoding: ''
--- a/src/views/modules/home/cpts/fangwu-info.vue
+++ b/src/views/modules/home/cpts/fangwu-info.vue
@ -86,7 +86,7 @@
          <span>{{ dataForm.ownerPhone }}</span>
        </el-form-item>
        <el-form-item
-          label="房主身份证："
+          label="房主证件号："
          prop="ownerIdCard"
          label-width="150px"
          style="display: block"
@ -121,7 +121,7 @@ export default {
        rentFlag: 1, //房屋状态【是：1，否：0】
        ownerPhone: "", //房主电话
        ownerName: "", //房主名字
-        ownerIdCard: "", //房主身份证
+        ownerIdCard: "", //房主证件号
      },
    };
  },
@ -154,7 +154,7 @@ export default {
        rentFlag: 1, //房屋状态【是：1，否：0】
        ownerPhone: "", //房主电话
        ownerName: "", //房主名字
-        ownerIdCard: "", //房主身份证
+        ownerIdCard: "", //房主证件号
      };
    },
    // 开启加载动画
--- a/src/views/modules/home/cpts/scroll-notice.vue
+++ b/src/views/modules/home/cpts/scroll-notice.vue
@ -78,7 +78,7 @@ export default {
        rentFlag: 1, //是否出租【是：1，否：0】
        ownerPhone: "", //房主电话
        ownerName: "", //房主名字
-        ownerIdCard: "", //房主身份证
+        ownerIdCard: "", //房主证件号
      };
    },
  },
--- a/src/views/modules/plugins/rent/renthouse-add-or-update.vue
+++ b/src/views/modules/plugins/rent/renthouse-add-or-update.vue
@ -25,8 +25,8 @@
        <el-form-item label="房主电话" prop="ownerPhone">
            <el-input v-model="dataForm.ownerPhone" placeholder="房主电话"></el-input>
        </el-form-item>
-        <el-form-item label="房主身份证" prop="ownerIdCard">
-            <el-input v-model="dataForm.ownerIdCard" placeholder="房主身份证"></el-input>
+        <el-form-item label="房主证件号" prop="ownerIdCard">
+            <el-input v-model="dataForm.ownerIdCard" placeholder="房主证件号"></el-input>
        </el-form-item>
        <el-form-item label="网格" prop="gridName">
            <el-input v-model="dataForm.gridName" placeholder="网格"></el-input>
--- a/src/views/modules/plugins/rent/renthouse.vue
+++ b/src/views/modules/plugins/rent/renthouse.vue
@ -221,7 +221,7 @@
        </el-table-column>
        <el-table-column prop="ownerName" label="房主姓名" header-align="center" align="center" min-width="70" show-overflow-tooltip></el-table-column>
        <el-table-column prop="ownerPhone" label="房主电话" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="ownerIdCard" label="房主身份证" header-align="center" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="ownerIdCard" label="房主证件号" header-align="center" align="center" show-overflow-tooltip></el-table-column>
        <el-table-column prop="purchaseDate" label="购房日期" header-align="center" align="center" min-width="100" show-overflow-tooltip></el-table-column>
        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
          <template slot-scope="scope">
--- a/src/views/modules/plugins/rent/renthouseForm.vue
+++ b/src/views/modules/plugins/rent/renthouseForm.vue
@ -144,12 +144,12 @@
                    v-model="dataForm.ownerPhone">
          </el-input>
        </el-form-item>
-        <el-form-item label="房主身份证"
+        <el-form-item label="房主证件号"
                      prop="ownerIdCard"
                      label-width="150px"
                      style="display: block">
          <el-input class="item_width_1"
-                    placeholder="请输入房主身份证"
+                    placeholder="请输入房主证件号"
                    v-model="dataForm.ownerIdCard">
          </el-input>
        </el-form-item>
@ -198,7 +198,7 @@ export default {
        rentFlag: 1,//房屋状态【是：1，否：0】	出租1、闲置2、自住	0
        ownerPhone: '', //房主电话
        ownerName: '', //房主名字
-        ownerIdCard: '', //房主身份证
+        ownerIdCard: '', //房主证件号
        needUpdate: false,
        purchaseDate: '',
          villageId: '',
@ -580,7 +580,7 @@ export default {
        rentFlag: 0,//是否出租【是：1，否：0】
        ownerPhone: '', //房主电话
        ownerName: '', //房主名字
-        ownerIdCard: '', //房主身份证
+        ownerIdCard: '', //房主证件号
        needUpdate: false,
        purchaseDate: '',
        id: ''
--- a/src/views/modules/shequ/chaxun.vue
+++ b/src/views/modules/shequ/chaxun.vue
@ -43,7 +43,7 @@
          </div>
          <div class="btn2" @click="handleClickSearchBtn">
            <img src="@/assets/images/index/i-search.png" />
-            智能搜索
+            智能查询
          </div>
        </div>
      </div>
@ -742,8 +742,14 @@ export default {
          if (n.value == row[item.columnName] ) _val = n.label;
        });
      }
+      console.log(row.mobile);
+
+      if(row.mobile == '' || row.mobile == '--'){
+        row.mobile = "" 
+      }else{
+        row.mobile = row.mobile.substr(0, 3) + '****' + row.mobile.substr(7,4)
+      }
      row.idNum = row.idNum.substr(0, 11) + '*****' + row.idNum.substr(16,2)
-      row.mobile = row.mobile.substr(0, 3) + '****' + row.mobile.substr(7,4)
      return _val || row[item.columnName];
    },

--- a/src/views/modules/shequ/cpts/fangwu-info.vue
+++ b/src/views/modules/shequ/cpts/fangwu-info.vue
@ -86,7 +86,7 @@
          <span>{{ dataForm.ownerPhone }}</span>
        </el-form-item>
        <el-form-item
-          label="房主身份证："
+          label="房主证件号："
          prop="ownerIdCard"
          label-width="150px"
          style="display: block"
@ -121,7 +121,7 @@ export default {
        rentFlag: 1, //房屋状态【是：1，否：0】
        ownerPhone: "", //房主电话
        ownerName: "", //房主名字
-        ownerIdCard: "", //房主身份证
+        ownerIdCard: "", //房主证件号
      },
    };
  },
@ -154,7 +154,7 @@ export default {
        rentFlag: 1, //房屋状态【是：1，否：0】
        ownerPhone: "", //房主电话
        ownerName: "", //房主名字
-        ownerIdCard: "", //房主身份证
+        ownerIdCard: "", //房主证件号
      };
    },
    // 开启加载动画
--- a/src/views/modules/shequ/cpts/scroll-notice.vue
+++ b/src/views/modules/shequ/cpts/scroll-notice.vue
@ -78,7 +78,7 @@ export default {
        rentFlag: 1, //是否出租【是：1，否：0】
        ownerPhone: "", //房主电话
        ownerName: "", //房主名字
-        ownerIdCard: "", //房主身份证
+        ownerIdCard: "", //房主证件号
      };
    },
  },
--- a/src/views/modules/sys/roomForm.vue
+++ b/src/views/modules/sys/roomForm.vue
@ -145,12 +145,12 @@
                    v-model="dataForm.ownerPhone">
          </el-input>
        </el-form-item>
-        <el-form-item label="房主身份证"
+        <el-form-item label="房主证件号"
                      prop="ownerIdCard"
                      label-width="150px"
                      style="display: block">
          <el-input class="item_width_1"
-                    placeholder="请输入房主身份证"
+                    placeholder="请输入房主证件号"
                    v-model="dataForm.ownerIdCard">
          </el-input>
        </el-form-item>
@ -207,7 +207,7 @@ export default {
        rentFlag: 0,//房屋状态【是：1，否：0】	出租1、闲置2、自住	0
        ownerPhone: '', //联系方式
        ownerName: '', //房主名字
-        ownerIdCard: '', //房主身份证
+        ownerIdCard: '', //房主证件号
        remark: '',
        // realPerson: 0,
        coding: '',
@ -393,7 +393,7 @@ export default {
        rentFlag: 0,//是否出租【是：1，否：0】
        ownerPhone: '', //联系方式
        ownerName: '', //房主名字
-        ownerIdCard: '', //房主身份证
+        ownerIdCard: '', //房主证件号
        remark: '', // 备注
        coding: '',
        sysCoding: ''
--- a/src/views/modules/visual/basicinfo/cpts/roomInfo.vue
+++ b/src/views/modules/visual/basicinfo/cpts/roomInfo.vue
@ -77,7 +77,7 @@
        </div>
        <div class="list">
          <div class="item">
-            <span class="item-field">房主身份证：</span>
+            <span class="item-field">房主证件号：</span>
            <span>{{ formData. ownerIdCard?formData.ownerIdCard:'无' }}</span>
          </div>

--- a/src/views/modules/visual/command/cpts/popup.vue
+++ b/src/views/modules/visual/command/cpts/popup.vue
@ -332,7 +332,7 @@
          <span>{{ info.ownerPhone || "--" }}</span>
        </div>
        <div class="item">
-          房主身份证：
+          房主证件号：
          <span>{{ info.ownerIdCard || "--" }}</span>
        </div>
      </div>
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex
@ -301,7 +301,7 @@
          <div class="popContentTitle">联系方式：
            <span>{{ selInfo.ownerPhone }}</span>
          </div>
-          <div class="popContentTitle">房主身份证：
+          <div class="popContentTitle">房主证件号：
            <span>{{ selInfo.ownerIdCard }}</span>
          </div>

--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex
@ -300,7 +300,7 @@
          <div class="popContentTitle">联系方式：
            <span>{{ selInfo.ownerPhone }}</span>
          </div>
-          <div class="popContentTitle">房主身份证：
+          <div class="popContentTitle">房主证件号：
            <span>{{ selInfo.ownerIdCard }}</span>
          </div>

--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
@ -301,7 +301,7 @@
          <div class="popContentTitle">联系方式：
            <span>{{ selInfo.ownerPhone }}</span>
          </div>
-          <div class="popContentTitle">房主身份证：
+          <div class="popContentTitle">房主证件号：
            <span>{{ selInfo.ownerIdCard }}</span>
          </div>

--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
@ -298,7 +298,7 @@
          <div class="popContentTitle">联系方式：
            <span>{{ selInfo.ownerPhone }}</span>
          </div>
-          <div class="popContentTitle">房主身份证：
+          <div class="popContentTitle">房主证件号：
            <span>{{ selInfo.ownerIdCard }}</span>
          </div>