更新

.env.development

 NODE_ENV=development
-# VUE_APP_API_BASE_URL='http://220.203.25.212:9998'
-VUE_APP_API_BASE_URL='http://192.168.0.100:9999'
+VUE_APP_API_BASE_URL='http://220.203.25.212:9999'
+# VUE_APP_API_BASE_URL='http://192.168.0.100:9999'
 # VUE_APP_API_BASE_URL='http://220.203.25.212:9999'
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

.env.production

 NODE_ENV=production
-VUE_APP_API_BASE_URL=http://220.203.25.212:9998
+VUE_APP_API_BASE_URL=http://220.203.25.212:9999
 VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
\ No newline at end of file

.vscode/settings.json

+{
+    "i18n-ally.localesPaths": [
+        "public/tinymce/langs"
+    ]
+}
\ No newline at end of file

src/components/jeecgbiz/JSelectDepart.vue

@@ -134,6 +134,7 @@
       },
       openModal(){
         this.$refs.innerDepartSelectModal.show()
+        console.log('11111111')
       },
       handleOK(rows) {
         if (!rows && rows.length <= 0) {

src/components/jeecgbiz/modal/JSelectDepartModal.vue

@@ -69,7 +69,9 @@
     },
     watch:{
       departId(){
-        this.initDepartComponent()
+        console.log('departId变化')
+        console.log(this.departId)
+        // this.initDepartComponent()
       },
       visible: {
         handler(newV) {
@@ -113,7 +115,7 @@
             let arr = [...res.result]
             this.reWriterWithSlot(arr)
             this.treeData = arr
-            this.initDepartComponent()
+            // this.initDepartComponent()
             if(this.rootOpened){
               this.initExpandedKeys(res.result)
             }
@@ -208,8 +210,11 @@
         if(!this.checkedKeys || this.checkedKeys.length==0){
           this.$emit("ok",'')
         }else{
-          let checkRow = this.getCheckedRows(this.checkedKeys)
-          let keyStr = this.checkedKeys.join(",")
+          let arr = this.checkedKeys.filter((item, index) => this.checkedKeys.findIndex(row=>row === item) === index)
+          let checkRow = this.getCheckedRows(arr)
+          console.log(this.checkedKeys)
+          console.log(arr)
+          let keyStr = arr.join(",")
           this.$emit("ok", checkRow, keyStr)
         }
         this.handleClear()

src/views/system/modules/UserModal.vue

@@ -59,7 +59,7 @@
                   :options="rolesOptions"
                   placeholder="请选择角色">
           </j-multi-select-tag> -->
-          <a-select v-model="model.selectedroles">
+          <a-select v-model="model.selectedroles" placeholder="请选择角色" :getPopupContainer= "(target) => target.parentNode">
             <a-select-option
               v-for="(item,index) in rolesOptions"
               :key="index"
@@ -231,7 +231,7 @@
         //根据屏幕宽度自适应抽屉宽度
         this.resetScreenSize();
         that.userId = record.id;
-        that.model = Object.assign({},{selectedroles:'',selecteddeparts:''}, record);
+        that.model = Object.assign({},{selecteddeparts:''}, record);
         //身份为上级显示负责部门，否则不显示
         if(this.model.userIdentity==2){
           this.departIdShow=true;
@@ -292,8 +292,7 @@
       getUserRoles(userid){
         queryUserRole({userid:userid}).then((res)=>{
           if(res.success){
-            this.model.selectedroles = res.result.join(",");
-            console.log('that.model.selectedroles=',this.model.selectedroles)
+            this.model['selectedroles'] = res.result.join(",");
           }
         });
       },
@@ -318,8 +317,6 @@
         })
       },
       backDepartInfo(info) {
-        console.log(info)
-        return
         this.model.departIds = this.model.selecteddeparts;
         this.nextDepartOptions = info.map((item,index,arr)=>{
           let c = {label:item.text, value: item.value+""}
@@ -353,9 +350,9 @@
             let obj;
             if(!this.model.id){
               this.model.id = this.userId;
-              obj=addUser(this.model);
+              obj=addUser({...this.model, orgCode: this.model.departIds});
             }else{
-              obj=editUser(this.model);
+              obj=editUser({...this.model, orgCode: this.model.departIds});
             }
             obj.then((res)=>{
               if(res.success){
@@ -441,6 +438,9 @@
         }
       },
       validateUsername(rule, value, callback){
+        if(this.model.id) {
+          callback()
+        } else {
           var params = {
             userName: value,
           };
@@ -451,6 +451,7 @@
               callback("用户名已存在!")
             }
           })
+        }
       },
       validateWorkNo(rule, value, callback){
         var params = {
@@ -518,6 +519,7 @@
     padding: 10px 16px;
     text-align: right;
     left: 0;
+    z-index: 9;
     background: #fff;
     border-radius: 0 0 2px 2px;
   }