diff --git a/fuintAdmin/src/views/power/page/mode.vue b/fuintAdmin/src/views/power/page/mode.vue index ed5479c39..cce89427d 100644 --- a/fuintAdmin/src/views/power/page/mode.vue +++ b/fuintAdmin/src/views/power/page/mode.vue @@ -115,7 +115,7 @@ - + @@ -216,8 +216,8 @@ export default { templateContent:[ { required: true, message: '不能为空', trigger: 'blur' }, ], - recipientRoles:[ - { required: true, message: '不能为空', trigger: 'blur' }, + region: [ + { required: true, message: '不能为空', trigger: 'change' } ], conditions:[ { required: true, message: '不能为空', trigger: 'blur' }, @@ -286,7 +286,11 @@ export default { this.$refs[formName].validate((valid) =>{ this.form.recipientRoles = this.form.recipientRoles.toString() - this.form.conditions = JSON.stringify(this.form.conditions) + console.log(this.form.conditions[0].field,'123456') + if(this.form.conditions[0].field){ + this.form.conditions = JSON.stringify(this.form.conditions) + } + if (valid) { // 表单验证通过,可以提交数据 this.open = false @@ -481,14 +485,14 @@ export default { margin-bottom: 0px; border-radius: 8px; box-sizing: border-box; - padding: 15px; + padding: 10px; } .cards-change{ //height: 81vh; } .table_box{ - height: 73vh; + height: 74.5vh; overflow: auto; scrollbar-width: none; } diff --git a/fuintAdmin/src/views/power/page/record.vue b/fuintAdmin/src/views/power/page/record.vue index 35b54b80b..2d637369a 100644 --- a/fuintAdmin/src/views/power/page/record.vue +++ b/fuintAdmin/src/views/power/page/record.vue @@ -554,14 +554,14 @@ export default { margin-bottom: 0px; border-radius: 8px; box-sizing: border-box; - padding: 15px; + padding: 10px; } .cards-change{ //height: 81vh; } .table_box{ - height: 73vh; + height: 74.5vh; overflow: auto; scrollbar-width: none; } diff --git a/fuintAdmin/src/views/power/receiptPrint.vue b/fuintAdmin/src/views/power/receiptPrint.vue index 46deafa25..12c7313d1 100644 --- a/fuintAdmin/src/views/power/receiptPrint.vue +++ b/fuintAdmin/src/views/power/receiptPrint.vue @@ -1,6 +1,6 @@