diff --git a/src/views/system/component/Account.vue b/src/views/system/component/Account.vue index 41dce98..2d0842a 100644 --- a/src/views/system/component/Account.vue +++ b/src/views/system/component/Account.vue @@ -39,6 +39,18 @@ required: true, message: '请输入密码', trigger: 'blur', + },{ + validator: (rule, value, callback) => { + let exg = /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[~!@#$%^&*])[\da-zA-Z~!@#$%^&*]{8,}$/ + if (value === '') { + callback(new Error('请输入密码')); + } else if (!exg.test(value)) { + callback(new Error('需8位以上并且包含字母、数字和特殊符号')); + } else { + callback(); + } + }, + trigger: 'blur' }] }, } diff --git a/src/views/system/workerComponents/department.vue b/src/views/system/workerComponents/department.vue index 22e29f4..10cdbe9 100644 --- a/src/views/system/workerComponents/department.vue +++ b/src/views/system/workerComponents/department.vue @@ -7,7 +7,7 @@ -
+
@@ -161,4 +161,8 @@ export default { ::v-deep .el-progress__text { word-break: keep-all; } +::v-deep .el-card__body { + width: 100%; + height: calc(100% - 58px); +} diff --git a/src/views/system/workerComponents/toDo.vue b/src/views/system/workerComponents/toDo.vue index 4142ada..4314c79 100644 --- a/src/views/system/workerComponents/toDo.vue +++ b/src/views/system/workerComponents/toDo.vue @@ -7,7 +7,7 @@
-
+
{ - return h( - "Button", - { - props: { - type: "primary", - size: "small", - ghost: true, + return h('div',[ + h( + "Button", + { + props: { + type: "primary", + size: "small", + ghost: true, + }, + on: { + ["click"]: (_) => { + if(row.from_type === 'contract') { + this.$router.push({ + path: '/contract/contract/contractList', + query: { + keyword:/\[(.*?)\]/.exec(row.title) ? /\[(.*?)\]/.exec(row.title)[1] : '' + } + }) + } else { + window.open( + `${process.env.VUE_APP_OUT_OLD}/flow/view/${row.id}?auth_token=${this.$store.getters.oa_token}`, + "edit", + `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0` + ); + } + }, + }, }, - on: { - ["click"]: (_) => { - if(row.from_type === 'contract') { - this.$router.push({ - path: '/contract/contract/contractList', - query: { - keyword:/\[(.*?)\]/.exec(row.title) ? /\[(.*?)\]/.exec(row.title)[1] : '' - } - }) - } else { - window.open( - `${process.env.VUE_APP_OUT_OLD}/flow/view/${row.id}?auth_token=${this.$store.getters.oa_token}`, - "edit", - `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0` - ); - } + "查看" + ), + h( + "Button", + { + props: { + type: "primary", + size: "small", + ghost: true, + }, + style: { + "margin-left": "6px" + }, + on: { + ["click"]: (_) => { + if(row.from_type === 'contract') { + this.$router.push({ + path: '/contract/contract/contractList', + query: { + keyword:/\[(.*?)\]/.exec(row.title) ? /\[(.*?)\]/.exec(row.title)[1] : '' + } + }) + } else { + window.open( + `${process.env.VUE_APP_OUT_OLD}/flow/deal/${row.id}?auth_token=${this.$store.getters.oa_token}`, + "edit", + `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0` + ); + } + }, }, }, - }, - "查看" - ); + "办理" + ) + ]); }, }, // { @@ -211,4 +245,9 @@ export default { }; - + diff --git a/src/views/system/workerComponents/type.vue b/src/views/system/workerComponents/type.vue index ec0afa9..f501315 100644 --- a/src/views/system/workerComponents/type.vue +++ b/src/views/system/workerComponents/type.vue @@ -7,7 +7,7 @@ -
+
@@ -278,4 +278,9 @@ export default { }; - +