update

src/components/BaseListTable.vue

@@ -6,7 +6,7 @@
       v-bind="tableConfig"
       ref="base-list-table"
       :header-cell-style="/** 重写表格样式 **/ {
-        padding: '8px 0',
+        padding: '5px 0',
       }"
       row-key="id"
       :cell-style="{ padding: 0 }"

src/components/BaseSearchForm.vue

@@ -154,6 +154,10 @@ export default {
   /* position: relative; */
 }
 
+.base-search-form >>> .el-form-item {
+  margin-bottom: 12px;
+}
+
 .brand-color-line {
   display: inline-block;
   height: 20px;

src/views/modules/pms/material/components/BaseListTable.vue

@@ -7,7 +7,7 @@
       ref="base-list-table"
       :cell-style="{ padding: 0 }"
       :header-cell-style="/** 重写表格样式 **/ {
-        padding: '8px 0',
+        padding: '5px 0',
       }"
       row-key="id"
       :lazy="true"
@@ -45,12 +45,13 @@
           :width="head.width || null"
           :min-width="head.minWidth || null"
           :fixed="head.fixed || null"
-          :show-overflow-tooltip="head.showOverflowTooltip || true"
           :tooltip-effect="head.tooltipEffect || 'light'"
           filter-placement="top"
           :align="head.align || null"
           v-bind="head.more"
+          :show-overflow-tooltip="head.showOverflowTooltip || !(head.prop === 'operations')"
           >
+          <!-- :show-overflow-tooltip="head.showOverflowTooltip || true" -->
           <!-- 子组件 -->
           <template v-if="head.prop" slot-scope="scope">
             <component

src/views/modules/pms/material/config.js

@@ -22,9 +22,12 @@ export default function () {
       prop: "operations",
       name: "操作",
       fixed: "right",
-      width: 120,
+      width: 90,
       subcomponent: TableOperaionComponent,
-      options: [{ name: "add-sub", permission: "pms:material:save" }, { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:material:save" },],
+      options: [
+        // { name: "add-sub", permission: "pms:material:save" },
+        { name: "edit", label: "编辑", icon: "edit-outline" },
+        { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:material:save" },],
     },
   ];
 

src/views/modules/pms/order/components/BaseListTable.vue

@@ -7,11 +7,12 @@
       ref="base-list-table"
       :cell-style="{ padding: 0 }"
       :header-cell-style="/** 重写表格样式 **/ {
-        padding: '8px 0',
+        padding: '5px 0',
       }"
       row-key="id"
       :lazy="true"
       :load="loadSubClassFn"
+      border
     >
       <!-- @cell-mouse-enter="(row, col, cell, event) => $emit('cell-mouse-enter', row, col, cell, event)"> -->
       <!-- @cell-mouse-leave="(row, col, cell, event) => $emit('cell-mouse-leave', row, col, cell, event)"> -->
@@ -45,12 +46,13 @@
           :width="head.width || null"
           :min-width="head.minWidth || null"
           :fixed="head.fixed || null"
-          :show-overflow-tooltip="head.showOverflowTooltip || true"
           :tooltip-effect="head.tooltipEffect || 'light'"
           filter-placement="top"
           :align="head.align || null"
           v-bind="head.more"
+          :show-overflow-tooltip="head.showOverflowTooltip || !(head.prop === 'operations')"
           >
+          <!-- :show-overflow-tooltip="head.showOverflowTooltip || true" -->
           <!-- 子组件 -->
           <template v-if="head.prop" slot-scope="scope">
             <component

src/views/modules/pms/order/components/BaseSearchForm.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="base-search-form">
-    <div class="brand-color-line"><span style="font-size: 20px;">{{ headTitle }}</span></div>
+    <div class="brand-color-line">
+      <span style="font-size: 20px">{{ headTitle }}</span>
+    </div>
 
     <div class="actual-form">
       <el-form :inline="true" :model="dataForm" :rules="headConfig.rules">
@@ -51,7 +53,7 @@ export default {
     },
     headTitle: {
       type: String,
-      default: '',
+      default: "",
     },
   },
   data() {
@@ -161,6 +163,10 @@ export default {
   /* position: relative; */
 }
 
+.base-search-form >>> .el-form-item {
+  margin-bottom: 12px;
+}
+
 .brand-color-line {
   position: relative;
   /* background: red; */

src/views/modules/pms/order/config.js

@@ -86,7 +86,7 @@ export default function () {
       fixed: "right",
       subcomponent: TableOperaionComponent,
       options: operations[type],
-      width: operations[type].length * 32,
+      width: operations[type].length * 35,
     }
 
     // type !== "finished"

src/views/modules/pms/product/config.js

@@ -22,7 +22,7 @@ export default function () {
       fixed: "right",
       width: 90,
       subcomponent: TableOperaionComponent,
-      options: [ {name: { name: "edit", label: "编辑", icon: "edit-outline" }, label: '编辑', icon: 'edit-outline' }, { name: "delete", icon: "delete", label: "删除", emitFull: true, icon: 'delete', label: '删除', emitFull: true, permission: "pms:product:delete" }],
+      options: [{ name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, icon: 'delete', label: '删除', emitFull: true, permission: "pms:product:delete" }],
     },
   ];