From d412057a3885cbe6e3245c00c07bc8f643c01600 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Fri, 17 Mar 2023 11:32:29 +0800
Subject: [PATCH] update table

---
 src/components/BaseListTable.vue              |  5 +--
 src/components/DialogWithMenu.vue             |  4 ++-
 .../noTemplateComponents/detailComponent.js   |  2 +-
 .../operationComponent.css                    |  6 ++--
 .../operationComponent.js                     |  4 +--
 src/views/modules/pms/blenderBatch/config.js  |  6 ++--
 .../modules/pms/blenderBatchDetails/config.js |  2 +-
 src/views/modules/pms/blenderOrder/config.js  | 10 +++---
 src/views/modules/pms/blenderStep/config.js   |  6 ++--
 src/views/modules/pms/bom/config.js           |  6 ++--
 src/views/modules/pms/brokeLog/config.js      |  4 +--
 src/views/modules/pms/car/config.js           |  4 +--
 src/views/modules/pms/customer/config.js      |  4 +--
 src/views/modules/pms/equipment/config.js     |  8 ++---
 src/views/modules/pms/equipmentType/config.js |  4 +--
 src/views/modules/pms/factory/config.js       |  2 +-
 src/views/modules/pms/firingStep/config.js    |  6 ++--
 src/views/modules/pms/kilnOrder/config.js     |  6 ++--
 .../pms/material/components/BaseListTable.vue |  1 +
 src/views/modules/pms/material/config.js      |  6 ++--
 .../modules/pms/materialStorage/config.js     |  4 +--
 src/views/modules/pms/materialType/config.js  |  4 +--
 .../modules/pms/materialUpload/config.js      |  4 +--
 src/views/modules/pms/order/config.js         | 34 +++++++++----------
 src/views/modules/pms/packingStep/config.js   |  6 ++--
 src/views/modules/pms/pressOrder/config.js    |  6 ++--
 src/views/modules/pms/product/config.js       |  8 ++---
 .../modules/pms/productionLine/config.js      |  4 +--
 .../modules/pms/qualityPackOrder/config.js    |  6 ++--
 .../modules/pms/reportSheet/config copy.js    |  2 +-
 src/views/modules/pms/reportSheet/config.js   | 12 +++----
 .../modules/pms/reportSheetCategory/config.js |  4 +--
 src/views/modules/pms/shape/config.js         |  4 +--
 src/views/modules/pms/shapeStep/config.js     |  6 ++--
 src/views/modules/pms/supplier/config.js      |  4 +--
 src/views/modules/pms/testingStep/config.js   |  6 ++--
 src/views/modules/pms/workSequence/config.js  |  4 +--
 37 files changed, 109 insertions(+), 105 deletions(-)

