合并feature-dev

src/router/index.js

@@ -172,7 +172,7 @@ export const dataBoardRoutes = {
   component: () => import("@/views/dataBoardMain/main"),
   name: "dataBoard",
   redirect: {
-    path: "/dataBoard/overView/index",
+    path: "/dataBoard/overview/index",
   },
   meta: {
     title: "主入口布局",

src/views/components/resiForm.vue

@@ -308,8 +308,8 @@
                     <el-select v-model="form[itemj.id][itemk.formName]"
                                :placeholder="`请选择${itemk.label}`"
                                size="small"
-                               :multiple="itemk.formName=='specialCategoryCode'"
-                               :collapse-tags="itemk.formName=='specialCategoryCode'"
+                               :multiple="itemk.multiple"
+                               :collapse-tags="itemk.collapseTags"
                                clearable
                                :style="{'width':itemk.formName=='specialCategoryCode'?'183px':''}"
                                class="u-item-width-normal">
@@ -479,7 +479,7 @@ export default {
         {
           label: '国籍',
           itemType: "select",
-          requiredFlag: true,
+          rules: [{ required: true, message: '国籍不能为空' }],
           formName: 'nationality',
           opction: [],
         },
@@ -1222,6 +1222,8 @@ export default {
             label: '人群类别',
             itemType: "select1",
             formName: "specialCategoryCode",
+            multiple:true,
+            collapseTags:true,
             opction: []
           },]
         },
@@ -1263,6 +1265,8 @@ export default {
             label: '岗位类型',
             itemType: "select1",
             formName: "jobPost",
+            multiple:true,
+            collapseTags:true,
             opction: []
           },
           ]
