diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_Audit/Chfee_AuditBL.js b/DSWeb/Areas/Account/Viewsjs/Chfee_Audit/Chfee_AuditBL.js index 45c7663a..804a3567 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_Audit/Chfee_AuditBL.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_Audit/Chfee_AuditBL.js @@ -2358,17 +2358,17 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, { }, { sortable: true, dataIndex: 'EXCHANGERATE', - text: 'EXCHANGE RATE', + text: 'EXRATE', renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '' + lsValue + ''; } } else { return value; } } catch (e) { return value; } return value; }, align: 'right', - width: 180 + width: 90 }, { sortable: true, dataIndex: 'POFITRATE', text: 'GROSS PROFIT RATE', renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '' + lsValue + ''; } } else { return value; } } catch (e) { return value; } return value; }, align: 'right', - width: 180 + width: 160 } ] }); @@ -2520,9 +2520,10 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, { _thisblaudit.storeAuditDetailList.load({ params: { condition: "BSNO='" + bsno + "'" } }); _thisblaudit.storeBLChFee.load({ params: { bsno: _thisblaudit.strMBSNO, SLNO, SLNO, bltype: bltype, optype: _thisblaudit.strOPTYPE } }); var bstextall = ""; - bstextall = bstextall + '集装箱:' + record.data.CNTRTOTAL; - bstextall = bstextall + ' 场站:' + record.data.YARD; - bstextall = bstextall + ' 船公司:' + record.data.CARRIER; + bstextall = bstextall + '箱量:' + record.data.CNTRTOTAL; + bstextall = bstextall + ' 提交人:' + record.data.BILLFEEOP; + bstextall = bstextall + ' 主提单号:' + record.data.MBLNO; + bstextall = bstextall + ' 委托编号:' + record.data.CUSTNO; Ext.getCmp("bstextall").setText(bstextall); //_thisblaudit.formHead.getForm().reset(); diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_invoice_HangXin/ChInvoiceAppEdit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_invoice_HangXin/ChInvoiceAppEdit.js index 27d697ec..540a7801 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_invoice_HangXin/ChInvoiceAppEdit.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_invoice_HangXin/ChInvoiceAppEdit.js @@ -1224,7 +1224,7 @@ Ext.extend(Shipping.MsChInvoiceAppEdit, Ext.Panel, { xtype: 'button', text: "模板1", handler: function (button, event) { - this.ImportRemarks('发票备注1'); + this.ImportRemarks('发票备注'); }, scope: this }] diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_invoice_HangXin/ChInvoiceapplicationAdd.js b/DSWeb/Areas/Account/Viewsjs/Chfee_invoice_HangXin/ChInvoiceapplicationAdd.js index 7274a827..6b09cdb8 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_invoice_HangXin/ChInvoiceapplicationAdd.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_invoice_HangXin/ChInvoiceapplicationAdd.js @@ -629,6 +629,13 @@ Ext.extend(Shipping.MsChInvoiceAppEdit, Ext.Panel, { } }], scope: this + }, '-', + { + text: "打印", + handler: function (button, event) { + this.PrintSelect(); + }, + scope: this } ] }); @@ -1990,6 +1997,40 @@ Ext.extend(Shipping.MsChInvoiceAppEdit, Ext.Panel, { }, + PrintSelect: function () { + + var selections = this.gridList.getSelectionModel().getSelection(); + if (selections.length == 0) { + Ext.Msg.show({ title: '提示', msg: '请先选择单据!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); + return; + } + + var feeGidSql = ''; + for (var i = 0; i < selections.length; i++) { + var record = selections[i]; + var feeGId = "'" + record.get('BILLNO') + "'"; + if (feeGidSql == '') { + feeGidSql = feeGId; + } else { + feeGidSql = feeGidSql + "," + feeGId; + } + }; + + var record = selections[0]; + var billNo = record.data.BILLNO; + + var printType = 'MSCHFEEINVOICEAPPLICATIONSEL'; + var sql1 = "SELECT p.*,(select ShowName from [user] where GID=p.APPLICANT) as APPLICANTNAME FROM ch_fee_invoiceapplication p WHERE p.BILLNO IN (" + feeGidSql + ") "; + var sql2 = ""; + + var sql3 = ""; + var sql4 = ""; + var sql5 = ""; + var sql6 = ""; + + PrintComm(printType, sql1, sql2, sql3, sql4, sql5, sql6); + }, + getCondition: function () { var form = this.formSearch.getForm(); if (!form.isValid()) {