QuKatie пре 3 година
родитељ
комит
42385fe030

+ 18 - 2
src/page/index/tags.vue

@@ -74,6 +74,16 @@
         </el-tooltip>
         <el-tooltip
           effect="dark"
+          :content="$t('navbar.notice')"
+          placement="bottom"
+          style="margin-right:12px"
+        >
+          <div class="top-bar__item--show">
+            <top-notice></top-notice>
+          </div>
+        </el-tooltip>
+        <el-tooltip
+          effect="dark"
           :content="$t('navbar.language')"
           placement="bottom"
         >
@@ -123,7 +133,11 @@
         </el-dropdown>
         <el-dropdown>
           <span class="el-dropdown-link">
-             <img class="top-bar__img" :src="userInfo.avatar"  style="margin-left:8px"/>
+            <img
+              class="top-bar__img"
+              :src="userInfo.avatar"
+              style="margin-left:8px"
+            />
             <i class="el-icon-arrow-down el-icon--right"></i>
           </span>
           <el-dropdown-menu slot="dropdown">
@@ -154,13 +168,15 @@ import topLock from "./top/top-lock";
 import topTheme from "./top/top-theme";
 import topLogs from "./top/top-logs";
 import topLang from "./top/top-lang";
+import topNotice from "./top/top-notice";
 export default {
   components: {
     topColor,
     topLogs,
     topLock,
     topTheme,
-    topLang
+    topLang,
+    topNotice
   },
   name: "tags",
   data() {

+ 1 - 1
src/styles/tags.scss

@@ -44,7 +44,7 @@
     &__box {
         position: relative;
         box-sizing: border-box;
-        padding-right: 300px;
+        padding-right: 320px;
         width: 100%;
         &--close {
             .el-tabs__item {

+ 2 - 2
src/views/exportTrade/invoice/index.vue

@@ -262,7 +262,7 @@ export default {
           this.dataList = res.data.data.records ? res.data.data.records : [];
           this.page.total = res.data.data.total;
           if (this.page.total) {
-            this.option.height = window.innerHeight - 500;
+            this.option.height = window.innerHeight - 440;
           }
         })
         .finally(() => {
@@ -347,6 +347,6 @@ export default {
   display: flex;
 }
 .page-crad ::v-deep .basic-container__card {
-  height: 86.5vh;
+  height: 94.2vh;
 }
 </style>

+ 2 - 2
src/views/exportTrade/purchaseContract/index.vue

@@ -255,7 +255,7 @@ export default {
           this.dataList = res.data.data.records ? res.data.data.records : [];
           this.page.total = res.data.data.total;
           if (this.page.total) {
-            this.option.height = window.innerHeight - 450;
+            this.option.height = window.innerHeight - 390;
           }
         })
         .finally(() => {
@@ -300,6 +300,6 @@ export default {
   display: flex;
 }
 .page-crad ::v-deep .basic-container__card {
-  height: 86.5vh;
+  height: 94.2vh;
 }
 </style>

+ 2 - 2
src/views/exportTrade/purchaseInquiry/index.vue

@@ -248,7 +248,7 @@ export default {
           this.dataList = res.data.data.records ? res.data.data.records : [];
           this.page.total = res.data.data.total;
           if (this.page.total) {
-            this.option.height = window.innerHeight - 450;
+            this.option.height = window.innerHeight - 390;
           }
         })
         .finally(() => {
@@ -309,6 +309,6 @@ export default {
   display: flex;
 }
 .page-crad ::v-deep .basic-container__card {
-  height: 86.5vh;
+  height: 94.2vh;
 }
 </style>

+ 2 - 2
src/views/exportTrade/receipt/index.vue

@@ -246,7 +246,7 @@ export default {
           this.dataList = res.data.data.records ? res.data.data.records : [];
           this.page.total = res.data.data.total;
           if (this.page.total) {
-            this.option.height = window.innerHeight - 450;
+            this.option.height = window.innerHeight - 440;
           }
         })
         .finally(() => {
@@ -331,6 +331,6 @@ export default {
   display: flex;
 }
 .page-crad ::v-deep .basic-container__card {
-  height: 86.5vh;
+  height: 94.2vh;
 }
 </style>

+ 2 - 2
src/views/exportTrade/salesContract/index.vue

@@ -267,7 +267,7 @@ export default {
         this.dataList = res.data.data.records ? res.data.data.records : [];
         this.page.total = res.data.data.total;
         if (this.page.total) {
-          this.option.height = window.innerHeight - 500;
+          this.option.height = window.innerHeight - 440;
         }
       });
     },
@@ -389,6 +389,6 @@ export default {
   display: flex;
 }
 .page-crad ::v-deep .basic-container__card {
-  height: 86.5vh;
+  height: 94.2vh;
 }
 </style>

+ 2 - 4
src/views/exportTrade/shippingInquiry/index.vue

@@ -216,9 +216,7 @@ export default {
         this.dataList = res.data.data.records ? res.data.data.records : [];
         this.page.total = res.data.data.total;
         if (this.page.total) {
-          this.option.height = window.innerHeight - 380;
-        } else {
-          this.option.height = window.innerHeight - 305;
+          this.option.height = window.innerHeight - 340;
         }
       });
     },
@@ -249,6 +247,6 @@ export default {
   display: flex;
 }
 .page-crad ::v-deep .basic-container__card {
-  height: 86.5vh;
+  height: 94.2vh;
 }
 </style>

+ 3 - 42
src/views/maintenance/priceLibrary/detailsPage.vue

@@ -18,13 +18,14 @@
           @click="editCustomer"
           :loading="subLoading"
           v-if="detailData.status != 1"
+          size="small"
           >{{ form.id ? "确认修改" : "确认新增" }}
         </el-button>
       </div>
     </div>
-    <div style="margin-top: 60px;margin-bottom:35px">
+    <div class="customer-main">
       <containerTitle title="基础信息"></containerTitle>
-      <basic-container style="margin-bottom: 10px">
+      <basic-container>
         <avue-form ref="form" v-model="form" :option="option">
           <template slot="corpId">
             <select-component
@@ -389,46 +390,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.customer-head {
-  position: fixed;
-  top: 105px;
-  width: 100%;
-  margin-left: -10px;
-  height: 62px;
-  background: #ffffff;
-  box-shadow: 0 4px 12px 0px rgba(232, 232, 235, 1);
-  z-index: 999;
-}
-
-.customer-back {
-  cursor: pointer;
-  line-height: 62px;
-  font-size: 16px;
-  color: #323233;
-  font-weight: 400;
-}
-
-.back-icon {
-  line-height: 64px;
-  font-size: 20px;
-  margin-right: 8px;
-}
-.sell-customer-btn {
-  position: fixed;
-  right: 244px;
-  top: 115px;
-}
-.copy-customer-btn {
-  position: fixed;
-  right: 140px;
-  top: 115px;
-}
-
-.add-customer-btn {
-  position: fixed;
-  right: 36px;
-  top: 115px;
-}
 ::v-deep .el-form-item {
   margin-bottom: 8px;
 }

+ 2 - 2
src/views/maintenance/priceLibrary/index.vue

@@ -221,7 +221,7 @@ export default {
           this.dataList = res.data.data.records ? res.data.data.records : [];
           this.page.total = res.data.data.total;
           if (this.page.total) {
-            this.option.height = window.innerHeight - 450;
+            this.option.height = window.innerHeight - 300;
           }
         })
         .finally(() => {
@@ -303,6 +303,6 @@ export default {
   display: flex;
 }
 .page-crad ::v-deep .basic-container__card {
-  height: 86.5vh;
+  height: 94.2vh;
 }
 </style>