diff --git a/vue/src/layout/component/Main.vue b/vue/src/layout/component/Main.vue index 09af7b9..9710b0e 100644 --- a/vue/src/layout/component/Main.vue +++ b/vue/src/layout/component/Main.vue @@ -22,7 +22,16 @@ width="100%" /> - + +
+ +
+
@@ -97,5 +106,15 @@ export default { } } } + + .back-to-top { + height: 100%; + width: 100%; + background-color: #f2f5f6; + box-shadow: 0 0 6px rgba(0, 0, 0, .12); + text-align: center; + line-height: 40px; + color: #1989fa; + } } diff --git a/vue/src/mixin/docDetailMixin.js b/vue/src/mixin/docDetailMixin.js index ee0eb09..8891235 100644 --- a/vue/src/mixin/docDetailMixin.js +++ b/vue/src/mixin/docDetailMixin.js @@ -2,7 +2,7 @@ import {commonMethods} from "@/mixin/docTableMixin" import AbstractForm from '@/component/AbstractForm' import AbstractFormItem from "@/component/AbstractForm/item" import AbstractTable from "@/component/AbstractTable" -import DetailForm from "@/component/AbstractForm/DetailForm" +import DetailPage from "@/view/app/common/DetailPage" import DocHistory from '@/component/biz/doc/DocHistory' import DocSteps from '@/component/biz/doc/DocSteps' import FormCard from '@/component/AbstractForm/FormCard' @@ -18,7 +18,7 @@ export default { AbstractForm, AbstractFormItem, AbstractTable, - DetailForm, + DetailPage, DocHistory, DocSteps, FormCard, diff --git a/vue/src/component/AbstractForm/DetailForm.scss b/vue/src/view/app/common/DetailPage/index.scss similarity index 100% rename from vue/src/component/AbstractForm/DetailForm.scss rename to vue/src/view/app/common/DetailPage/index.scss diff --git a/vue/src/component/AbstractForm/DetailForm.vue b/vue/src/view/app/common/DetailPage/index.vue similarity index 96% rename from vue/src/component/AbstractForm/DetailForm.vue rename to vue/src/view/app/common/DetailPage/index.vue index c315e77..7630908 100644 --- a/vue/src/component/AbstractForm/DetailForm.vue +++ b/vue/src/view/app/common/DetailPage/index.vue @@ -1,4 +1,4 @@ - - + diff --git a/vue/src/view/message/manage/indexPage.vue b/vue/src/view/message/manage/indexPage.vue index 30980a0..2366320 100644 --- a/vue/src/view/message/manage/indexPage.vue +++ b/vue/src/view/message/manage/indexPage.vue @@ -20,7 +20,7 @@ - 查 询 + 查 询 添 加 查 看 编 辑 diff --git a/vue/src/view/purchase/inbound/component/OrderSelector.vue b/vue/src/view/purchase/inbound/component/OrderSelector.vue index 2704562..19d3799 100644 --- a/vue/src/view/purchase/inbound/component/OrderSelector.vue +++ b/vue/src/view/purchase/inbound/component/OrderSelector.vue @@ -11,7 +11,7 @@ > - 查 询 + 查 询 取 消 diff --git a/vue/src/view/purchase/inbound/detailPage.vue b/vue/src/view/purchase/inbound/detailPage.vue index e448968..e4b1f2c 100644 --- a/vue/src/view/purchase/inbound/detailPage.vue +++ b/vue/src/view/purchase/inbound/detailPage.vue @@ -1,5 +1,5 @@