From fd8611c9c74b939b77975b8d6790bf4b2ba8e9fa Mon Sep 17 00:00:00 2001
From: jiyufei <67400194@qq.com>
Date: Mon, 29 Jul 2024 13:12:20 +0800
Subject: [PATCH 1/7] =?UTF-8?q?feat(front):=E5=89=8D=E7=AB=AF=E6=A0=B7?=
=?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../jnpf-web/src/assets/scss/common.scss | 22 +++++++++++++++++++
.../jnpf-web/src/views/scm/area/index.vue | 1 +
.../src/views/scm/billtable/index.vue | 1 +
.../jnpf-web/src/views/scm/contract/index.vue | 2 +-
.../scm/decorationapplicationform/index.vue | 1 +
.../views/scm/enterprisemerchants/index.vue | 1 +
.../src/views/scm/equipment/index.vue | 1 +
.../scm/equipmentinspectionrecords/index.vue | 1 +
.../scm/equipmentmaintenancerecords/index.vue | 1 +
.../scm/equipmentrentalrecords/index.vue | 1 +
.../scm/equipmentrepairrecords/index.vue | 1 +
.../jnpf-web/src/views/scm/park/index.vue | 1 +
.../src/views/scm/parkequipment/index.vue | 1 +
.../jnpf-web/src/views/scm/person/index.vue | 1 +
.../jnpf-web/src/views/scm/space/index.vue | 1 +
.../jnpf-web/src/views/scm/vehicle/index.vue | 1 +
.../scm/venuereservationrecord/index.vue | 1 +
17 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/jnpf-java-boot/jnpf-web/src/assets/scss/common.scss b/jnpf-java-boot/jnpf-web/src/assets/scss/common.scss
index e56ea1b..d84c23f 100644
--- a/jnpf-java-boot/jnpf-web/src/assets/scss/common.scss
+++ b/jnpf-java-boot/jnpf-web/src/assets/scss/common.scss
@@ -1,5 +1,27 @@
@import "./font.scss";
+
+.el-table__body-wrapper {
+ z-index: 2;
+}
+
+.el-table__fixed-footer-wrapper tbody td.custom-cell {
+ border-right: 1px solid #dbdfe5 !important;
+}
+
+.el-table {
+ .el-table__fixed {
+ height: auto !important;
+ bottom: 0px !important;
+ }
+}
+
+//去掉固定列下方的横线
+.el-table__fixed::before,
+.el-table__fixed-right::before {
+ display: none;
+}
+
.JNPF-common-head {
display: flex;
justify-content: space-between;
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/area/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/area/index.vue
index cd8eac3..55a3809 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/area/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/area/index.vue
@@ -239,6 +239,7 @@ import SuperQuery from "@/components/SuperQuery";
import superQueryJson from "./superQueryJson";
export default {
+ name:"regionalManage",
components: {
JNPFForm,
Detail,
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/billtable/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/billtable/index.vue
index 6630c4f..77b3fca 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/billtable/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/billtable/index.vue
@@ -161,6 +161,7 @@ import superQueryJson from './superQueryJson'
import Entry from './entry.vue';
export default {
+ name:"billGenerate",
components: {
JNPFForm,
Entry,
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/contract/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/contract/index.vue
index 100937e..00083f4 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/contract/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/contract/index.vue
@@ -167,7 +167,6 @@
:onEndSubmit="handleEndSubmit" />
-
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/equipmentinspectionrecords/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/equipmentinspectionrecords/form.vue
index 9870d58..d2ff8d7 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/equipmentinspectionrecords/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/equipmentinspectionrecords/form.vue
@@ -76,18 +76,18 @@
@select="addForSelect" @close="selectDialogVisible=false" />