@@ -1529,7 +1533,7 @@ export default {
         },
         postDto: {
           hiredate: '',//入职时间
-          jobPost: '',//岗位类型
+          jobPost: [],//岗位类型
           userId: ''
         },
         birthRecordDTO: {
@@ -1770,7 +1774,7 @@ export default {
       await this.getDictData('chronic_disease_code', 'chronicDiseaseCode')
     },
     async getWelfareDict () {
-      await this.getDictData('welfare_post', 'jobPost')
+      await this.getDictData('public_welfare_post_type', 'jobPost')
     },
     async getUnemployment () {
       await this.getDictData('unemployment_cause', 'unemploymentReason')
@@ -2669,7 +2673,7 @@ export default {
         } else {
           this.form.postDto = res.data ? res.data : {
             hiredate: '',//入职时间
-            jobPost: '',	//岗位类型
+            jobPost: [],	//岗位类型
             userId: id
           }
 

src/views/components/resiSearch.vue

@@ -833,10 +833,17 @@ export default {
       } else {
         agencyIdTemp = this.form.agencyId[this.form.agencyId.length - 1]
       }
+      var gridIdQuery = '';
+      var agencyIdQuery = this.form.agencyId[0];
+      if (this.form.agencyId.length >= 2) {
+         agencyIdQuery= this.form.agencyId[this.form.agencyId.length - 2];
+         gridIdQuery = this.form.agencyId[this.form.agencyId.length - 1];
+      }
+      
       this.$http
         .post('/actual/base/communityQuarters/listQuartersOptions', {
-          gridId: this.form.agencyId[1],
-          agencyId: this.form.agencyId[0],
+          gridId: gridIdQuery,
+          agencyId: agencyIdQuery,
           // agencyId: user.agencyId
         })
         .then(({ data: res }) => {
@@ -853,8 +860,8 @@ export default {
     },
     getBuildList () {
       this.$http
-        .post('/gov/org/icbuilding/buildingoption', {
-          neighborHoodId: this.form.villageId
+        .post('/actual/base/communityBuilding/buildingoption', {
+          quartersId: this.form.villageId
         })
         .then(({ data: res }) => {
           if (res.code !== 0) {
@@ -870,7 +877,7 @@ export default {
     },
     getUniList () {
       this.$http
-        .post('/gov/org/icbuildingunit/unitoption', {
+        .post('/actual/base/communityBuildingUnit/unitoption', {
           buildingId: this.form.buildId
         })
         .then(({ data: res }) => {
@@ -887,7 +894,7 @@ export default {
     },
     getHouseList () {
       this.$http
-        .post('/gov/org/ichouse/houseoption', { unitId: this.form.unitId })
+        .post('/actual/base/communityHouse/houseoption', { buildingId: this.form.buildId,unitId: this.form.unitId })
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)

src/views/main-navbar-update-password-work.vue

@@ -153,7 +153,7 @@ export default {
 
           const { pubKey } = this;
           this.$http
-            .post("/gov/mine/mine/resetpassword", {
+            .post("/epmetuser/customerstaff/changePassword", {
               oldPassword: encryptedData(pubKey, this.dataForm.password),
               newPassword: encryptedData(pubKey, this.dataForm.newPassword),
               confirmNewPassword: encryptedData(

src/views/modules/base/resi.vue

@@ -387,7 +387,7 @@ export default {
                 { columnName: "name", label: "姓名", width: 80 },
                 { columnName: "birthday", label: "生日", width: 100 },
                 { columnName: "gender", label: "性别", width: 50 },
-                { columnName: "nationalityName", label: "国籍", width: 50 },
+                { columnName: "nationality", label: "国籍", width: 50 },
                 { columnName: "agencyName", label: "所属组织", width: 150 },
                 { columnName: "gridName", label: "所属网格", width: 150 },
                 { columnName: "homeName", label: "所属房屋", width: 150 },

src/views/modules/base/residentManagement/louzhang/louzhangList.vue

@@ -195,9 +195,9 @@
                            label="身份证号"
                            :show-overflow-tooltip="true">
           </el-table-column>
-          <el-table-column prop="dormitoryName"
+          <el-table-column prop="dormitoryTypeName"
                            align="center"
-                           width="80"
+                           width="100"
                            label="类型"
                            :show-overflow-tooltip="true">
             <!-- <template slot-scope="scope">
@@ -392,8 +392,8 @@ export default {
     },
     getBuildList () {
       this.$http
-        .post('/gov/org/icbuilding/buildingoption', {
-          neighborHoodId: this.formData.villageId
+        .post('/actual/base/communityBuilding/buildingoption', {
+          quartersId: this.formData.villageId
         })
         .then(({ data: res }) => {
           if (res.code !== 0) {
@@ -409,7 +409,7 @@ export default {
     },
     getUniList () {
       this.$http
-        .post('/gov/org/icbuildingunit/unitoption', {
+        .post('/actual/base/communityBuildingUnit/unitoption', {
           buildingId: this.formData.buildId
         })
         .then(({ data: res }) => {

src/views/modules/base/residentManagement/publicWelfarePost/addForm.vue

@@ -155,8 +155,8 @@
                             <span>{{ formData.postTypes }}</span>
                         </div>
                         <el-form-item label-width="100px" label="岗位类型" prop="postTypes" v-else>
-                            <el-select v-model="formData.postTypes" clearable>
-                                <el-option v-for="item in dicts.public_welfare_post_type" :key="item.value"
+                            <el-select v-model="formData.postTypes" multiple collapse-tags clearable>
+                                <el-option v-for="item in dicts.public_welfare_post_type"  :key="item.value"
                                     :label="item.label" :value="item.value">
                                 </el-option>
                             </el-select>

src/views/modules/base/residentManagement/publicWelfarePost/publicWelfarePost.vue

@@ -46,6 +46,7 @@
               >
               </el-date-picker>
               <span class="u-data-tag">至</span>
+              <!-- :picker-options="endPickerOptionsBirthday" -->
               <el-date-picker
                 v-model="formData.birthdayEnd"
                 type="date"
@@ -53,7 +54,6 @@
                 value-format="yyyy-MM-dd"
                 class="u-item-width-daterange u-data-tag"
                 placeholder="结束日期"
-                :picker-options="endPickerOptionsBirthday"
               >
               </el-date-picker>
             </el-form-item>
@@ -84,7 +84,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label-width="100px" label="岗位类型" prop="postTypes" >
-                <el-select v-model="formData.postTypes" clearable size="small" class="u-item-width-normal"> 
+                <el-select v-model="formData.postTypes" multiple collapse-tags clearable size="small" class="u-item-width-normal"> 
                     <el-option
                     v-for="item in dicts.public_welfare_post_type"
                     :key="item.value"
@@ -95,6 +95,7 @@
                 </el-select>
             </el-form-item>
                 <el-form-item label="入职时间">
+                  <!-- :picker-options="startPickerOptions" -->
               <el-date-picker
                 v-model="formData.hireDateFrom"
                 type="date"
@@ -102,10 +103,11 @@
                 class="u-item-width-daterange"
                 value-format="yyyy-MM-dd"
                 placeholder="开始日期"
-                :picker-options="startPickerOptions"
               >
               </el-date-picker>
               <span class="u-data-tag">至</span>
+                
+              <!-- :picker-options="endPickerOptionsBirthday" -->
               <el-date-picker
                 v-model="formData.hireDateEnd"
                 type="date"
@@ -113,7 +115,6 @@
                 value-format="yyyy-MM-dd"
                 class="u-item-width-daterange u-data-tag"
                 placeholder="结束日期"
-                :picker-options="endPickerOptionsBirthday"
               >
               </el-date-picker>
             </el-form-item>
@@ -458,10 +459,9 @@
             this.$http.post("sys/dict/data/education", {
               formCode: "resi_base_info",
             }),
-            this.$http.post("sys/dict/data/education", {
-              formCode: "public_welfare_post_type",
+            this.$http.post("sys/dict/data/dictlist", {
+              dictType: "public_welfare_post_type",
             }),
-            
           ];
           const dictKeys = ["nationList", "educationList",'public_welfare_post_type']; // 对应的键名
   

src/views/modules/base/residentManagement/tefu/tefuList.vue

@@ -683,8 +683,8 @@ export default {
     },
     getBuildList () {
       this.$http
-        .post('/gov/org/icbuilding/buildingoption', {
-          neighborHoodId: this.formData.villageId
+        .post('/actual/base/communityBuilding/buildingoption', {
+          quartersId: this.formData.villageId
         })
         .then(({ data: res }) => {
           if (res.code !== 0) {
@@ -700,7 +700,7 @@ export default {
     },
     getUniList () {
       this.$http
-        .post('/gov/org/icbuildingunit/unitoption', {
+        .post('/actual/base/communityBuildingUnit/unitoption', {
           buildingId: this.formData.buildId
         })
         .then(({ data: res }) => {
@@ -717,7 +717,7 @@ export default {
     },
     getHouseList () {
       this.$http
-        .post('/gov/org/ichouse/houseoption', { unitId: this.formData.unitId })
+        .post('/actual/base/communityHouse/houseoption', { buildingId: this.formData.buildId,unitId: this.formData.unitId })
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)

src/views/modules/communityService/measure/index.vue

@@ -433,19 +433,21 @@
           ></el-input>
           <el-select
             v-else
-            v-model="selectDemandUser"
+            v-model="form.demandUserId"
             class="u-item-width-normal"
             filterable
             :disabled="disabled"
             placeholder="请选择"
             clearable
             @change="handleDemandChange"
+            remote
+            :remote-method="getDemandUserList"
           >
             <el-option
               v-for="item in demandUserList"
-              :key="item.demandUserId"
+              :key="item.demanderId"
               :label="item.label"
-              :value="item"
+              :value="item.demanderId"
             >
             </el-option>
           </el-select>
@@ -990,11 +992,11 @@ export default {
       }
     },
     handleDemandChange(val) {
-      console.log("val", val, this.selectDemandUser);
-      this.selectDemandUser = val.label;
-      this.form.demandUserName = val.demandUserName;
-      this.form.demandUserMobile = val.demandUserMobile;
-      this.form.demandUserId = val.demandUserId;
+    //   console.log("val", val, this.selectDemandUser);
+    //   this.selectDemandUser = val.label;
+      this.form.demandUserName = val.demanderName;
+      this.form.demandUserMobile = val.demanderMobile;
+    //   this.form.demandUserId = val.demanderId;
     },
     handleSearch(val) {
       console.log("searchhh--", val);
@@ -1310,22 +1312,21 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    async getDemandUserList() {
+
+    async getDemandUserList(demanderName) {
       const { user } = await this.$store.state;
-      console.log("user---ppp", user);
-      const params = {
-        agencyId: user.agencyId,
-        gridId: this.form.gridId,
-        name: "",
-      };
+      console.log("demanderName:", demanderName);
       // addorupdate
       await this.$http
-        .post("/epmetuser/icresiuser/demandusers", params)
+        .get(`/actual/base/resiDemand/listDemander2Serve?gridId=${this.form.gridId}&demanderName=${demanderName ? demanderName : ''}`)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
           } else {
             console.log("获取查询详情成功", res.data);
+            res.data.map(e=>{
+                e.label = e.demanderName + "(" + e.demanderMobile + ")";
+            })
             this.demandUserList = res.data;
           }
         })

src/views/modules/satisfaction/detail/eventInfo.vue

@@ -243,7 +243,7 @@ export default {
                 const data = res.data.data;
                 if (res.status === 200) {
                     this.total = data.total || 0;
-                    this.provinceList = data.childData;
+                    this.provinceList = data.list;
                 }
             })).catch((err => {
                 this.$message.error(err);

src/views/modules/satisfaction/satisfactionProvince/formList.vue

@@ -136,7 +136,7 @@ export default {
                 let url = '/governance/provinceEvaluationRecord/pageInfo'
                 const { data, code, msg } = await requestPost(url, params)
                 if (code == 0) {
-                    this.tableData = data.childData;
+                    this.tableData = data.list;
                     this.total = data.total;
                 } else {
                     console.log(err);