From 58268d802176436e8282fc701c1aac76bc97cd90 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 28 八月 2025 16:42:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml | 4 ++--
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectMange.vue | 17 ++++++++++++++---
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectMange.vue b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectMange.vue
index d324de7..fdb8886 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectMange.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectMange.vue
@@ -57,10 +57,10 @@
{field: 'thickness', width: 50, title: '鍘氬害',},
{field: 'type', width: 50, title: '绫诲瀷',},
{field: 'state', width: 50, title: '鐘舵��',},
- {field: 'temperingState', width: 50, title: '閽㈠寲妯℃嫙',filters: [{data: ''}], slots: {filter: 'num1_filter'},
+ {field: 'temperingState', width: 50, title: '閽㈠寲妯℃嫙', filters: [{data: ''}], slots: {filter: 'select_filter1'},
filterMethod:filterChanged, formatter: ({ cellValue }) => cellValue === 1 ? '鏄�' : (cellValue === 0 ? '鍚�' : cellValue)},
- {field: 'optimizeState', width: 50, title: '浼樺寲璁＄畻',filters: [{data: ''}], slots: {filter: 'num1_filter'},
- filterMethod:filterChanged,formatter: ({ cellValue }) => cellValue === 1 ? '鏄�' : (cellValue === 0 ? '鍚�' : cellValue)},
+ {field: 'optimizeState', width: 50, title: '浼樺寲璁＄畻', filters: [{data: ''}], slots: {filter: 'select_filter1'},
+ filterMethod:filterChanged, formatter: ({ cellValue }) => cellValue === 1 ? '鏄�' : (cellValue === 0 ? '鍚�' : cellValue)},
{field: 'quantity', width: 50, title: '鏁伴噺',},
{field: 'area', width: 50, title: '闈㈢Н',},
{field: 'processCardQuantity', width: 100, title: '娴佺▼鍗℃暟閲�',},
@@ -880,6 +880,17 @@
</div>
</template>
+ <template #select_filter1="{ column, $panel }">
+ <div>
+ <div v-for="(option, index) in column.filters" :key="index">
+ <vxe-select v-model="option.data" @change="changeFilterEvent($event, option, $panel)">
+ <vxe-option value="1" label="鏄�"></vxe-option>
+ <vxe-option value="0" label="鍚�"></vxe-option>
+ </vxe-select>
+ </div>
+ </div>
+ </template>
+
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
diff --git a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
index 21931d2..544545d 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -473,7 +473,7 @@
<!--搴撳瓨淇℃伅-->
<select id="materialStoreMp">
SELECT
- i.id AS id,
+ i.material_code AS id,
i.producer AS producer,
i.available_quantity-i.plan_quantity AS available_quantity,
null as processingQuantity,
@@ -570,7 +570,7 @@
<select id="materialStoreOptimizeUse">
- select ms.id AS id,
+ select ou.raw_stock_code AS id,
ou.use_count AS processingQuantity,
ou.width,
ou.height,
--
Gitblit v1.8.0