From 74595cceee5c7f5f7de8da3357742e574e62bd8f Mon Sep 17 00:00:00 2001
From: lichong <18518571399@163.com>
Date: Fri, 5 Jul 2024 16:38:49 +0800
Subject: [PATCH] 123

---
 .../src/renderer/src/assets/json/dingdan.json | 33 ++++++++++---------
 .../src/components/dingdantablecomponent.vue  |  2 +-
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/front/src/renderer/src/assets/json/dingdan.json b/front/src/renderer/src/assets/json/dingdan.json
index 927d657..07e8398 100644
--- a/front/src/renderer/src/assets/json/dingdan.json
+++ b/front/src/renderer/src/assets/json/dingdan.json
@@ -29,7 +29,7 @@
     "label": "客户名称",
     "prop": "kehumingcheng",
     "type": "text",
-    "tableShow": true,
+    "tableShow": false,
     "formShow": true,
     "exportxiaoshou": true
   },
@@ -45,7 +45,7 @@
     "label": "厂编",
     "prop": "changbian",
     "type": "text",
-    "tableShow": true,
+    "tableShow": false,
     "formShow": true,
     "exportS6": true
   },
@@ -53,7 +53,7 @@
     "label": "货号",
     "prop": "huohao",
     "type": "text",
-    "tableShow": true,
+    "tableShow": false,
     "formShow": true,
     "exportS6": true
   },
@@ -76,10 +76,19 @@
     "label": "最小单位条码",
     "prop": "zuixiaodanweitiaoma",
     "type": "text",
-    "tableShow": true,
+    "tableShow": false,
     "formShow": true,
     "exportxiaoshou": true
   },
+  {
+    "label": "品名",
+    "prop": "pinming",
+    "type": "select",
+    "minWidth": 150,
+    "formShow": true,
+    "tableShow": true,
+    "exportxiaoshou": true
+  },
   {
     "label": "修改后销售数量",
     "prop": "xiugaihouxiaoshoushuliang",
@@ -108,7 +117,7 @@
     "label": "最大箱装量",
     "prop": "zuidaxiangzhuangliang",
     "type": "number",
-    "tableShow": true,
+    "tableShow": false,
     "formShow": true,
     "exportxiaoshou": true
   },
@@ -116,7 +125,7 @@
     "label": "规格型号",
     "prop": "guigexinghao",
     "type": "text",
-    "tableShow": true,
+    "tableShow": false,
     "formShow": true,
     "exportxiaoshou": true
   },
@@ -124,7 +133,7 @@
     "label": "计量单位",
     "prop": "jiliangdanwei",
     "type": "text",
-    "tableShow": true,
+    "tableShow": false,
     "formShow": true,
     "exportxiaoshou": true
   },
@@ -144,14 +153,6 @@
     "formShow": true,
     "exportxiaoshou": true
   },
-  {
-    "label": "品名",
-    "prop": "pinming",
-    "type": "select",
-    "formShow": true,
-    "tableShow": true,
-    "exportxiaoshou": true
-  },
   {
     "label": "品名选项",
     "prop": "pinmingxuanxiang",
@@ -171,7 +172,7 @@
     "prop": "guige",
     "type": "text",
     "formShow": true,
-    "tableShow": true
+    "tableShow": false
   },
   {
     "label": "销售数量",
diff --git a/front/src/renderer/src/components/dingdantablecomponent.vue b/front/src/renderer/src/components/dingdantablecomponent.vue
index 2713e53..e4156ff 100644
--- a/front/src/renderer/src/components/dingdantablecomponent.vue
+++ b/front/src/renderer/src/components/dingdantablecomponent.vue
@@ -10,7 +10,7 @@
         </template>
       </el-table-column>
       <el-table-column v-for="(headerItem, headerIndex) in tableHeader" :label="headerItem.label" show-overflow-tooltip
-        :key="headerIndex" :min-width="`${headerItem.label.length * 15 + 8}px`">
+        :key="headerIndex" :min-width="`${headerItem.minWidth?headerItem.minWidth:headerItem.label.length * 15 + 8}px`">
         <template #default="scope">
           <template v-if="headerItem.type === 'text'">
             <span>{{ scope.row[headerItem.prop] }}</span>