Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov

package.json

@@ -39,7 +39,7 @@
     "jsencrypt": "3.0.3",
     "lodash": "4.17.15",
     "mint-ui": "2.2.13",
-    "node-sass": "4.12.0",
+    "node-sass": "^4.12.0",
     "ol": "6.9.0",
     "portfinder": "1.0.21",
     "proj4": "2.8.0",

src/views/components/resiSearch.vue

@@ -302,13 +302,14 @@ export default {
     let constForm = {
       ...form,
       GRID_ID: '',
+      GRID_IDS: '',
       VILLAGE_ID: '',
       BUILD_ID: '',
       UNIT_ID: '',
       HOME_ID: ''
     }
     let orgOptionProps = {
-      multiple: false,
+      multiple: true,// 市北项目开启多选，2023-04-06
       value: 'agencyId',
       label: 'agencyName',
       children: 'subAgencyList',
@@ -341,7 +342,9 @@ export default {
       form: {
         ...form,
         AGENCY_ID: '',
+        AGENCY_IDS: [],
         GRID_ID: '',
+        GRID_IDS:[],
         VILLAGE_ID: '',
         BUILD_ID: '',
         UNIT_ID: '',
@@ -381,7 +384,7 @@ export default {
       },
 
       queryType:{
-        'AGENCY_ID':'like'
+        'AGENCY_ID':'list_equal'
       }
     }
   },
@@ -518,17 +521,12 @@ export default {
     handleChangeAgency(val) {
       let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
       if (obj) {
-        if(obj.level === 'grid'){
-          this.form.GRID_ID =  this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
-          this.form.AGENCY_ID=''
-        }else{
-          this.form.AGENCY_ID = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
-          this.form.GRID_ID = ''
-        }
-
+        //市北定制化需求，组织与网格多选
+          this.form.GRID_IDS.push(obj.agencyId);
+          this.form.AGENCY_IDS.push( obj.pid);
       }else{
-         this.form.AGENCY_ID=''
-         this.form.GRID_ID = ''
+         this.form.AGENCY_IDS=[]
+         this.form.GRID_IDS = []
       }
 
       this.form.VILLAGE_ID = ''
@@ -538,7 +536,6 @@ export default {
       this.getValiheList()
     },
     handleChangeGrid(val) {
-      console.log('val', val)
       this.form.VILLAGE_ID = ''
       this.form.BUILD_ID = ''
       this.form.UNIT_ID = ''
@@ -546,7 +543,6 @@ export default {
       this.getValiheList()
     },
     handleChangeV(val) {
-      console.log('val', val)
       this.form.BUILD_ID = ''
       this.form.UNIT_ID = ''
       this.form.HOME_ID = ''
@@ -599,7 +595,6 @@ export default {
           }
         }
       }
-      console.log('fixedList----999', this.fixedList)
       this.tempFormList.forEach((item) => {
         if (item.columnName === val) item.isChange = true
       })
@@ -641,8 +636,8 @@ export default {
       const { user } = this.$store.state
       this.$http
         .post('/gov/org/icneighborhood/neighborhoodoption', {
-          gridId: this.form.GRID_ID,
-          agencyId: this.form.AGENCY_ID,
+          gridIds: this.form.GRID_IDS,
+          agencyIds: this.form.AGENCY_IDS,
           // agencyId: user.agencyId
         })
         .then(({ data: res }) => {

src/views/modules/base/resi.vue

@@ -656,14 +656,9 @@ export default {
     handleSearchFrom () {
       let arr = [];
       this.searchList.forEach((item) => {
-        const arr1 =
-          this.$refs[`resiSearch${item.itemGroupId}`][0].handleSearch();
+        const arr1 = this.$refs[`resiSearch${item.itemGroupId}`][0].handleSearch();
         arr = arr.concat(arr1);
-        // console.log('search-----refs', this.$refs[`resiSearch${item.itemGroupId}`])
       });
-      console.log("search-----refs", this.$refs);
-
-      console.log("search-----arr", arr);
       this.currentPage = 1;
       this.conditions = arr;
       this.getTableData();
@@ -675,10 +670,6 @@ export default {
       this.getTableData();
     },
     resetSearchForm (formName) {
-      // for(const n in this.form) {
-      //   this.form[n] = ''
-      // }
-      // this.handleSearch()
       this.searchList.forEach((item) => {
         this.$refs[`resiSearch${item.itemGroupId}`][0].resetForm();
         // console.log('search-----refs', this.$refs[`resiSearch${item.itemGroupId}`])
@@ -1246,15 +1237,12 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
           } else {
-            console.log("获取查询详情成功--sss", res);
-
             res.data.forEach((item) => {
               item.queryItemList.forEach((n) => {
                 if (n.optionSourceType === "remote") {
                   this.getOptionsList(n.optionSourceValue).then((res) => {
                     n.options = this.getTreeData(res);
                   });
-                  // console.log('')
                 } else if (n.itemType == "radio" && n.options.length == 0) {
                   n.options = [
                     {