From 609f5eb1e43596d5fc82f426e461f3f3d5f29686 Mon Sep 17 00:00:00 2001
From: toesbieya <1647775459@qq.com>
Date: Mon, 31 Aug 2020 11:28:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8a=E6=A0=87=E7=AD=BE=E8=BF=9B?=
=?UTF-8?q?=E8=A1=8C=E8=AF=A6=E6=83=85=E9=A1=B5=E7=9A=84=E8=B7=B3=E8=BD=AC?=
=?UTF-8?q?=20=E7=A7=BB=E9=99=A4=E8=87=AA=E5=AE=9A=E4=B9=89=E7=9A=84table?=
=?UTF-8?q?=E3=80=81tree=E9=AB=98=E4=BA=AE=E8=83=8C=E6=99=AF=E8=89=B2=20?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=AE=80=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
vue/src/asset/style/element-ui.scss | 16 ----------------
vue/src/asset/style/index.scss | 4 ++++
vue/src/view/message/manage/indexPage.vue | 2 +-
vue/src/view/purchase/inbound/indexPage.vue | 14 +++++++++++---
.../order/component/SupplierSelector.vue | 2 +-
vue/src/view/purchase/order/indexPage.vue | 18 +++++++++++++-----
vue/src/view/sell/order/indexPage.vue | 16 ++++++++++++----
vue/src/view/sell/outbound/indexPage.vue | 14 +++++++++++---
vue/src/view/stock/current/DetailDialog.vue | 10 ----------
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 +-
14 files changed, 58 insertions(+), 48 deletions(-)
diff --git a/vue/src/asset/style/element-ui.scss b/vue/src/asset/style/element-ui.scss
index 5c50c16..e1c3446 100644
--- a/vue/src/asset/style/element-ui.scss
+++ b/vue/src/asset/style/element-ui.scss
@@ -171,15 +171,6 @@
thead > tr > th {
background: #fbfbfb;
}
-
- .el-table__body tr.current-row > td {
- background-color: $--color-primary;
- color: #fff;
-
- .el-table__expand-icon {
- color: #fff;
- }
- }
}
.el-textarea {
@@ -208,10 +199,3 @@
overflow-x: hidden;
}
}
-
-.el-tree {
- &.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
- background-color: $--color-primary;
- color: #fff;
- }
-}
diff --git a/vue/src/asset/style/index.scss b/vue/src/asset/style/index.scss
index d5b599d..2383d3f 100644
--- a/vue/src/asset/style/index.scss
+++ b/vue/src/asset/style/index.scss
@@ -194,4 +194,8 @@ a:hover {
}
}
+.el-table a {
+ color: $--color-primary;
+}
+
diff --git a/vue/src/view/message/manage/indexPage.vue b/vue/src/view/message/manage/indexPage.vue
index 1891b9a..be92466 100644
--- a/vue/src/view/message/manage/indexPage.vue
+++ b/vue/src/view/message/manage/indexPage.vue
@@ -41,7 +41,7 @@
{{ transformStatus(row.status) }}
-
+
{{ row.ptime | timestamp2Date }}
diff --git a/vue/src/view/purchase/inbound/indexPage.vue b/vue/src/view/purchase/inbound/indexPage.vue
index 9991dac..e0ea6f1 100644
--- a/vue/src/view/purchase/inbound/indexPage.vue
+++ b/vue/src/view/purchase/inbound/indexPage.vue
@@ -63,13 +63,21 @@
-
+
+
+ {{ row.id }}
+
+
-
+
{{ row.ctime | timestamp2Date }}
-
+
{{ row.vtime | timestamp2Date }}
diff --git a/vue/src/view/purchase/order/component/SupplierSelector.vue b/vue/src/view/purchase/order/component/SupplierSelector.vue
index 15e10b0..7052fe0 100644
--- a/vue/src/view/purchase/order/component/SupplierSelector.vue
+++ b/vue/src/view/purchase/order/component/SupplierSelector.vue
@@ -41,7 +41,7 @@
-
+
{{ row.ctime | timestamp2Date }}
diff --git a/vue/src/view/purchase/order/indexPage.vue b/vue/src/view/purchase/order/indexPage.vue
index a0f3b10..98fe7c4 100644
--- a/vue/src/view/purchase/order/indexPage.vue
+++ b/vue/src/view/purchase/order/indexPage.vue
@@ -81,14 +81,22 @@
-
+
+
+ {{ row.id }}
+
+
-
+
{{ row.ctime | timestamp2Date }}
-
-
+
+
{{ row.vtime | timestamp2Date }}
@@ -103,7 +111,7 @@
{{ getFinish(row.finish) }}
-
+
{{ row.ftime | timestamp2Date }}
diff --git a/vue/src/view/sell/order/indexPage.vue b/vue/src/view/sell/order/indexPage.vue
index 6a2161f..3456079 100644
--- a/vue/src/view/sell/order/indexPage.vue
+++ b/vue/src/view/sell/order/indexPage.vue
@@ -88,14 +88,22 @@
-
+
+
+ {{ row.id }}
+
+
-
+
{{ row.ctime | timestamp2Date }}
-
+
{{ row.vtime | timestamp2Date }}
@@ -110,7 +118,7 @@
{{ getFinish(row.finish) }}
-
+
{{ row.ftime | timestamp2Date }}
diff --git a/vue/src/view/sell/outbound/indexPage.vue b/vue/src/view/sell/outbound/indexPage.vue
index 395031c..ab8502e 100644
--- a/vue/src/view/sell/outbound/indexPage.vue
+++ b/vue/src/view/sell/outbound/indexPage.vue
@@ -70,13 +70,21 @@
-
+
+
+ {{ row.id }}
+
+
-
+
{{ row.ctime | timestamp2Date }}
-
+
{{ row.vtime | timestamp2Date }}
diff --git a/vue/src/view/stock/current/DetailDialog.vue b/vue/src/view/stock/current/DetailDialog.vue
index 645962f..f631273 100644
--- a/vue/src/view/stock/current/DetailDialog.vue
+++ b/vue/src/view/stock/current/DetailDialog.vue
@@ -123,13 +123,3 @@ export default {
}
}
-
-
diff --git a/vue/src/view/stock/current/indexPage.vue b/vue/src/view/stock/current/indexPage.vue
index d09ee60..ef803ee 100644
--- a/vue/src/view/stock/current/indexPage.vue
+++ b/vue/src/view/stock/current/indexPage.vue
@@ -49,7 +49,7 @@
>
- {{ row.cname }}
+ more(row)">{{ row.cname }}
diff --git a/vue/src/view/system/customer/indexPage.vue b/vue/src/view/system/customer/indexPage.vue
index 38ee3da..7bc98c3 100644
--- a/vue/src/view/system/customer/indexPage.vue
+++ b/vue/src/view/system/customer/indexPage.vue
@@ -55,7 +55,7 @@
-
+
{{ row.ctime | timestamp2Date }}
diff --git a/vue/src/view/system/role/indexPage.vue b/vue/src/view/system/role/indexPage.vue
index 2e9e975..07447d1 100644
--- a/vue/src/view/system/role/indexPage.vue
+++ b/vue/src/view/system/role/indexPage.vue
@@ -36,7 +36,7 @@
-
+
{{ row.ctime | timestamp2Date }}
diff --git a/vue/src/view/system/supplier/indexPage.vue b/vue/src/view/system/supplier/indexPage.vue
index 03a999a..49cd84d 100644
--- a/vue/src/view/system/supplier/indexPage.vue
+++ b/vue/src/view/system/supplier/indexPage.vue
@@ -55,7 +55,7 @@
-
+
{{ row.ctime | timestamp2Date }}
diff --git a/vue/src/view/system/user/indexPage.vue b/vue/src/view/system/user/indexPage.vue
index 8fa7abd..6a5a867 100644
--- a/vue/src/view/system/user/indexPage.vue
+++ b/vue/src/view/system/user/indexPage.vue
@@ -58,7 +58,7 @@
-
+
{{ row.ctime | timestamp2Date }}