diff --git a/src/components/autocomplete/index.vue b/src/components/autocomplete/index.vue index ba3e6d6..406bead 100644 --- a/src/components/autocomplete/index.vue +++ b/src/components/autocomplete/index.vue @@ -75,7 +75,14 @@ export default { if (type === 'Array') { return item => { return this.config.labelKey.reduce((prev, cur) => { - prev += /^[^0-9a-zA-Z]/.test(cur) ? cur : item[cur] + let type = this.$utils.typeJudgment(cur) + let _function = + type != 'Function' + ? item => { + return /^[^0-9a-zA-Z]/.test(cur) ? cur : item[cur] + } + : cur + prev += _function(item) return prev }, '') } diff --git a/src/views/oilFinalStatement/oilFinalStatementAddList.vue b/src/views/oilFinalStatement/oilFinalStatementAddList.vue index f6ae314..f8a2b1d 100644 --- a/src/views/oilFinalStatement/oilFinalStatementAddList.vue +++ b/src/views/oilFinalStatement/oilFinalStatementAddList.vue @@ -207,7 +207,7 @@
-
+
取消 确认提交
@@ -654,7 +654,7 @@ export default { /* flex: 1; */ display: flex; align-items: center; - justify-content: end; + justify-content: flex-end; font-size: 16px; } diff --git a/src/views/oilFinalStatement/oilFinalStatementListInfo.vue b/src/views/oilFinalStatement/oilFinalStatementListInfo.vue index e0c91d9..614f8cb 100644 --- a/src/views/oilFinalStatement/oilFinalStatementListInfo.vue +++ b/src/views/oilFinalStatement/oilFinalStatementListInfo.vue @@ -179,10 +179,8 @@