From a1ca4e44181e1a988bd99a9736f2221a527a7573 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 11 May 2024 11:13:13 +0800
Subject: [PATCH] md

---
 .../emis/EmisBaseTools/CountryPicker.vue      |  1 +
 .../EmisSiteSelectTreePicker.vue              |  2 +-
 .../EmisBaseTools/EmisSiteSimplePicker.vue    | 12 +++---
 src/views/system/role/index.vue               | 37 +++++++++----------
 4 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/src/views/emis/EmisBaseTools/CountryPicker.vue b/src/views/emis/EmisBaseTools/CountryPicker.vue
index 7cfd9037..08f501c9 100644
--- a/src/views/emis/EmisBaseTools/CountryPicker.vue
+++ b/src/views/emis/EmisBaseTools/CountryPicker.vue
@@ -61,6 +61,7 @@
           }
         });
         this.$emit("change",itemData);
+        this.$emit("onChange",itemData);
         this.dispatch('ElFormItem', 'el.form.change', [this.svalue]);
         this.optionItems = this.bakOptionItems;
       },
diff --git a/src/views/emis/EmisBaseTools/EmisSiteSelectTreePicker.vue b/src/views/emis/EmisBaseTools/EmisSiteSelectTreePicker.vue
index 5bf8df18..06898344 100644
--- a/src/views/emis/EmisBaseTools/EmisSiteSelectTreePicker.vue
+++ b/src/views/emis/EmisBaseTools/EmisSiteSelectTreePicker.vue
@@ -225,12 +225,12 @@
         if (!value) return true;
         return ( data.siteCode.toLowerCase().indexOf(value.toLowerCase()) !== -1 || data.siteName.toLowerCase().indexOf(value.toLowerCase()) !== -1 ) ;
       },
+
       handleSelectSiteType(siteType){
         const item = this.dict.type.emis_site_type.find((item) => item.value === siteType);
         this.siteType=siteType;
         if(item!=null && item!=undefined){
           this.siteTypeName = item.label.length >2?item.label.substr(0,2):item.label;
-
         }else{
           this.siteTypeName='全部';
         }
diff --git a/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue b/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue
index c8742c0b..f5d81980 100644
--- a/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue
+++ b/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue
@@ -47,10 +47,10 @@
         type: String,
         required: false
       },
-      // siteType:{
-      //   type: [String,Number],
-      //   required: false
-      // },
+      siteType:{
+        type: [String,Number],
+        required: false
+      },
       isInitiated:{
         type: [Boolean,String],
         required: false,
@@ -73,7 +73,7 @@
           pageNum:1,
           pageSize:20,
           searchValue:null,
-          // siteType:this.siteType,
+          siteType:this.siteType,
           countryCode:this.countryCode,
           siteCode:null
         }
@@ -89,10 +89,12 @@
       siteType(newVal, oldVal) {
         if(newVal!= oldVal ){
         }
+        this.initData();
       },
       countryCode(newVal, oldVal) {
         if(newVal!= oldVal ){
         }
+        this.initData();
       }
     },
     created() {
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 088432aa..a21a17a3 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -185,13 +185,12 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="菜单权限">
-          <el-select v-model="domainId" placeholder="选择域" clearable filterable  @change="reGetMenuTreeselect">
+          <el-select v-model="domainId" placeholder="选择域" clearable filterable  @change="reInitMenuTreeselect">
             <el-option
               v-for="item in domainIdsOptions"
               v-bind:key="item.value"
               v-bind:label="item.label"
               v-bind:value="item.value"
-              @keyup.enter.native="handleQuery"
             />
           </el-select>
         </el-form-item>
@@ -269,7 +268,7 @@
 import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus } from "@/api/system/role";
 import { treeselect as menuTreeselect, roleMenuTreeselect,treeselectByDomainId } from "@/api/system/menu";
 import { treeselect as deptTreeselect, roleDeptTreeselect } from "@/api/system/dept";
-// import { listSysDomain } from "@/api/system/domain";
+import { listSysDomain } from "@/api/system/domain";
 
 export default {
   name: "Role",
@@ -361,24 +360,24 @@ export default {
     };
   },
   created() {
-    // this.initDomainList();
+    this.initDomainList();
     this.getList();
   },
   methods: {
-    // initDomainList() {
-    //   this.loading = true;
-    //   let qParams = {
-    //     pageNum: 1,
-    //     pageSize: 10000,
-    //   }
-    //   listSysDomain(qParams).then(response => {
-    //       // this.domainIdsOptions.push({value:0,label:"全部"})
-    //       response.rows.forEach(item =>{
-    //           var optItem={value:item.id,label:item.name};
-    //           this.domainIdsOptions.push(optItem)
-    //       });
-    //   });
-    // },
+    initDomainList() {
+      this.loading = true;
+      let qParams = {
+        pageNum: 1,
+        pageSize: 10000,
+      }
+      listSysDomain(qParams).then(response => {
+          // this.domainIdsOptions.push({value:0,label:"全部"})
+          response.rows.forEach(item =>{
+              var optItem={value:item.id,label:item.name};
+              this.domainIdsOptions.push(optItem)
+          });
+      });
+    },
     /** 查询角色列表 */
     getList() {
       this.loading = true;
@@ -399,7 +398,7 @@ export default {
       //   this.menuOptions = response.data;
       // });
     },
-    reGetMenuTreeselect() {
+    reInitMenuTreeselect() {
       var roleId = -1;
       if(this.form.roleId != undefined){
         roleId=this.form.roleId;