Merge remote-tracking branch 'origin/master'

zhaowei

7 天以前 008245cbe95c63a80f9a255378a5ffbe25d15085

Merge remote-tracking branch 'origin/master'

 src/components/tools/UserPassword.vue

@@ -54,17 +54,17 @@
              required: true, message: '请输入旧密码!',
            }],
          },
          password:{
            rules: [{
              required: true, message: '请输入新密码!',trigger:'blur'
            }, {
              validator: this.validateToNextPassword,
            },
              {
                pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
                message: '密码由8位数字、大小写字母和特殊符号组成!',
              }],
          },
          // password:{
          //   rules: [{
          //     required: true, message: '请输入新密码!',trigger:'blur'
          //   }, {
          //     validator: this.validateToNextPassword,
          //   },
          //     {
          //       pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
          //       message: '密码由8位数字、大小写字母和特殊符号组成!',
          //     }],
          // },
          confirmpassword:{
            rules: [{
              required: true, message: '请确认新密码!',

 src/views/mdc/base/modules/EquipmentList/EquipmentModal.vue

@@ -155,8 +155,8 @@
        validatorRules:{
          username:[{required: true, message: '请输入用户账号!'},
            {validator: this.validateUsername,}],
          password: [{required: true,pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,message: '密码由8位数字、大小写字母和特殊符号组成!'},
            {validator: this.validateToNextPassword,trigger: 'change'}],
          // password: [{required: true,pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,message: '密码由8位数字、大小写字母和特殊符号组成!'},
          //   {validator: this.validateToNextPassword,trigger: 'change'}],
          confirmpassword: [{required: true, message: '请重新输入登录密码!',},
            { validator: this.compareToFirstPassword,}],
          realname:[{ required: true, message: '请输入用户名称!' }],

 src/views/mdc/base/modules/EquipmentList/PasswordModal.vue

@@ -40,15 +40,15 @@
        confirmLoading: false,
        confirmDirty: false,
        validatorRules:{
          password:{
            rules: [{
              required: true,
              pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
              message: '密码由8位数字、大小写字母和特殊符号组成!'
            }, {
              validator: this.validateToNextPassword,
            }],
          },
          // password:{
          //   rules: [{
          //     required: true,
          //     pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
          //     message: '密码由8位数字、大小写字母和特殊符号组成!'
          //   }, {
          //     validator: this.validateToNextPassword,
          //   }],
          // },
          confirmpassword:{
            rules: [{
              required: true, message: '请重新输入登录密码!',

 src/views/system/SysPositionList.vue

@@ -15,7 +15,7 @@
            <a-form-item label="岗位名称">
              <j-input placeholder="请输入岗位名称" v-model="queryParam.name"></j-input>
            </a-form-item>
          </a-col>
          </a-col
          <a-col :md="6" :sm="8">
            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
@@ -128,6 +128,11 @@
          align: 'center',
          dataIndex: 'name'
        },
        {
          title: '备注',
          align: 'center',
          dataIndex: 'remark'
        },
        // {
        //   title: '职级',
        //   align: 'center',

 src/views/system/modules/PasswordModal.vue

@@ -41,15 +41,15 @@
        confirmLoading: false,
        confirmDirty: false,
        validatorRules:{
          password:{
            rules: [{
              required: true,
              pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
              message: '密码由8位数字、大小写字母和特殊符号组成!'
            }, {
              validator: this.validateToNextPassword,
            }],
          },
          // password:{
          //   rules: [{
          //     required: true,
          //     pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
          //     message: '密码由8位数字、大小写字母和特殊符号组成!'
          //   }, {
          //     validator: this.validateToNextPassword,
          //   }],
          // },
          confirmpassword:{
            rules: [{
              required: true, message: '请重新输入登录密码!',

 src/views/system/modules/SysPositionModal.vue

@@ -26,6 +26,13 @@
          label="岗位名称">
          <a-input placeholder="请输入岗位名称" v-model="model.name" />
        </a-form-model-item>
        <a-form-model-item
          :labelCol="labelCol"
          :wrapperCol="wrapperCol"
          prop="remark"
          label="备注">
          <a-input placeholder="请输入备注" v-model="model.remark" />
        </a-form-model-item>
      </a-form-model>
    </a-spin>
  </a-modal>

 src/views/system/modules/UserModal.vue

@@ -147,12 +147,12 @@
        validatorRules: {
          username: [{ required: true, message: '请输入用户账号!' },
            { validator: this.validateUsername }],
          password: [{
            required: true,
            pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
            message: '密码由8位数字、大小写字母和特殊符号组成!'
          },
            { validator: this.validateToNextPassword, trigger: 'change' }],
          // password: [{
          //   required: true,
          //   pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
          //   message: '密码由8位数字、大小写字母和特殊符号组成!'
          // },
          //   { validator: this.validateToNextPassword, trigger: 'change' }],
          confirmpassword: [{ required: true, message: '请重新输入登录密码!' },
            { validator: this.compareToFirstPassword }],
          realname: [{ required: true, message: '请输入用户名称!' }],

 src/views/user/alteration/Step3.vue

@@ -40,9 +40,9 @@
        loading: false,
        accountName: this.userList.username,
        validatorRules: {
          password: [{
            required: true, pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,.\/]).{8,}$/, message: '密码由8位数字、大小写字母和特殊符号组成!!'
          }],
          // password: [{
          //   required: true, pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,.\/]).{8,}$/, message: '密码由8位数字、大小写字母和特殊符号组成!!'
          // }],
          confirmPassword: [
            { required: true, message: '密码不能为空!'},
            { validator: this.handlePasswordCheck}