From 18e53eedbf363c28435d293ab74c5336eacc3667 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 10 十二月 2025 10:37:41 +0800
Subject: [PATCH] 订单磨边类型下拉框可输入搜索
---
north-glass-erp/src/main/resources/mapper/mm/FinishedGlassShelf.xml | 2 +-
north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue | 2 +-
north-glass-erp/northglass-erp/src/components/sd/order/ProcessAttribute.vue | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/ProcessAttribute.vue b/north-glass-erp/northglass-erp/src/components/sd/order/ProcessAttribute.vue
index 5e2fcef..c8402bf 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/ProcessAttribute.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/ProcessAttribute.vue
@@ -14,6 +14,7 @@
v-model="dataList[itme.process_type][itme1.process_type]"
placeholder=""
clearable
+ filterable
style="width: 120px"
>
<el-option
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
index a95b10e..d74604d 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
@@ -468,7 +468,7 @@
otherMoney:otherMoney.value,
deliveryIdType:company.deliveryIdType,
deliveryOutbound:company.deliveryOutbound,
- type:2
+ type:1
})
gridOptions.toolbarConfig.buttons[0].disabled = true
diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedGlassShelf.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedGlassShelf.xml
index b85bddf..ff6017c 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGlassShelf.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGlassShelf.xml
@@ -37,7 +37,7 @@
<select id="getSelectFinishedGlassShelfInformationInventoryArea">
SELECT
- MAX(CAST(REGEXP_REPLACE(glass_shelf_number, '[^0-9]', '')AS UNSIGNED)) AS maxDindex
+ ifnull(MAX(CAST(REGEXP_REPLACE(glass_shelf_number, '[^0-9]', '')AS UNSIGNED)),0) AS maxDindex
FROM
finished_glass_shelf_information
WHERE
--
Gitblit v1.8.0