diff --git a/jero-web/src/components/dict/JDictSelectTag.vue b/jero-web/src/components/dict/JDictSelectTag.vue index df32b2be..a7aa6c5b 100644 --- a/jero-web/src/components/dict/JDictSelectTag.vue +++ b/jero-web/src/components/dict/JDictSelectTag.vue @@ -48,14 +48,11 @@ } }, created() { - // console.log(this.dictCode); if(!this.type || this.type==="list"){ this.tagType = "select" }else{ this.tagType = this.type } - //获取字典数据 - // this.initDictData(); }, computed: { getValueSting(){ @@ -76,7 +73,6 @@ //根据字典Code, 初始化字典数组 ajaxGetDictItems(this.dictCode, null).then((res) => { if (res.success) { -// console.log(res.result); this.dictOptions = res.result; } }) @@ -90,6 +86,8 @@ } console.log(val); this.$emit('change', val); + //解决数据规则,选择自定义SQL 规则值无法输入空格 + this.$emit('input', val); }, setCurrentDictOptions(dictOptions){ this.dictOptions = dictOptions diff --git a/jero-web/src/components/jerobiz/JSelectDepart.vue b/jero-web/src/components/jerobiz/JSelectDepart.vue index 67e16f41..19b6f1a4 100644 --- a/jero-web/src/components/jerobiz/JSelectDepart.vue +++ b/jero-web/src/components/jerobiz/JSelectDepart.vue @@ -115,9 +115,8 @@ export default { this.textVals = textVals }, //返回选中的部门信息 - backDeparInfo(){ + backDepartInfo(){ if(this.backDepart===true){ - if(this.storeVals && this.storeVals.length>0){ let arr1 = this.storeVals.split(',') let arr2 = this.textVals.split(',') @@ -150,7 +149,7 @@ export default { this.textVals = arr2.join(',') } this.$emit("change", this.storeVals) - this.backDeparInfo() + this.backDepartInfo() }, getDepartNames(){ return this.departNames diff --git a/jero-web/src/views/system/modules/UserModal.vue b/jero-web/src/views/system/modules/UserModal.vue index 9b635d3a..d79d5be6 100644 --- a/jero-web/src/views/system/modules/UserModal.vue +++ b/jero-web/src/views/system/modules/UserModal.vue @@ -84,6 +84,7 @@ :disabled="disableSubmit" v-model="model.departIds" :options="nextDepartOptions" + @change="nextDepartChange" placeholder="请选择负责部门"> @@ -228,7 +229,6 @@ import { JSEncrypt } from 'jsencrypt' that.getUserRoles(record.id); that.getUserDeparts(record.id); } - console.log('that.model=',that.model) }, isDisabledAuth(code){ return disabledAuthFilter(code); @@ -259,7 +259,6 @@ import { JSEncrypt } from 'jsencrypt' let c = {label:item.name, value: item.id+""} return c; }) - console.log('this.tenantsOptions: ',this.tenantsOptions) } }) }, @@ -271,7 +270,6 @@ import { JSEncrypt } from 'jsencrypt' let c = {label:item.roleName, value:item.id} return c; }) - console.log('this.rolesOptions: ',this.rolesOptions) } }); }, @@ -279,7 +277,6 @@ import { JSEncrypt } from 'jsencrypt' queryUserRole({userid:userid}).then((res)=>{ if(res.success){ this.model.selectedroles = res.result.join(","); - console.log('that.model.selectedroles=',this.model.selectedroles) } }); }, @@ -299,12 +296,10 @@ import { JSEncrypt } from 'jsencrypt' } that.model.selecteddeparts = selectDepartKeys.join(",") that.nextDepartOptions=departOptions; - console.log('that.nextDepartOptions=',that.nextDepartOptions) } }) }, backDepartInfo(info) { - debugger this.model.departIds = this.model.selecteddeparts; this.nextDepartOptions = info.map((item,index,arr)=>{ let c = {label:item.text, value: item.value+""} @@ -510,6 +505,10 @@ import { JSEncrypt } from 'jsencrypt' this.departIdShow=true; } }, + nextDepartChange(e){ + console.log("11", e) + console.log("22", this.model.departIds) + }, } }