|
|
@@ -106,7 +106,7 @@
|
|
|
<a-form-item label="公司部门分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
|
|
|
<a-input-search
|
|
|
placeholder="点击右侧按钮选择公司和部门"
|
|
|
- v-decorator="['checkedDepartNameString', validatorRules.checkedDepartNameString]"
|
|
|
+ v-model="checkedDepartNameString"
|
|
|
disabled
|
|
|
@search="onSearch"
|
|
|
>
|
|
|
@@ -367,8 +367,9 @@ export default {
|
|
|
rules: [
|
|
|
{
|
|
|
required: true,
|
|
|
- pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
|
|
|
- message: '密码由8位数字、大小写字母和特殊符号组成!'
|
|
|
+ message: '请输入密码!'
|
|
|
+ // pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
|
|
|
+ // message: '密码由8位数字、大小写字母和特殊符号组成!'
|
|
|
},
|
|
|
{
|
|
|
validator: this.validateToNextPassword
|
|
|
@@ -633,9 +634,9 @@ export default {
|
|
|
},
|
|
|
moment,
|
|
|
handleSubmit () {
|
|
|
- // if(!this.orgObject.pkOrg){
|
|
|
- // this.$message.warning("请选择公司");
|
|
|
- // }
|
|
|
+ if(!this.orgObject.pkOrg){
|
|
|
+ this.$message.warning("请选择公司");
|
|
|
+ }
|
|
|
const that = this
|
|
|
// 触发表单验证
|
|
|
this.form.validateFields((err, values) => {
|
|
|
@@ -839,6 +840,7 @@ export default {
|
|
|
|
|
|
// 获取用户对应部门弹出框提交给返回的数据
|
|
|
modalFormOk (formData) {
|
|
|
+ debugger
|
|
|
this.orgObject = formData.orgObject // 公司信息
|
|
|
// 没有选择则直接退出
|
|
|
if (!formData.departIdList || formData.departIdList.length == 0) {
|
jbb