From 64b538ab7084b3b5b72563e6c5aa2d9a9f4bbbfd Mon Sep 17 00:00:00 2001
From: toesbieya <1647775459@qq.com>
Date: Sun, 23 Aug 2020 11:32:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=8C=89=E9=92=AEtype?=
=?UTF-8?q?=E6=94=B9=E4=B8=BAprimary=20=E8=A1=A8=E5=8D=95=E8=AF=A6?=
=?UTF-8?q?=E6=83=85=E9=A1=B5=E6=94=B9=E4=B8=BA=E5=85=AC=E5=85=B1=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=20=E5=9B=9E=E5=88=B0=E9=A1=B6=E9=83=A8=E6=8C=89?=
=?UTF-8?q?=E9=92=AE=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
vue/src/layout/component/Main.vue | 21 ++++++++++++++++++-
vue/src/mixin/docDetailMixin.js | 4 ++--
.../app/common/DetailPage/index.scss} | 0
.../app/common/DetailPage/index.vue} | 6 +++---
vue/src/view/message/manage/indexPage.vue | 2 +-
.../inbound/component/OrderSelector.vue | 2 +-
vue/src/view/purchase/inbound/detailPage.vue | 4 ++--
vue/src/view/purchase/inbound/indexPage.vue | 2 +-
.../order/component/SupplierSelector.vue | 2 +-
vue/src/view/purchase/order/detailPage.vue | 4 ++--
vue/src/view/purchase/order/indexPage.vue | 2 +-
.../sell/order/component/CustomerSelector.vue | 2 +-
.../sell/order/component/StockSelector.vue | 2 +-
vue/src/view/sell/order/detailPage.vue | 4 ++--
vue/src/view/sell/order/indexPage.vue | 2 +-
.../sell/outbound/component/OrderSelector.vue | 2 +-
.../sell/outbound/component/StockSelector.vue | 2 +-
vue/src/view/sell/outbound/detailPage.vue | 4 ++--
vue/src/view/sell/outbound/indexPage.vue | 2 +-
vue/src/view/stock/current/indexPage.vue | 2 +-
vue/src/view/system/customer/indexPage.vue | 2 +-
vue/src/view/system/role/indexPage.vue | 2 +-
vue/src/view/system/supplier/indexPage.vue | 2 +-
vue/src/view/system/user/indexPage.vue | 2 +-
24 files changed, 49 insertions(+), 30 deletions(-)
rename vue/src/{component/AbstractForm/DetailForm.scss => view/app/common/DetailPage/index.scss} (100%)
rename vue/src/{component/AbstractForm/DetailForm.vue => view/app/common/DetailPage/index.vue} (96%)
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 @@
-
-
+