diff --git a/src/components/apass-dialog.vue b/src/components/apass-dialog.vue index 53e7d8c6b71b47681305c18efa6b2fd887867d24..b13839088e2ea197378174b720b375646f7ca763 100644 --- a/src/components/apass-dialog.vue +++ b/src/components/apass-dialog.vue @@ -9,12 +9,27 @@

-
+ +
-
+

+ +
+
+ + 取消 + + + 确定 + +
@@ -31,6 +46,10 @@ export default { type: String, default: () => "", }, + msg: { + type: String, + default: () => "", + }, }, data: () => ({ showDialog: false, @@ -42,6 +61,10 @@ export default { hide() { this.showDialog = false; }, + dialogSubmit() { + this.$emit("submit"); + this.hide(); + }, }, }; @@ -64,6 +87,12 @@ export default { font-weight: bold; color: #1d1e20; } +.dialog_msg { + font-size: 18px; + line-height: 34px; + color: #58617a; + margin: 30px 0 10px; +} diff --git a/src/components/dialog-remove.vue b/src/components/dialog-remove.vue index bf05ea5508b1583bb8ba42db1967a510f4f7cbb8..2cd1ecdd946c7de64d932d795e0c1eb22c59d316 100644 --- a/src/components/dialog-remove.vue +++ b/src/components/dialog-remove.vue @@ -4,6 +4,7 @@ :visible.sync="show" width="400px" top="25vh" + class="dialog_action" :class="this.confirmModalOptions.className ? this.confirmModalOptions.className : 'user-dialog'" > @@ -109,7 +110,7 @@ export default { }; \ No newline at end of file diff --git a/src/pages/authority/organization.vue b/src/pages/authority/organization.vue index 03092c6318c9b230d3bd19baaa460fee06e44c38..cc2d49621b1faeca3f8fc80da772051aa781bd5d 100644 --- a/src/pages/authority/organization.vue +++ b/src/pages/authority/organization.vue @@ -30,16 +30,12 @@ > - -

确认删除该组织吗?

- +
@@ -170,17 +166,10 @@ export default { console.log(value); }, deleteAction(item) { - this.dialogShow(); - }, - dialogShow() { this.$refs.dialog.show(); }, - dialogHide() { - this.$refs.dialog.hide(); - }, dialogSubmit() { console.log("dialog submit"); - this.dialogHide(); }, }, }; diff --git a/src/pages/authority/users.vue b/src/pages/authority/users.vue index c9589448a5efbfa99890d71b33c6f51b1b9af6ae..90691f61179fe4baaede8c44ddf07b96b53b06b7 100644 --- a/src/pages/authority/users.vue +++ b/src/pages/authority/users.vue @@ -76,7 +76,12 @@ - + -
@@ -189,7 +186,7 @@ export default { }, setRole(item) { console.log("setRole " + item.name); - this.dialogShow(); + this.$refs.dialog.show(); }, setState(item) { console.log("setState " + item.name); @@ -197,15 +194,8 @@ export default { dialogSelectionChange(values) { console.log(values); }, - dialogShow() { - this.$refs.dialog.show(); - }, - dialogHide() { - this.$refs.dialog.hide(); - }, dialogSubmit() { console.log("dialog submit"); - this.dialogHide(); }, }, };