From 32c000c49164787738d2739b3f21be27e0a265a7 Mon Sep 17 00:00:00 2001
From: xhj <xhjzrq@163.com>
Date: Thu, 31 Oct 2024 14:30:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../renderer/combination/Combination.vue      | 22 +++++++++++++++++++
 src/views/jhzxgl/sljhD.vue                    | 22 ++++++++++++++++---
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/plugins/vxe-table/renderer/combination/Combination.vue b/src/plugins/vxe-table/renderer/combination/Combination.vue
index 0913e18..2da76ec 100644
--- a/src/plugins/vxe-table/renderer/combination/Combination.vue
+++ b/src/plugins/vxe-table/renderer/combination/Combination.vue
@@ -281,6 +281,28 @@ export default {
       this.option = option
       this.colValList = colValList
       this.valList = colValList
+
+      this.valList = colValList.sort(function(a, b) {
+        // 先按照 value.length() 排序升序
+        if (a.value.length < b.value.length) {
+          return -1;
+        }
+        else if (a.value.length > b.value.length) {
+          return 1;
+        }
+        else {
+          // 如果 value.length() 相等，则按照 value 排序升序
+          if (a.value < b.value) {
+            return -1;
+          }
+          else if (a.value > b.value) {
+            return 1;
+          }
+          else {
+            return 0;
+          }
+        }
+      });
       this.hasFilter = $table.isFilter(column.property)
     },
     getI18n (key, args) {
diff --git a/src/views/jhzxgl/sljhD.vue b/src/views/jhzxgl/sljhD.vue
index 4044ef2..2538485 100644
--- a/src/views/jhzxgl/sljhD.vue
+++ b/src/views/jhzxgl/sljhD.vue
@@ -460,7 +460,7 @@ export default {
         //   filterRender: { name: 'FilterCombination', }},
 
 
-        { field: 'wpgg', title: '规格',width: 80,
+        { field: 'wpgg', title: '规格',width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
 
@@ -609,7 +609,7 @@ export default {
         },
         {
           title: '规格',
-          width: "100px",
+          width: "120px",
           field: 'wpgg',
 
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -700,7 +700,7 @@ export default {
         },
         {
           title: '切割跨位',
-          width: "70px",
+          width: "80px",
           field: 'sldw',
           formatter: ['dictFormat', 'QGKW'],
           editRender: {
@@ -776,6 +776,22 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' },
         },
+        {
+          title: '打印人',
+          width: "100px",
+          field: 'dyry',
+
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' },
+        },
+        {
+          title: '打印日期',
+          width: "100px",
+          field: 'dyrq',
+
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' },
+        },
         {
           title: '生产id',
           width: "120px",