Browse Source

调整样式添加字段

QuKatie 3 years ago
parent
commit
3cdba1f4fb

+ 6 - 2
src/views/basicData/facultyManagement/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <basic-container v-if="show">
+    <basic-container v-if="show" class="page-crad">
       <avue-crud
         ref="crud"
         :option="option"
@@ -269,4 +269,8 @@ export default {
 };
 </script>
 
-<style scoped></style>
+<style scoped>
+.page-crad ::v-deep .basic-container__card {
+  height: 94.2vh;
+}
+</style>

+ 34 - 26
src/views/maintenance/priceLibrary/config/mainList.json

@@ -30,18 +30,26 @@
       "searchSpan": 8
     },
     {
+      "label": "英文名称",
+      "prop": "ename",
+      "index": 3,
+      "width": 100,
+      "overHidden": true,
+      "searchSpan": 8
+    },
+    {
       "label": "规格",
       "prop": "specs",
       "search": true,
       "searchSpan": 8,
-      "index": 3,
+      "index": 4,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "产品属性",
       "prop": "goodNature",
-      "index": 4,
+      "index": 5,
       "width": 100,
       "overHidden": true
     },
@@ -50,14 +58,14 @@
       "prop": "corpId",
       "search": true,
       "searchSpan": 8,
-      "index": 5,
+      "index": 6,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "币别",
       "prop": "currency",
-      "index": 6,
+      "index": 7,
       "width": 100,
       "overHidden": true
     },
@@ -65,20 +73,20 @@
       "label": "汇率",
       "prop": "exchangeRate",
       "width": 100,
-      "index": 7,
+      "index": 8,
       "overHidden": true
     },
     {
       "label": "FOB系数",
       "prop": "coefficient",
-      "index": 8,
+      "index": 9,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "价格类型",
       "prop": "billType",
-      "index": 9,
+      "index": 10,
       "width": 100,
       "overHidden": true,
       "dicData": [],
@@ -90,21 +98,21 @@
     {
       "label": "税率",
       "prop": "taxRate",
-      "index": 10,
+      "index": 11,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "最新价格",
       "prop": "price",
-      "index": 11,
+      "index": 12,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "采购价格",
       "prop": "purchaseAmount",
-      "index": 12,
+      "index": 13,
       "width": 100,
       "overHidden": true
     },
@@ -113,7 +121,7 @@
       "prop": "goodsTypeName",
       "search": true,
       "searchSpan": 8,
-      "index": 13,
+      "index": 14,
       "width": 100,
       "type": "select",
       "filterable": true,
@@ -127,84 +135,84 @@
     {
       "label": "是否重点推荐",
       "prop": "priorityReferrer",
-      "index": 14,
+      "index": 15,
       "width": 120,
       "overHidden": true
     },
     {
       "label": "推荐理由",
       "prop": "referrerReason",
-      "index": 15,
+      "index": 16,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "历史价格1",
       "prop": "priceOne",
-      "index": 16,
+      "index": 17,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "历史日期1",
       "prop": "priceOneTime",
-      "index": 17,
+      "index": 18,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "历史价格2",
       "prop": "priceTwo",
-      "index": 18,
+      "index": 19,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "历史日期2",
       "prop": "priceTwoTime",
-      "index": 19,
+      "index": 20,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "历史价格3",
       "prop": "priceThree",
-      "index": 20,
+      "index": 21,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "历史日期3",
       "prop": "priceThreeTime",
-      "index": 21,
+      "index": 22,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "备注",
       "prop": "remarks",
-      "index": 22,
+      "index": 23,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "有效期开始",
       "prop": "startTime",
-      "index": 23,
+      "index": 24,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "有效期结束",
       "prop": "endTime",
-      "index": 24,
+      "index": 25,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "有效日期",
       "prop": "dateValidity",
-      "index": 25,
+      "index": 26,
       "width": 100,
       "search": true,
       "searchSpan": 8,
@@ -215,21 +223,21 @@
     {
       "label": "业务员",
       "prop": "person",
-      "index": 26,
+      "index": 27,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "英文描述",
       "prop": "cnameDescription",
-      "index": 27,
+      "index": 28,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "状态",
       "prop": "status",
-      "index": 28,
+      "index": 29,
       "width": 100,
       "overHidden": true
     }

+ 1 - 0
src/views/salaryManagement/primarySchool/detailsPage.vue

@@ -955,6 +955,7 @@ export default {
       this.option.disabled = true;
       this.optionList.searchShow = true;
     }
+    this.optionList.height = window.innerHeight - 430;
   },
   methods: {
     cellStyle() {

+ 1 - 1
src/views/salaryManagement/primarySchool/index.vue

@@ -170,7 +170,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 - 350;
+            this.option.height = window.innerHeight - 260;
           }
         })
         .finally(() => {