修改禅道已知bug
This commit is contained in:
@@ -23,7 +23,8 @@
|
|||||||
<a-form :form="form">
|
<a-form :form="form">
|
||||||
<!-- v-if="!disabled"-->
|
<!-- v-if="!disabled"-->
|
||||||
<a-form-item :label="$t('userAccount')" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
<a-form-item :label="$t('userAccount')" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||||
<a-input :placeholder="$t('enterUserAccount')" v-decorator.trim="[ 'username', validatorRules.username]" :disabled='isdisabled'
|
<a-input :placeholder="$t('enterUserAccount')" v-decorator.trim="[ 'username', validatorRules.username]"
|
||||||
|
:disabled='isdisabled'
|
||||||
:readOnly="!!model.id"/>
|
:readOnly="!!model.id"/>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
<!-- v-if="!model.id && !disabled"-->
|
<!-- v-if="!model.id && !disabled"-->
|
||||||
@@ -40,10 +41,12 @@
|
|||||||
</template>
|
</template>
|
||||||
<!-- v-if="!disabled"-->
|
<!-- v-if="!disabled"-->
|
||||||
<a-form-item :label="$t('userName')" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
<a-form-item :label="$t('userName')" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||||
<a-input :placeholder="$t('enterUserName')" :disabled='isdisabled' v-decorator.trim="[ 'realname', validatorRules.realname]"/>
|
<a-input :placeholder="$t('enterUserName')" :disabled='isdisabled'
|
||||||
|
v-decorator.trim="[ 'realname', validatorRules.realname]"/>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
<a-form-item :label="$t('position')" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
<a-form-item :label="$t('position')" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||||
<a-input type="textarea" style='height: 100px' :placeholder="$t('pleaseEnter')+$t('position')" :disabled='isdisabled' v-decorator.trim="[ 'jobTitle', validatorRules.jobTitle]"/>
|
<a-input type="textarea" style='height: 100px' :placeholder="$t('pleaseEnter')+$t('position')"
|
||||||
|
:disabled='isdisabled' v-decorator.trim="[ 'jobTitle', validatorRules.jobTitle]"/>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
|
|
||||||
<!--<a-form-item label="工号" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
|
<!--<a-form-item label="工号" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
|
||||||
@@ -63,7 +66,7 @@
|
|||||||
:placeholder="$t('selectUserRole')"
|
:placeholder="$t('selectUserRole')"
|
||||||
optionFilterProp="children"
|
optionFilterProp="children"
|
||||||
v-model="selectedRole"
|
v-model="selectedRole"
|
||||||
:disabled='isdisabled'
|
:disabled='false'
|
||||||
:getPopupContainer="(target) => target.parentNode">
|
:getPopupContainer="(target) => target.parentNode">
|
||||||
<a-select-option v-for="(role,roleindex) in roleList" :key="roleindex.toString()" :value="role.id">
|
<a-select-option v-for="(role,roleindex) in roleList" :key="roleindex.toString()" :value="role.id">
|
||||||
{{ role.roleName }}
|
{{ role.roleName }}
|
||||||
@@ -151,7 +154,8 @@
|
|||||||
<!-- </a-form-item>-->
|
<!-- </a-form-item>-->
|
||||||
<!-- v-if="!disabled"-->
|
<!-- v-if="!disabled"-->
|
||||||
<a-form-item :label="$t('mailbox')" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
<a-form-item :label="$t('mailbox')" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||||
<a-input :placeholder="$t('enterEmailAddress')" v-decorator="[ 'email', validatorRules.email]" :disabled='isdisabled'/>
|
<a-input :placeholder="$t('enterEmailAddress')" v-decorator="[ 'email', validatorRules.email]"
|
||||||
|
:disabled='isdisabled'/>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
<!-- v-if="!disabled"-->
|
<!-- v-if="!disabled"-->
|
||||||
<!-- :disabled="isDisabledAuth('user:form:phone')"-->
|
<!-- :disabled="isDisabledAuth('user:form:phone')"-->
|
||||||
@@ -177,7 +181,7 @@
|
|||||||
<!-- :cancelText="$t('cancel')">-->
|
<!-- :cancelText="$t('cancel')">-->
|
||||||
<a-button style="margin-right: .8rem" @click="handleSubmit">{{$t('cancel')}}</a-button>
|
<a-button style="margin-right: .8rem" @click="handleSubmit">{{$t('cancel')}}</a-button>
|
||||||
<!-- </a-popconfirm>-->
|
<!-- </a-popconfirm>-->
|
||||||
<!-- <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>-->
|
<a-button @click="handleSubmitOk" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
|
||||||
</div>
|
</div>
|
||||||
</a-drawer>
|
</a-drawer>
|
||||||
</template>
|
</template>
|
||||||
@@ -189,7 +193,7 @@
|
|||||||
// 引入搜索部门弹出框的组件
|
// 引入搜索部门弹出框的组件
|
||||||
import departWindow from './DepartWindow'
|
import departWindow from './DepartWindow'
|
||||||
import { ACCESS_TOKEN } from '@/store/mutation-types'
|
import { ACCESS_TOKEN } from '@/store/mutation-types'
|
||||||
import { getAction } from '@/api/manage'
|
import { getAction, postAction } from '@/api/manage'
|
||||||
import { addUser, editUser, queryUserRole, queryall } from '@/api/api'
|
import { addUser, editUser, queryUserRole, queryall } from '@/api/api'
|
||||||
import { disabledAuthFilter } from '@/utils/authFilter'
|
import { disabledAuthFilter } from '@/utils/authFilter'
|
||||||
import { duplicateCheck } from '@/api/api'
|
import { duplicateCheck } from '@/api/api'
|
||||||
@@ -347,6 +351,25 @@
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
handleSubmitOk() {
|
||||||
|
this.confirmLoading = true
|
||||||
|
let selectedRole = JSON.parse(JSON.stringify(this.selectedRole))
|
||||||
|
let param = {
|
||||||
|
ids: this.userId,
|
||||||
|
selectedroles: selectedRole.join(',')
|
||||||
|
}
|
||||||
|
postAction('/sys/user/setRole', param).then((res) => {
|
||||||
|
if (res.success) {
|
||||||
|
this.$emit('ok')
|
||||||
|
this.confirmLoading = false
|
||||||
|
this.visible = false
|
||||||
|
this.$message.success(res.message)
|
||||||
|
} else {
|
||||||
|
this.confirmLoading = false
|
||||||
|
this.$message.warning(res.message)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
refresh() {
|
refresh() {
|
||||||
this.selectedDepartKeys = []
|
this.selectedDepartKeys = []
|
||||||
this.checkedDepartKeys = []
|
this.checkedDepartKeys = []
|
||||||
|
|||||||
Reference in New Issue
Block a user