bug修改

src/components/company/SelectContacts.vue

@@ -82,6 +82,8 @@ export default {
     }
   },
   created() {
+    // this.initContacts = null
+    this.contactsList = []
     // 编辑 第一次不回显的问题
     this.getContactsList()
   },
@@ -117,7 +119,7 @@ export default {
      * 获取联系人数据
      */
     getContactsList() {
-      if (this.selectedCompany && this.selectedCompany.hasOwnProperty.call(this.selectedCompany, 'id')) {
+      if (this.selectedCompany && this.selectedCompany.id) {
         const params = {
           companyId: this.selectedCompany.id
         }
@@ -127,7 +129,7 @@ export default {
           return new Promise(resolve => {
             getContactsByCompanyNoLimit(params).then(res => {
               this.contactsList = res.result
-              if (this.initContacts && this.initContacts.hasOwnProperty.call(this.initContacts, 'id')) {
+              if (this.initContacts && this.initContacts.id) {
                 this.contactsList.push(this.initContacts)
               }
               resolve()
@@ -137,7 +139,8 @@ export default {
           return new Promise(resolve => {
             getContactsByCompany(params).then(res => {
               this.contactsList = res.result
-              if (this.initContacts && this.initContacts.hasOwnProperty.call(this.initContacts, 'id')) {
+              console.log(this.initContacts)
+              if (this.initContacts && this.initContacts.id) {
                 this.contactsList.push(this.initContacts)
               }
               resolve()
@@ -179,8 +182,11 @@ export default {
           option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
     },
+    /**
+     * 第一次展开下拉，去掉和初始联系人一样的联系人
+     */
     handleDropdownOpen() {
-      if (this.isFirstOpen && this.initContacts && this.initContacts.hasOwnProperty.call(this.initContacts, 'id')) {
+      if (this.isFirstOpen && this.initContacts && this.initContacts.id) {
         this.contactsList.forEach((item, index) => {
           if (item.id === this.initContacts.id) {
             this.$emit('change', undefined)

src/components/tools/UserPassword.vue

@@ -57,6 +57,7 @@
 import { putAction } from '@/api/manage'
 import { getRSAPublicKey } from '@api/login'
 import { JSEncrypt } from 'jsencrypt'
+import { passwordReg } from '../../utils/validate'
 
 export default {
   name: 'UserPassword',
@@ -85,14 +86,19 @@ export default {
           validateTrigger: 'blur'
         },
         confirmpassword: {
-          rules: [
-            { required: true, message: '请确认新密码!' },
-            {
-              pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,30}$/,
-              message: '密码由8位及以上数字、大小写字母和特殊符号组成！'
-            },
-            { validator: this.handlePasswordCheck }
-          ],
+          rules: [{
+            required: true, message: '请确认新密码',
+          }, {
+            validator: this.handlePasswordCheck,
+          }],
+          // rules: [
+          //   { required: true, message: '请确认新密码!' },
+          //   {
+          //     pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,30}$/,
+          //     message: '密码由8位及以上数字、大小写字母和特殊符号组成！'
+          //   },
+          //   { validator: this.handlePasswordCheck }
+          // ],
           validateTrigger: 'blur'
         }
       },
@@ -179,6 +185,9 @@ export default {
       if (value && password && value.trim() !== password.trim()) {
         callback(new Error('两次密码不一致'))
       }
+      if (value && !passwordReg(value)) {
+        callback('密码由8位及以上数字、大小写字母和特殊符号组成！')
+      }
       callback()
     },
     compareToFirstPassword(rule, value, callback) {