|
|
@@ -83,9 +83,6 @@
|
|
|
<select name="ordDtlStat" id="ordDtlStat">
|
|
|
<option value="G013_20" selected>결제완료</option>
|
|
|
<option value="G013_30">상품준비중</option>
|
|
|
- <!-- <option value="G013_26">교환출고처지정</option>
|
|
|
- <option value="G013_35">입고확정</option> -->
|
|
|
- <option value="G013_55">출고완료</option>
|
|
|
</select>
|
|
|
</td>
|
|
|
</tr>
|
|
|
@@ -118,8 +115,7 @@
|
|
|
<li class="aR">
|
|
|
<button type="button" id="btnExcelDown" class="btn btn-info btn-lg">엑셀다운로드</button>
|
|
|
<button type="button" id="btnInvoiceExcelUpLoad" class="btn btn-success btn-lg">송장엑셀업로드</button>
|
|
|
- <!--결제 완료만 조회되는데 배송 준비중에서 송장번호 등록되어야하므로 비노출-->
|
|
|
- <!--<button type="button" id="btnSave" class="btn btn-success btn-lg">저장</button>-->
|
|
|
+ <button type="button" id="btnSave" class="btn btn-success btn-lg">저장</button>
|
|
|
</li>
|
|
|
</ul>
|
|
|
|
|
|
@@ -176,9 +172,8 @@ var columnDefs = [
|
|
|
{headerName: "주문수량", field:"ordQty", width:100, cellClass: 'text-center'},
|
|
|
{headerName: "주문금액", field:"ordAmt", width:100, cellClass: 'text-center'},
|
|
|
{headerName: "할인금액", field:"totDcAmt", width:100, cellClass: 'text-center'},
|
|
|
- {headerName: "실결제금액", field:"realOrdAmt", width:100, cellClass: 'text-center'}
|
|
|
- /* 결제 완료만 조회되는데 배송 준비중에서 송장번호 등록되어야하므로 비노출
|
|
|
- , {headerName: "배송업체", field:"shipCompCd", width:150, cellClass: 'text-left'
|
|
|
+ {headerName: "실결제금액", field:"realOrdAmt", width:100, cellClass: 'text-center'},
|
|
|
+ {headerName: "배송업체", field:"shipCompCd", width:150, cellClass: 'text-left'
|
|
|
, editable : true
|
|
|
, cellEditor : 'agRichSelectCellEditor'
|
|
|
, cellEditorParams : {
|
|
|
@@ -191,7 +186,7 @@ var columnDefs = [
|
|
|
return gagaAgGrid.lookupKey(shipCompanyList, params.newValue);
|
|
|
}
|
|
|
},
|
|
|
- {headerName: "송장", field:"invoiceNo", width:150, cellClass: 'text-left', editable : true}*/
|
|
|
+ {headerName: "송장", field:"invoiceNo", width:150, cellClass: 'text-left', editable : true}
|
|
|
];
|
|
|
|
|
|
var gridOptions = gagaAgGrid.getGridOptions(columnDefs);
|
|
|
@@ -274,6 +269,7 @@ var invoiceExcelUpload = function(result){
|
|
|
// 송장번호 저장후
|
|
|
var fnInvoiceSaveCollback = function(result){
|
|
|
mcxDialog.alert(result.msg);
|
|
|
+ fnSearch();
|
|
|
return;
|
|
|
}
|
|
|
|