Merge branch 'master' of http://139.196.39.194:9021/chenc/cd-work-flow-web

src/views/activiti/todoManage.vue

@@ -448,6 +448,7 @@ export default {
       this.form.procInstId = v.procInstId
       this.form.priority = v.priority
       this.form.type = 0
+      this.form.comment = "审批通过";
       this.modalTaskVisible = true
       this.userLoading = true
       this.getAction(this.url.getNextNode, { procDefId: v.procDefId, currActId: v.key, procInstId: v.procInstId }).then(

src/views/system/modules/PasswordModal.vue

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