diff --git a/src/components/BaseListTable.vue b/src/components/BaseListTable.vue
index d9ed37a..1fd8b11 100644
--- a/src/components/BaseListTable.vue
+++ b/src/components/BaseListTable.vue
@@ -44,12 +44,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
diff --git a/src/components/DialogWithMenu.vue b/src/components/DialogWithMenu.vue
index 990bd94..1231e93 100644
--- a/src/components/DialogWithMenu.vue
+++ b/src/components/DialogWithMenu.vue
@@ -852,7 +852,9 @@ export default {
       switch (type) {
         case "delete": {
           // 确认是否删除
-          return this.$confirm(`是否删除条目: ${data.name ?? (data.material ? data.material : data.id)}`, "提示", {
+          console.log('delete....', data)
+          const itemName = typeof data === 'object' ? (data.attrName || data.name || data.material || data.id) : data
+          return this.$confirm(`是否删除条目: ${itemName}`, "提示", {
             confirmButtonText: "确认",
             cancelButtonText: "我再想想",
             type: "warning",
diff --git a/src/components/noTemplateComponents/detailComponent.js b/src/components/noTemplateComponents/detailComponent.js
index 75a4edc..ff6875a 100644
--- a/src/components/noTemplateComponents/detailComponent.js
+++ b/src/components/noTemplateComponents/detailComponent.js
@@ -26,6 +26,6 @@ export default {
   },
   render: function (h) {
     // console.log('button content:', this.injectData)
-    return h('span', null, [h('el-button', { props: { type: 'text' }, style: { paddingLeft: 0 }, on: { click: this.emitClick } }, this.injectData.head?.buttonContent || this.defaultText)])
+    return h('span', null, [h('el-button', { props: { type: 'text' }, style: { padding: 0, margin: '5px 0' }, on: { click: this.emitClick } }, this.injectData.head?.buttonContent || this.defaultText)])
   }
 }
\ No newline at end of file
diff --git a/src/components/noTemplateComponents/operationComponent.css b/src/components/noTemplateComponents/operationComponent.css
index e521bc2..f7e2331 100644
--- a/src/components/noTemplateComponents/operationComponent.css
+++ b/src/components/noTemplateComponents/operationComponent.css
@@ -10,7 +10,7 @@
   content: "";
   width: 1px;
   background: #ccc;
-  right: -6px;
-  top: 15%;
-  height: 70%;
+  right: -4px;
+  top: 10%;
+  height: 80%;
 }
\ No newline at end of file
diff --git a/src/components/noTemplateComponents/operationComponent.js b/src/components/noTemplateComponents/operationComponent.js
index 8d4814a..778db0c 100644
--- a/src/components/noTemplateComponents/operationComponent.js
+++ b/src/components/noTemplateComponents/operationComponent.js
@@ -107,7 +107,7 @@ export default {
                 domProps: {
                   title: opt.label ?? opt.name,
                 },
-                style: { color: !shouldDisabled && (opt.color || this.colors[opt.name] || "#0b58ff"), padding: '5px 0' },
+                style: { color: !shouldDisabled && (opt.color || this.colors[opt.name] || "#0b58ff"), padding: 0, margin: '5px 9px 5px 0' },
                 class: ['operate--btn'],
                 on: { click: this.emit.bind(null, opt) },
               },
@@ -126,7 +126,7 @@ export default {
               domProps: {
                 title: opt.label ?? opt.name,
               },
-              style: { color: this.colors[opt] || "#0b58ff", padding: 0 },
+              style: { color: this.colors[opt] || "#0b58ff", padding: 0, margin: '5px 9px 5px 0' },
               class: ['operate--btn'],
               on: { click: this.emit.bind(null, opt) },
             },
diff --git a/src/views/modules/pms/blenderBatch/config.js b/src/views/modules/pms/blenderBatch/config.js
index 7d34a80..878728a 100644
--- a/src/views/modules/pms/blenderBatch/config.js
+++ b/src/views/modules/pms/blenderBatch/config.js
@@ -29,11 +29,11 @@ export default function () {
       prop: "operations",
       name: "操作",
       fixed: "right",
-      width: 120,
+      width: 90,
       subcomponent: TableOperaionComponent,
       options: [
-        { name: 'edit', enable: injectRow => { return 'task' in injectRow && injectRow.task === 'Manual' } },
-        { name: 'delete', enable: injectRow => { return 'task' in injectRow && injectRow.task === 'Manual' } },
+        { name: { name: "edit", label: "编辑", icon: "edit-outline"}, enable: injectRow => { return 'task' in injectRow && injectRow.task === 'Manual' } },
+        { name: 'delete', icon: 'delete', enable: injectRow => { return 'task' in injectRow && injectRow.task === 'Manual' } },
       ] // 只有 injectRow.task 为手动时，才允许编辑
     },
   ];
diff --git a/src/views/modules/pms/blenderBatchDetails/config.js b/src/views/modules/pms/blenderBatchDetails/config.js
index 71aa10b..f03fb84 100644
--- a/src/views/modules/pms/blenderBatchDetails/config.js
+++ b/src/views/modules/pms/blenderBatchDetails/config.js
@@ -17,7 +17,7 @@ export default function () {
     //   fixed: "right",
     //   width: 120,
     //   subcomponent: TableOperaionComponent,
-    //   options: [{ name: 'edit', enable: injectRow => { return 'task' in injectRow && injectRow.task === 'Manual' } }] // 只有 injectRow.task 为手动时，才允许编辑
+    //   options: [{ name: { name: "edit", label: "编辑", icon: "edit-outline"}, enable: injectRow => { return 'task' in injectRow && injectRow.task === 'Manual' } }] // 只有 injectRow.task 为手动时，才允许编辑
     // },
   ];
 
diff --git a/src/views/modules/pms/blenderOrder/config.js b/src/views/modules/pms/blenderOrder/config.js
index 8d73144..cb6da18 100644
--- a/src/views/modules/pms/blenderOrder/config.js
+++ b/src/views/modules/pms/blenderOrder/config.js
@@ -32,14 +32,14 @@ export default function () {
       prop: "operations",
       name: "操作",
       fixed: "right",
-      width: 180,
+      width: 120,
       subcomponent: TableOperaionComponent,
       options: [
-        { name: "edit", label: "编辑", emitFull: true, icon: 'edit-outline' },
+        { name:"edit", label: "编辑", emitFull: true, icon: 'edit-outline' },
         { name: "view-batch", label: "查看批次", color: "#ff8000", toRouter: 'pms-blenderBatch', icon: 'document-copy' }, // 路由跳转至 pms-blenderBatch
         { name: "detach", label: "下发", color: "#099", icon: 'bottom-right' },
       ], // , url: '/pms/trans/pressDeli' }]
-      // options: ["copy", "edit", { name: "delete", emitFull: true, permission: "pms:blenderStep:delete" }],
+      // options: ["copy", { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStep:delete" }],
     },
   ];
 
@@ -186,8 +186,8 @@ export default function () {
   //         width: 120,
   //         subcomponent: TableOperaionComponent,
   //         options: [
-  //           { name: "edit", permission: "pms:blenderStepParam:update" },
-  //           { name: "delete", emitFull: true, permission: "pms:blenderStepParam:delete" },
+  //           { name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:blenderStepParam:update" },
+  //           { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" },
   //         ],
   //       },
   //     ],
diff --git a/src/views/modules/pms/blenderStep/config.js b/src/views/modules/pms/blenderStep/config.js
index 56ba559..777278c 100644
--- a/src/views/modules/pms/blenderStep/config.js
+++ b/src/views/modules/pms/blenderStep/config.js
@@ -20,7 +20,7 @@ export default function () {
       fixed: "right",
       width: 160,
       subcomponent: TableOperaionComponent,
-      options: ["copy", "edit", { name: "delete", emitFull: true, permission: "pms:blenderStep:delete" }],
+      options: ["copy", { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStep:delete" }],
     },
   ];
 
@@ -136,8 +136,8 @@ export default function () {
           width: 120,
           subcomponent: TableOperaionComponent,
           options: [
-            { name: "edit", permission: "pms:blenderStepParam:update" },
-            { name: "delete", emitFull: true, permission: "pms:blenderStepParam:delete" },
+            { name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:blenderStepParam:update" },
+            { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" },
           ],
         },
       ],
diff --git a/src/views/modules/pms/bom/config.js b/src/views/modules/pms/bom/config.js
index f94d3e9..89a784c 100644
--- a/src/views/modules/pms/bom/config.js
+++ b/src/views/modules/pms/bom/config.js
@@ -24,7 +24,7 @@ export default function () {
       fixed: "right",
       width: 160,
       subcomponent: TableOperaionComponent,
-      options: ["copy", "edit", { name: "delete", emitFull: true, permission: "pms:bom:delete" }],
+      options: ["copy", { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:bom:delete" }],
     },
   ];
 
@@ -154,8 +154,8 @@ export default function () {
           width: 120,
           subcomponent: TableOperaionComponent,
           options: [
-            { name: "edit", permission: "pms:bomMaterial:update" },
-            { name: "delete", emitFull: true, permission: "pms:bomMaterial:delete" },
+            { name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:bomMaterial:update" },
+            { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:bomMaterial:delete" },
           ],
         },
       ],
diff --git a/src/views/modules/pms/brokeLog/config.js b/src/views/modules/pms/brokeLog/config.js
index 3061dbd..157a16e 100644
--- a/src/views/modules/pms/brokeLog/config.js
+++ b/src/views/modules/pms/brokeLog/config.js
@@ -23,9 +23,9 @@ export default function () {
       prop: "operations",
       name: "操作",
       fixed: "right",
-      width: 120,
+      width: 90,
       subcomponent: TableOperaionComponent,
-      options: ["edit", { name: "delete", emitFull: true, permission: "pms:brokeLog:delete" }],
+      options: [{ name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:brokeLog:delete" }],
     },
   ];
 
diff --git a/src/views/modules/pms/car/config.js b/src/views/modules/pms/car/config.js
index 738b72a..a6142ac 100644
--- a/src/views/modules/pms/car/config.js
+++ b/src/views/modules/pms/car/config.js
@@ -20,9 +20,9 @@ export default function () {
       prop: "operations",
       name: "操作",
       fixed: "right",
-      width: 120,
+      width: 90,
       subcomponent: TableOperaionComponent,
-      options: ["edit", { name: "delete", emitFull: true, permission: "pms:car:delete" }],
+      options: [{ name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:car:delete" }],
     },
   ];
 
diff --git a/src/views/modules/pms/customer/config.js b/src/views/modules/pms/customer/config.js
index 7ad650a..7ad7423 100644
--- a/src/views/modules/pms/customer/config.js
+++ b/src/views/modules/pms/customer/config.js
@@ -19,9 +19,9 @@ export default function () {
       prop: "operations",
       name: "操作",
       fixed: "right",
-      width: 120,
+      width: 90,
       subcomponent: TableOperaionComponent,
-      options: ["edit", { name: "delete", emitFull: true, permission: "pms:customer:delete" }],
+      options: [{ name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:customer:delete" }],
     },
   ];
 
diff --git a/src/views/modules/pms/equipment/config.js b/src/views/modules/pms/equipment/config.js
index acc8f94..e971d01 100644
--- a/src/views/modules/pms/equipment/config.js
+++ b/src/views/modules/pms/equipment/config.js
@@ -21,7 +21,7 @@ export default function () {
       fixed: 'right',
       width: 120,
       subcomponent: TableOperaionComponent,
-      options: ['edit', { name: 'delete', emitFull: true, permission: 'pms:equipment:delete' }]
+      options: [{ name: "edit", label: "编辑", icon: "edit-outline"}, { name: 'delete', label: '删除', icon: 'delete', emitFull: true, permission: 'pms:equipment:delete' }]
     }
   ]
 
@@ -62,7 +62,7 @@ export default function () {
           {
             select: true,
             label: '设备类型',
-            prop: 'equipmentTypeId', 
+            prop: 'equipmentTypeId',
             rules: { required: true, message: '必填项不能为空', trigger: 'blur' },
             options: [
               // { label: '1', value: 1 },
@@ -105,8 +105,8 @@ export default function () {
           width: 120,
           subcomponent: TableOperaionComponent,
           options: [
-            { name: 'edit', permission: 'pms:equipment:update' },
-            { name: 'delete', permission: 'pms:equipment:delete' },
+            { name: { name: "edit", label: "编辑", icon: "edit-outline"}, permission: 'pms:equipment:update' },
+            { name: 'delete', label: '删除', icon: 'delete', emitFull: true, permission: 'pms:equipment:delete' },
           ]
         }
       ],
diff --git a/src/views/modules/pms/equipmentType/config.js b/src/views/modules/pms/equipmentType/config.js
index 185849b..eba13d2 100644
--- a/src/views/modules/pms/equipmentType/config.js
+++ b/src/views/modules/pms/equipmentType/config.js
@@ -16,9 +16,9 @@ export default function () {
       prop: "operations",
       name: "操作",
       fixed: "right",
-      width: 120,
+      width: 90,
       subcomponent: TableOperaionComponent,
-      options: ["edit", { name: "delete", emitFull: true, permission: "pms:equipmentType:delete" }],
+      options: [{ name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:equipmentType:delete" }],
     },
   ];
 
diff --git a/src/views/modules/pms/factory/config.js b/src/views/modules/pms/factory/config.js
index d3bcfbc..1823369 100644
--- a/src/views/modules/pms/factory/config.js
+++ b/src/views/modules/pms/factory/config.js
@@ -16,7 +16,7 @@ export default function () {
       fixed: 'right',
       width: 120,
       subcomponent: TableOperaionComponent,
-      // options: ['edit', { name: 'delete', permission: 'pms:blenderStep:delete' }]
+      // options: [{ name: "edit", label: "编辑", icon: "edit-outline"}, { name: 'delete', icon: 'delete', permission: 'pms:blenderStep:delete' }]
       options: ['view']
     }
   ]
diff --git a/src/views/modules/pms/firingStep/config.js b/src/views/modules/pms/firingStep/config.js
index 781077d..c512320 100644
--- a/src/views/modules/pms/firingStep/config.js
+++ b/src/views/modules/pms/firingStep/config.js
@@ -20,7 +20,7 @@ export default function () {
       fixed: "right",
       width: 160,
       subcomponent: TableOperaionComponent,
-      options: ["copy", "edit", { name: "delete", emitFull: true, permission: "pms:blenderStep:delete" }],
+      options: ["copy", { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStep:delete" }],
     },
   ];
 
@@ -136,8 +136,8 @@ export default function () {
           width: 120,
           subcomponent: TableOperaionComponent,
           options: [
-            { name: "edit", permission: "pms:blenderStepParam:update" },
-            { name: "delete", emitFull: true, permission: "pms:blenderStepParam:delete" },
+            { name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:blenderStepParam:update" },
+            { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" },
           ],
         },
       ],
diff --git a/src/views/modules/pms/kilnOrder/config.js b/src/views/modules/pms/kilnOrder/config.js
index 554b576..4f6a958 100644
--- a/src/views/modules/pms/kilnOrder/config.js
+++ b/src/views/modules/pms/kilnOrder/config.js
@@ -28,7 +28,7 @@ export default function () {
     //   fixed: "right",
     //   width: 160,
     //   subcomponent: TableOperaionComponent,
-    //   options: ["copy", "edit", { name: "delete", emitFull: true, permission: "pms:blenderStep:delete" }],
+    //   options: ["copy", { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStep:delete" }],
     // },
   ];
 
@@ -153,8 +153,8 @@ export default function () {
   //         width: 120,
   //         subcomponent: TableOperaionComponent,
   //         options: [
-  //           { name: "edit", permission: "pms:blenderStepParam:update" },
-  //           { name: "delete", emitFull: true, permission: "pms:blenderStepParam:delete" },
+  //           { name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:blenderStepParam:update" },
+  //           { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" },
   //         ],
   //       },
   //     ],
diff --git a/src/views/modules/pms/material/components/BaseListTable.vue b/src/views/modules/pms/material/components/BaseListTable.vue
index 53b9c5a..9c765b7 100644
--- a/src/views/modules/pms/material/components/BaseListTable.vue
+++ b/src/views/modules/pms/material/components/BaseListTable.vue
@@ -12,6 +12,7 @@
       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)"> -->
diff --git a/src/views/modules/pms/material/config.js b/src/views/modules/pms/material/config.js
index 2f3ad0d..e2b2617 100644
--- a/src/views/modules/pms/material/config.js
+++ b/src/views/modules/pms/material/config.js
@@ -24,7 +24,7 @@ export default function () {
       fixed: "right",
       width: 180,
       subcomponent: TableOperaionComponent,
-      options: [{ name: "add-sub", permission: "pms:material:save" }, "edit", { name: "delete", 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" },],
     },
   ];
 
@@ -176,8 +176,8 @@ export default function () {
           width: 120,
           subcomponent: TableOperaionComponent,
           options: [
-            { name: "edit", permission: "pms:materialArrt:save" },
-            { name: "delete", emitFull: true, permission: "pms:materialArrt:save" },
+            { name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:materialArrt:save" },
+            { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:materialArrt:save" },
           ],
         },
       ],
diff --git a/src/views/modules/pms/materialStorage/config.js b/src/views/modules/pms/materialStorage/config.js
index 0dad94b..2ef3251 100644
--- a/src/views/modules/pms/materialStorage/config.js
+++ b/src/views/modules/pms/materialStorage/config.js
@@ -18,9 +18,9 @@ export default function () {
       prop: "operations",
       name: "操作",
       fixed: "right",
-      width: 120,
+      width: 90,
       subcomponent: TableOperaionComponent,
-      options: ["edit", { name: "delete", emitFull: true, permission: "pms:materialStorage:delete" }],
+      options: [{ name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:materialStorage:delete" }],
     },
   ];
 
diff --git a/src/views/modules/pms/materialType/config.js b/src/views/modules/pms/materialType/config.js
index 4c66bb3..d8e42a7 100644
--- a/src/views/modules/pms/materialType/config.js
+++ b/src/views/modules/pms/materialType/config.js
@@ -15,9 +15,9 @@ export default function () {
       prop: "operations",
       name: "操作",
       fixed: "right",
-      width: 120,
+      width: 90,
       subcomponent: TableOperaionComponent,
-      options: ["edit", { name: "delete", emitFull: true, permission: "pms:materialType:delete" }],
+      options: [{ name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:materialType:delete" }],
     },
   ];
 
diff --git a/src/views/modules/pms/materialUpload/config.js b/src/views/modules/pms/materialUpload/config.js
index dffb64d..d7b0ff0 100644
--- a/src/views/modules/pms/materialUpload/config.js
+++ b/src/views/modules/pms/materialUpload/config.js
@@ -24,9 +24,9 @@ export default function () {
       prop: "operations",
       name: "操作",
       fixed: "right",
-      width: 120,
+      width: 90,
       subcomponent: TableOperaionComponent,
-      options: ["edit", { name: "delete", emitFull: true, permission: "pms:materialUpload:delete" }],
+      options: [{ name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:materialUpload:delete" }],
     },
   ];
 
diff --git a/src/views/modules/pms/order/config.js b/src/views/modules/pms/order/config.js
index 10cb143..a696f5d 100644
--- a/src/views/modules/pms/order/config.js
+++ b/src/views/modules/pms/order/config.js
@@ -1,6 +1,6 @@
 import TableOperaionComponent from "@/components/noTemplateComponents/operationComponent";
 import TableTextComponent from "@/components/noTemplateComponents/detailComponent";
-import StatusComponent from "@/components/noTemplateComponents/statusComponent";
+// import StatusComponent from "@/components/noTemplateComponents/statusComponent";
 import { timeFilter, dictFilter } from "@/utils/filters";
 
 function changeOrderSort(orderId, location) {
@@ -24,23 +24,23 @@ export default function () {
   const operations = {
     ongoing: [
       // { name: 'confirm-order', label: '确认', icon: 'success', showText: true },
-      { name: 'view', label: '查看详情' },
-      { name: "end-order", label: "结束", icon: "error", showText: true },
-      { name: "move-up", label: "上移", icon: "caret-top", showText: true },
-      { name: "move-down", label: "下移", icon: "caret-bottom", showText: true },
-      { name: "move-to-top", label: "至顶", icon: "upload2", showText: true },
-      { name: "move-to-bottom", label: "至底", icon: "download", showText: true },
-      { name: "destroy-order", label: "废除", icon: "delete-solid", showText: true },
+      { name: 'view', label: '查看详情', icon: 'view' },
+      { name: "end-order", label: "结束", icon: "finished" },
+      { name: "move-up", label: "上移", icon: "arrow-up" },
+      { name: "move-down", label: "下移", icon: "arrow-down" },
+      { name: "move-to-top", label: "至顶", icon: "upload2" },
+      { name: "move-to-bottom", label: "至底", icon: "download" },
+      { name: "destroy-order", label: "废除", icon: "close" },
     ],
     pending: [
-      "edit",
-      { name: 'view', label: '查看详情' },
-      { name: "confirm-order", label: "确认订单", icon: "success", showText: true },
-      { name: "move-up", label: "上移", icon: "caret-top", showText: true },
-      { name: "move-down", label: "下移", icon: "caret-bottom", showText: true },
-      { name: "move-to-top", label: "至顶", icon: "upload2", showText: true },
-      { name: "move-to-bottom", label: "至底", icon: "download", showText: true },
-      { name: "delete", emitFull: true, permission: "" },
+      { name: "edit", label: "编辑", icon: "edit-outline" },
+      { name: 'view', label: '查看详情', icon: 'view' },
+      { name: "confirm-order", label: "确认订单", icon: "success" },
+      { name: "move-up", label: "上移", icon: "arrow-up" },
+      { name: "move-down", label: "下移", icon: "arrow-down" },
+      { name: "move-to-top", label: "至顶", icon: "upload2" }, // , showText: true },
+      { name: "move-to-bottom", label: "至底", icon: "download" }, // , showText: true },
+      { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "" },
     ],
     finished: [
       { name: 'view', label: '查看详情' },
@@ -86,7 +86,7 @@ export default function () {
       fixed: "right",
       subcomponent: TableOperaionComponent,
       options: operations[type],
-      width: operations[type].length * 64,
+      width: operations[type].length * 32,
     }
 
     // type !== "finished"
diff --git a/src/views/modules/pms/packingStep/config.js b/src/views/modules/pms/packingStep/config.js
index 278d50f..5948530 100644
--- a/src/views/modules/pms/packingStep/config.js
+++ b/src/views/modules/pms/packingStep/config.js
@@ -20,7 +20,7 @@ export default function () {
       fixed: "right",
       width: 160,
       subcomponent: TableOperaionComponent,
-      options: ["copy", "edit", { name: "delete", emitFull: true, permission: "pms:packingStep:delete" }],
+      options: ["copy", { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:packingStep:delete" }],
     },
   ];
 
@@ -142,8 +142,8 @@ export default function () {
           width: 120,
           subcomponent: TableOperaionComponent,
           options: [
-            { name: "edit", permission: "pms:blenderStepParam:update" },
-            { name: "delete", emitFull: true, permission: "pms:blenderStepParam:delete" },
+            { name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:blenderStepParam:update" },
+            { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" },
           ],
         },
       ],
diff --git a/src/views/modules/pms/pressOrder/config.js b/src/views/modules/pms/pressOrder/config.js
index 40940cf..bfdec69 100644
--- a/src/views/modules/pms/pressOrder/config.js
+++ b/src/views/modules/pms/pressOrder/config.js
@@ -31,7 +31,7 @@ export default function () {
       width: 160,
       subcomponent: TableOperaionComponent,
       options: [{ name: 'detach', label: '下发' }] // , url: '/pms/trans/pressDeli' }]
-      // options: ["copy", "edit", { name: "delete", emitFull: true, permission: "pms:blenderStep:delete" }],
+      // options: ["copy", { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStep:delete" }],
     },
   ];
 
@@ -156,8 +156,8 @@ export default function () {
   //         width: 120,
   //         subcomponent: TableOperaionComponent,
   //         options: [
-  //           { name: "edit", permission: "pms:blenderStepParam:update" },
-  //           { name: "delete", emitFull: true, permission: "pms:blenderStepParam:delete" },
+  //           { name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:blenderStepParam:update" },
+  //           { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" },
   //         ],
   //       },
   //     ],
diff --git a/src/views/modules/pms/product/config.js b/src/views/modules/pms/product/config.js
index c2afefe..a8e2e13 100644
--- a/src/views/modules/pms/product/config.js
+++ b/src/views/modules/pms/product/config.js
@@ -20,9 +20,9 @@ export default function () {
       prop: "operations",
       name: "操作",
       fixed: "right",
-      width: 120,
+      width: 90,
       subcomponent: TableOperaionComponent,
-      options: ["edit", { name: "delete", emitFull: true, permission: "pms:product:delete" }],
+      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" }],
     },
   ];
 
@@ -137,8 +137,8 @@ export default function () {
           width: 120,
           subcomponent: TableOperaionComponent,
           options: [
-            { name: "edit", permission: "pms:productArrt:update" },
-            { name: "delete", emitFull: true, permission: "pms:productArrt:delete" },
+            { name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:productArrt:update" },
+            { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:productArrt:delete" },
           ],
         },
       ],
diff --git a/src/views/modules/pms/productionLine/config.js b/src/views/modules/pms/productionLine/config.js
index 741a999..7cc2c06 100644
--- a/src/views/modules/pms/productionLine/config.js
+++ b/src/views/modules/pms/productionLine/config.js
@@ -19,9 +19,9 @@ export default function () {
       prop: "operations",
       name: "操作",
       fixed: "right",
-      width: 120,
+      width: 90,
       subcomponent: TableOperaionComponent,
-      options: ["edit", { name: "delete", emitFull: true, permission: "pms:productionLine:delete" }],
+      options: [{ name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:productionLine:delete" }],
     },
   ];
 
diff --git a/src/views/modules/pms/qualityPackOrder/config.js b/src/views/modules/pms/qualityPackOrder/config.js
index d7c9839..5eb72f2 100644
--- a/src/views/modules/pms/qualityPackOrder/config.js
+++ b/src/views/modules/pms/qualityPackOrder/config.js
@@ -37,7 +37,7 @@ export default function () {
     //   fixed: "right",
     //   width: 160,
     //   subcomponent: TableOperaionComponent,
-    //   options: ["copy", "edit", { name: "delete", emitFull: true, permission: "pms:blenderStep:delete" }],
+    //   options: ["copy", { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStep:delete" }],
     // },
   ];
 
@@ -162,8 +162,8 @@ export default function () {
   //         width: 120,
   //         subcomponent: TableOperaionComponent,
   //         options: [
-  //           { name: "edit", permission: "pms:blenderStepParam:update" },
-  //           { name: "delete", emitFull: true, permission: "pms:blenderStepParam:delete" },
+  //           { name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:blenderStepParam:update" },
+  //           { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" },
   //         ],
   //       },
   //     ],
diff --git a/src/views/modules/pms/reportSheet/config copy.js b/src/views/modules/pms/reportSheet/config copy.js
index 78bc970..3a37265 100644
--- a/src/views/modules/pms/reportSheet/config copy.js	
+++ b/src/views/modules/pms/reportSheet/config copy.js	
@@ -76,7 +76,7 @@ export default async function () {
         fixed: "right",
         width: 120,
         subcomponent: TableOperaionComponent,
-        options: ["edit", { name: "delete", emitFull: true, permission: "pms:productionLine:delete" }],
+        options: [{ name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:productionLine:delete" }],
       },
     ];
 
diff --git a/src/views/modules/pms/reportSheet/config.js b/src/views/modules/pms/reportSheet/config.js
index b7e7ccb..be67cc0 100644
--- a/src/views/modules/pms/reportSheet/config.js
+++ b/src/views/modules/pms/reportSheet/config.js
@@ -35,7 +35,7 @@ const CategoryList = {
       // console.log('【报表分类】', item.value)
       childOptions.push(h("el-option", { props: { label: item.label, value: item.value } }, null));
     });
-    return h("el-select", { props: { size: 'small', value: this.pickedId }, on: { change: this.handleChange } }, childOptions);
+    return h("el-select", { props: { size: 'mini', value: this.pickedId }, on: { change: this.handleChange } }, childOptions);
   },
 };
 
@@ -56,13 +56,13 @@ export default function () {
       prop: "operations",
       name: "操作",
       fixed: "right",
-      width: 240,
+      width: 160,
       subcomponent: TableOperaionComponent,
       options: [
-        { name: "preview", label: '预览', emitFull: true, permission: "pms:reportSheet:preview" },
-        { name: "design", label: '设计', emitFull: true, permission: "pms:reportSheet:design" },
-        { name: "edit", label: '编辑' },
-        { name: "delete", label: '删除', icon: 'delete', emitFull: true, permission: "pms:reportSheet:delete" },
+        { name: "preview", label: '预览', icon: 'view', emitFull: true, permission: "pms:reportSheet:preview" },
+        { name: "design", label: '设计', icon: 'edit', emitFull: true, permission: "pms:reportSheet:design" },
+        { name: "edit", label: "编辑", icon: "edit-outline", label: '编辑' },
+        { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:reportSheet:delete" },
       ],
     },
   ];
diff --git a/src/views/modules/pms/reportSheetCategory/config.js b/src/views/modules/pms/reportSheetCategory/config.js
index 34afb05..9ddbe40 100644
--- a/src/views/modules/pms/reportSheetCategory/config.js
+++ b/src/views/modules/pms/reportSheetCategory/config.js
@@ -17,8 +17,8 @@ export default function () {
       width: 240,
       subcomponent: TableOperaionComponent,
       options: [
-        "edit",
-        { name: "delete", emitFull: true, permission: "pms:reportSheetCategory:delete" },
+        { name: "edit", label: "编辑", icon: "edit-outline" },
+        { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:reportSheetCategory:delete" },
       ],
     },
   ];
diff --git a/src/views/modules/pms/shape/config.js b/src/views/modules/pms/shape/config.js
index 6efd8af..5f16a48 100644
--- a/src/views/modules/pms/shape/config.js
+++ b/src/views/modules/pms/shape/config.js
@@ -17,9 +17,9 @@ export default function () {
       prop: "operations",
       name: "操作",
       fixed: "right",
-      width: 120,
+      width: 90,
       subcomponent: TableOperaionComponent,
-      options: ["edit", { name: "delete", emitFull: true, permission: "pms:shape:delete" }],
+      options: [{ name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:shape:delete" }],
     },
   ];
 
diff --git a/src/views/modules/pms/shapeStep/config.js b/src/views/modules/pms/shapeStep/config.js
index 72b64a9..5254489 100644
--- a/src/views/modules/pms/shapeStep/config.js
+++ b/src/views/modules/pms/shapeStep/config.js
@@ -20,7 +20,7 @@ export default function () {
       fixed: "right",
       width: 160,
       subcomponent: TableOperaionComponent,
-      options: ["copy", "edit", { name: "delete", emitFull: true, permission: "pms:shapeStep:delete" }],
+      options: ["copy", { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:shapeStep:delete" }],
     },
   ];
 
@@ -141,8 +141,8 @@ export default function () {
           width: 120,
           subcomponent: TableOperaionComponent,
           options: [
-            { name: "edit", permission: "pms:blenderStepParam:update" },
-            { name: "delete", emitFull: true, permission: "pms:blenderStepParam:delete" },
+            { name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:blenderStepParam:update" },
+            { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" },
           ],
         },
       ],
diff --git a/src/views/modules/pms/supplier/config.js b/src/views/modules/pms/supplier/config.js
index a1529b8..8ddef1c 100644
--- a/src/views/modules/pms/supplier/config.js
+++ b/src/views/modules/pms/supplier/config.js
@@ -20,9 +20,9 @@ export default function () {
       prop: "operations",
       name: "操作",
       fixed: "right",
-      width: 120,
+      width: 90,
       subcomponent: TableOperaionComponent,
-      options: ["edit", { name: "delete", emitFull: true, permission: "pms:supplier:delete" }],
+      options: [{ name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:supplier:delete" }],
     },
   ];
 
diff --git a/src/views/modules/pms/testingStep/config.js b/src/views/modules/pms/testingStep/config.js
index dd260b6..1452567 100644
--- a/src/views/modules/pms/testingStep/config.js
+++ b/src/views/modules/pms/testingStep/config.js
@@ -20,7 +20,7 @@ export default function () {
       fixed: "right",
       width: 160,
       subcomponent: TableOperaionComponent,
-      options: ["copy", "edit", { name: "delete", emitFull: true, permission: "pms:testingStep:delete" }],
+      options: ["copy", { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:testingStep:delete" }],
     },
   ];
 
@@ -142,8 +142,8 @@ export default function () {
           width: 120,
           subcomponent: TableOperaionComponent,
           options: [
-            { name: "edit", permission: "pms:blenderStepParam:update" },
-            { name: "delete", emitFull: true, permission: "pms:blenderStepParam:delete" },
+            { name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:blenderStepParam:update" },
+            { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" },
           ],
         },
       ],
diff --git a/src/views/modules/pms/workSequence/config.js b/src/views/modules/pms/workSequence/config.js
index 5ed717b..89dec0b 100644
--- a/src/views/modules/pms/workSequence/config.js
+++ b/src/views/modules/pms/workSequence/config.js
@@ -14,9 +14,9 @@ export default function () {
       prop: "operations",
       name: "操作",
       fixed: "right",
-      width: 120,
+      width: 90,
       subcomponent: TableOperaionComponent,
-      options: ["edit", { name: "delete", emitFull: true, permission: "pms:workSequence:delete" }],
+      options: [{ name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:workSequence:delete" }],
     },
   ];