업체 셀렉트박스 x 버튼 오류 수정
This commit is contained in:
@@ -271,11 +271,22 @@ function createSelect2Editor(options) {
|
||||
$(select).select2('open');
|
||||
});
|
||||
|
||||
$(select).on('select2:select select2:clear', function(e) {
|
||||
var isCleared = false;
|
||||
|
||||
$(select).on('select2:select', function(e) {
|
||||
success($(select).val());
|
||||
});
|
||||
|
||||
$(select).on('select2:clear', function(e) {
|
||||
isCleared = true;
|
||||
setTimeout(function() {
|
||||
$(select).select2('close');
|
||||
success('');
|
||||
}, 0);
|
||||
});
|
||||
|
||||
$(select).on('select2:close', function() {
|
||||
if(isCleared) return;
|
||||
setTimeout(function() {
|
||||
success($(select).val());
|
||||
}, 100);
|
||||
@@ -672,19 +683,12 @@ function fn_initGrid() {
|
||||
title: '<span style="background-color: #FFFF00; padding: 2px 5px;">가공업체</span>',
|
||||
field: 'PROCESSING_VENDOR',
|
||||
editor: function(cell, onRendered, success, cancel, editorParams) {
|
||||
// Select2 에디터
|
||||
return createSelect2Editor(processingVendorList)(cell, onRendered, success, cancel, editorParams);
|
||||
},
|
||||
formatter: function(cell) {
|
||||
var value = cell.getValue();
|
||||
if(!value) return '';
|
||||
|
||||
// 저장된 값이 없으면 기본값 '0000008377'(RPS) 설정
|
||||
if(value === undefined || value === null || value === '') {
|
||||
value = '0000008377';
|
||||
cell.getRow().update({PROCESSING_VENDOR: value}, false);
|
||||
}
|
||||
|
||||
// OBJID로 업체명 조회하여 표시
|
||||
for(var i = 0; i < processingVendorList.length; i++) {
|
||||
if(processingVendorList[i].id == value) {
|
||||
return processingVendorList[i].text;
|
||||
|
||||
@@ -3172,7 +3172,7 @@ UPDATE SET
|
||||
0 AS ORDER_QTY,
|
||||
0 AS ITEM_QTY2,
|
||||
0 AS PRODUCTION_QTY,
|
||||
COALESCE(SRP.PROCESSING_VENDOR, '') AS PROCESSING_VENDOR,
|
||||
CASE WHEN SRP.PROCESSING_VENDOR IS NULL THEN '0000008377' ELSE SRP.PROCESSING_VENDOR END AS PROCESSING_VENDOR,
|
||||
NULL AS PROCESSING_DEADLINE,
|
||||
NULL AS GRINDING_DEADLINE,
|
||||
-- 구매 관련 컬럼 (SALES_REQUEST_PART에서 조회)
|
||||
@@ -3463,7 +3463,7 @@ SELECT
|
||||
G.RAW_MATERIAL_SPEC,
|
||||
G.RAW_MATERIAL,
|
||||
G.RAW_MATERIAL_SIZE AS SIZE,
|
||||
G.PROCESSING_VENDOR,
|
||||
CASE WHEN G.PROCESSING_VENDOR IS NULL THEN '0000008377' ELSE G.PROCESSING_VENDOR END AS PROCESSING_VENDOR,
|
||||
G.PROCESSING_DEADLINE,
|
||||
G.GRINDING_DEADLINE,
|
||||
G.REQUIRED_QTY,
|
||||
|
||||
Reference in New Issue
Block a user