From f667bf2d6962821b0fd4c7f938f457336ffcab06 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 27 Jun 2024 14:41:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/AppKgTable.vue | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/views/AppKgTable.vue b/src/views/AppKgTable.vue
index be2b324..fc04d67 100644
--- a/src/views/AppKgTable.vue
+++ b/src/views/AppKgTable.vue
@@ -1,26 +1,25 @@
 <script>
-export default {
-  name: "AppKgTable",
-  label: "表格",
-  components: {
-    tableColumn: {
-      functional: true,
-      props: {
-        column: {default: () => ({})}
-      },
-      render(h, vm) {
-        const config = vm.props.column
-        return h('el-table-column', {props: config}, h('template', {
+const tableColumn = {
+  props: {
+    column: {default: () => ({})}
+  },
+  render(h) {
+    const config = this.$props.column
+    return h('el-table-column', {props: config},
+        config.children?.map(col => h(tableColumn, {props: {column: col}})) || h('template', {
           slotScope: {
             default: ({row}) => {
               config.custom ? h('div', {style: {color: row.preSaleNum > row.stockNum ? 'red' : '#fff'}}, '周边库存情况') :
-                  config.children?.map(col => h('table-column', {props: {column: col}})) || h('span', row[config.prop] || '')
+                  h('span', row[config.prop] || '')
             }
           }
         }))
-      },
-    }
   },
+}
+export default {
+  name: "AppKgTable",
+  label: "表格",
+  components: {tableColumn},
   data() {
     return {
       tableData: [
@@ -30,14 +29,12 @@ export default {
       ],
       columns: [
         {label: "重点单品", prop: "name"},
-        {label: "当日目标", prop: "targetNum", width: "70px"},
-        {label: "销售数量", prop: "saleNum", width: "70px"},
-        {label: "库存数量", prop: "stockNum", width: "70px"},
-        {label: "预计销售数量", prop: "preSaleNum"},
+        {label: "当日目标", prop: "targetNum", width: 70},
+        {label: "销售数量", prop: "saleNum", width: 70},
         {
           label: "合并表头示例", children: [
-            {"label": "当日目标", "prop": "targetNum", "width": "70px"},
-            {"label": "销售数量", "prop": "saleNum", "width": "70px"},
+            {label: "库存数量", prop: "stockNum", width: "70px"},
+            {label: "预计销售数量", prop: "preSaleNum"},
           ]
         },
         {label: "提醒", custom: 1, width: 70, align: 'center', prop: "remind"},