diff --git a/src/components/machine/printerRuleDiv.vue b/src/components/machine/printerRuleDiv.vue
index 1119dd648..5f0e878f2 100644
--- a/src/components/machine/printerRuleDiv.vue
+++ b/src/components/machine/printerRuleDiv.vue
@@ -1,13 +1,13 @@
-
+
{{ $t('common.add') }}
-
+
{{ $t('common.edit') }}
-
+
{{ $t('common.delete') }}
@@ -49,7 +49,7 @@ export default {
children: 'children',
label: 'ruleName'
},
- curRule:{},
+ curRule: {},
communityId: ''
}
},
@@ -76,6 +76,7 @@ export default {
},
handleNodeClick(data) {
this.curRule = data
+ this.$emit('switchRule', this.curRule)
},
openAddModal() {
this.$refs.addPrinterRule.open()
diff --git a/src/components/machine/printerRuleFees.vue b/src/components/machine/printerRuleFees.vue
index 28d171fa4..fd12900e8 100644
--- a/src/components/machine/printerRuleFees.vue
+++ b/src/components/machine/printerRuleFees.vue
@@ -41,7 +41,7 @@
layout="total, sizes, prev, pager, next, jumper" :total="pagination.total" />
-
+
@@ -58,12 +58,6 @@ export default {
AddPrinterRuleFee,
DeletePrinterRuleFee
},
- props: {
- ruleId: {
- type: String,
- required: true
- }
- },
data() {
return {
searchForm: {
@@ -83,10 +77,13 @@ export default {
},
created() {
this.searchForm.communityId = getCommunityId()
- this.searchForm.ruleId = this.ruleId
- this.getList()
+
},
methods: {
+ open(ruleId) {
+ this.searchForm.ruleId = ruleId
+ this.getList()
+ },
async getList() {
this.loading = true
try {
diff --git a/src/components/machine/printerRuleMachine.vue b/src/components/machine/printerRuleMachine.vue
index 43da0b6a7..e8b4993ed 100644
--- a/src/components/machine/printerRuleMachine.vue
+++ b/src/components/machine/printerRuleMachine.vue
@@ -84,11 +84,11 @@ export default {
},
created() {
this.searchForm.communityId = getCommunityId()
- this.getList()
},
methods: {
open(ruleId) {
this.searchForm.ruleId = ruleId
+ this.getList()
},
async getList() {
this.loading = true
diff --git a/src/components/machine/printerRuleRepair.vue b/src/components/machine/printerRuleRepair.vue
index 809ce6a45..117f79d1b 100644
--- a/src/components/machine/printerRuleRepair.vue
+++ b/src/components/machine/printerRuleRepair.vue
@@ -42,7 +42,7 @@
layout="total, sizes, prev, pager, next, jumper" :total="pagination.total" />
-
+
@@ -59,12 +59,6 @@ export default {
AddPrinterRuleRepair,
DeletePrinterRuleRepair
},
- props: {
- ruleId: {
- type: String,
- required: true
- }
- },
data() {
return {
searchForm: {
@@ -84,10 +78,13 @@ export default {
},
created() {
this.searchForm.communityId = getCommunityId()
- this.searchForm.ruleId = this.ruleId
- this.getList()
+
},
methods: {
+ open(ruleId) {
+ this.searchForm.ruleId = ruleId
+ this.getList()
+ },
async getList() {
this.loading = true
try {
diff --git a/src/i18n/commonLang.js b/src/i18n/commonLang.js
index 53abe63e6..cd3ac97a6 100644
--- a/src/i18n/commonLang.js
+++ b/src/i18n/commonLang.js
@@ -14,6 +14,7 @@ export const messages = {
back: 'Back',
warning: 'Warning',
deleteConfirm: 'Are you sure to delete this record?',
+ confirmDelete: 'confirm delete',
deleteSuccess: 'Delete successfully',
selectBtn: 'Select',
select: 'Select',
@@ -64,6 +65,7 @@ export const messages = {
back: '返回',
warning: '警告',
deleteConfirm: '确定要删除这条记录吗?',
+ confirmDelete: '确定删除',
deleteSuccess: '删除成功',
selectBtn: '选择',
select: '选择',
diff --git a/src/views/machine/printerRuleList.vue b/src/views/machine/printerRuleList.vue
index 15c6754fc..702c9532c 100644
--- a/src/views/machine/printerRuleList.vue
+++ b/src/views/machine/printerRuleList.vue
@@ -2,7 +2,7 @@