Merge branch 'fix_bug' into dev

src/components/JwTree/nodeWrap.vue

@@ -101,7 +101,7 @@ export default {
 
     gotoPersonnel(id, name) {
       if (id) {
-        this.$router.push(`/organizational/orgPersonnel/${name}`);
+        this.$router.push({ path: `/organizational/orgPersonnel/${name}`, query: { user_id: id } });
       } else {
         this.$message({
           message: "无法跳转",

src/views/components/resiSearch.vue

@@ -106,7 +106,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="居民年龄">
-          <el-input v-model="form.ageStart" class="u-item-width-daterange" placeholder="请输入" clearable size="small">
+          <el-input v-model="form.ageStart" @change="handleAgeChange" class="u-item-width-daterange" placeholder="请输入" clearable size="small">
           </el-input>
           <span class="u-data-tag">至</span>
           <el-input v-model="form.ageEnd" @change="handleAgeChange" class="u-item-width-daterange u-data-tag"
@@ -713,7 +713,7 @@ export default {
 
     // },
     handleAgeChange() {
-      if (this.form.ageStart) {
+      if (this.form.ageStart&&this.form.ageEnd) {
         if (this.form.ageStart > this.form.ageEnd) {
           this.$message.warning('结束年龄不能小于开始年龄')
         }

src/views/dataBoard/overview/components/MapResourceInfoMore.vue

@@ -22,7 +22,7 @@
                 <div class="value">{{ typesList[types] }}</div>
               </div>
             </el-col>
-            <template v-if="types === 2 || types === 3">
+            <template v-if="types === 2">
               <el-col :span="12">
 
                 <div class="items">

src/views/modules/communityService/policy/addPolicy.vue

@@ -200,7 +200,7 @@
             <el-option
               v-for="item in serviceOptiondList"
               :key="item.id"
-              :label="item.name"
+              :label="item.label"
               :value="item.id"
             >
             </el-option>

src/views/modules/portrayal/jumin/cpts/businessRecord.vue

@@ -108,7 +108,6 @@ export default {
       };
       const marktypes = ["普通事件", "难点读点", "矛盾纠纷", "自身问题"];
 
-      // 省满意度列表
       this.$http
         .post("/actual/base/peopleRoomOverview/eventPageList", parm)
         .then(({ data: res }) => {
@@ -269,6 +268,7 @@ export default {
         this.resiId = [this.userInfo.baseInfoDto.resiId];
         this.getComplainList();
         this.getShengList();
+        this.getShequList()
         this.getfuwuList();
         this.getshijianList();
         this.getxuqiuList();