dengyu
/
DS7
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

1

Browse Source
DS7Zhanhao
hanxuntao 2 years ago
parent 6626a76cf6
commit 8c0d5375a5
7 changed files with 131 additions and 37 deletions
Show Stats Download Patch File Download Diff File

2
DSWeb/Areas/Account/Controllers/Chfee_lockController.cs
Unescape Escape View File

@ -122,7 +122,7 @@ namespace DSWeb.Areas.Account.Controllers
strSql.Append(",case B.ETD when '1900-01-01 00:00:00.000' then '' else CONVERT(varchar(100), B.ETD,23) end as ETD,B.ETA");
strSql.Append(",case B.OPDATE when '1900-01-01 00:00:00.000' then '' else CONVERT(varchar(100), B.OPDATE,23) end as OPDATE,B.ENTERP");
strSql.Append(",case B.CUSTOMDATE when '1900-01-01 00:00:00.000' then '' else CONVERT(varchar(100), B.CUSTOMDATE,23) end as CUSTOMDATE,B.CARGOID,B.DCLASS");
strSql.Append(",B.CUSTSERVICE, B.PORTLOAD, B.PORTDISCHARGE, B.CUSTOMNO, B.ACCDATE,B.CARRIER, B.BSSOURCE,B.BSSOURCEDETAIL, B.LANE, B.FORWARDER,B.NETWEIGHT,B.KGS,B.TEU,B.CNTRTOTAL,B.CORPID");
strSql.Append(",B.CUSTSERVICE,B.FRCUSTSERVICE, B.PORTLOAD, B.PORTDISCHARGE, B.CUSTOMNO, B.ACCDATE,B.CARRIER, B.BSSOURCE,B.BSSOURCEDETAIL, B.LANE, B.FORWARDER,B.NETWEIGHT,B.KGS,B.TEU,B.CNTRTOTAL,B.CORPID");
strSql.Append(",B.CNTR1,B.CNTR2,B.CNTR3,B.CNTR4,B.CNTR5,B.CNTR6,B.CNTR7,B.CNTR8,B.CNTR9,B.CNTR10,B.OTCNTR,B.TRADETYPE,B.GOODSNAME,B.ISPRINTPR,B.REMARK,B.REMARK2,B.YARD,B.SALEDEPT");

76
DSWeb/Areas/Account/Viewsjs/Chfee_invoice_HangXin/ChInvoiceIndex.js
Unescape Escape View File

@ -12,6 +12,8 @@ Ext.extend(Shipping.MsChInvoiceIndex, Ext.Panel, {
OprationStatus: null, //仅当弹出界面时使用
SelectedRecord: null,
sqlcontext: '',
sortfield: '',
sortdire: '',
initUIComponents: function () {
@ -499,7 +501,10 @@ Ext.extend(Shipping.MsChInvoiceIndex, Ext.Panel, {
this.girdcolums = DsTruck.GetGridPanel(USERID, this.formname, this.girdcolums, 1); //使用者id，表名，中间column数组，跳过一开始的几列
this.girdcolums.unshift(new Ext.grid.RowNumberer());
this.gridList.reconfigure(this.storeList, this.girdcolums);
this.gridList.addListener('sortchange', function (ct, column, direction, eOpts) {
this.sortfield = column.dataIndex;
this.sortdire = direction;
}, this);
//#region formSearch
this.storeCompany = Ext.create('DsExt.ux.RefTableStore', {
@ -1822,25 +1827,81 @@ Ext.extend(Shipping.MsChInvoiceIndex, Ext.Panel, {
});
},
//Print: function () {
// _this = this;
// if (this.storeList.getCount() == 0) {
// return;
// }
// Ext.Msg.wait('正在组织数据, 请稍侯..');
// Ext.Ajax.request({
// waitMsg: '正在组织数据...',
// url: '/Account/Chfee_invoice_HangXin/GetDataListStr',
// //(int start, int limit, string sort, string condition, int billtype)
// scope: this,
// params: {
// start: 0,
// limit: 10000000,
// sort: "",
// condition: _this.sqlcontext,
// billtype:0
// },
// callback: function (options, success, response) {
// if (success) {
// Ext.MessageBox.hide();
// var jsonresult = Ext.JSON.decode(response.responseText);
// if (jsonresult.Success) {
// var returnstr = jsonresult.data;
// var printType = 'MSINVOICELIST';
// var sql1 = returnstr;
// var sql2 = "";
// var sql3 = "";
// var sql4 = "";
// var sql5 = "";
// var sql6 = "";
// PrintComm(printType, sql1, sql2, sql3, sql4, sql5, sql6);
// } else {
// Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
// }
// } else {
// Ext.Msg.show({ title: '请重试',
// msg: '服务器响应出错',
// icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
// });
// }
// }
// });
//},
Print: function () {
_this = this;
if (this.storeList.getCount() == 0) {
return;
}
var sortstr = ' OPERATETIME DESC ';
if (this.sortfield != '' && this.sortdire != '') {
sortstr = this.sortfield + ' ' + this.sortdire;
}
Ext.Msg.wait('正在组织数据, 请稍侯..');
Ext.Ajax.request({
waitMsg: '正在组织数据...',
url: '/Account/Chfee_invoice_HangXin/GetDataListStr',
url: '/Account/Chfee_invoice/GetDataListStr',
//(int start, int limit, string sort, string condition, int billtype)
scope: this,
params: {
start: 0,
limit: 10000000,
sort: "",
condition: _this.sqlcontext,
billtype:0
billtype: 1,
sort: sortstr,
condition: _this.sqlcontext
},
callback: function (options, success, response) {
if (success) {
@ -1862,7 +1923,8 @@ Ext.extend(Shipping.MsChInvoiceIndex, Ext.Panel, {
Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
}
} else {
Ext.Msg.show({ title: '请重试',
Ext.Msg.show({
title: '请重试',
msg: '服务器响应出错',
icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
});
@ -1870,8 +1932,6 @@ Ext.extend(Shipping.MsChInvoiceIndex, Ext.Panel, {
}
});
},
PrintSelect: function () {
var selections = this.gridList.getSelectionModel().getSelection();

8
DSWeb/Areas/Account/Viewsjs/Chfee_lock/Chfee_lock.js
Unescape Escape View File

@ -81,6 +81,7 @@ Ext.extend(Shipping.MsChfeelock, Ext.Panel, {
{ name: 'OP', type: 'string' },
{ name: 'DOC', type: 'string' },
{ name: 'CUSTSERVICE', type: 'string' },
{ name: 'FRCUSTSERVICE', type: 'string' },
{ name: 'PORTLOAD', type: 'string' },
{ name: 'PORTDISCHARGE', type: 'string' },
{ name: 'CUSTOMNO', type: 'string' },
@ -551,7 +552,12 @@ Ext.extend(Shipping.MsChfeelock, Ext.Panel, {
dataIndex: 'CUSTSERVICE',
header: '客服',
width: 80
}, {
}, {
sortable: true,
dataIndex: 'FRCUSTSERVICE',
header: '海外客服',
width: 80
}, {
sortable: true,
dataIndex: 'PORTLOAD',
header: '起运港',

24
DSWeb/Areas/MvcContainer/Viewsjs/MsOpCtnr/MsOpCtnrSellEdit.js
Unescape Escape View File

@ -129,28 +129,14 @@ Ext.extend(Shipping.MsOpCtnrSellEdit, Ext.Panel, {
//箱源
Ext.define('CNTRSOURCEmb', {
extend: 'Ext.data.Model',
fields: [
{ name: 'CNTRSOURCE', type: 'string' }
]
});
var CNTRSOURCEData = [
{ "CNTRSOURCE": "自备箱" }, { "CNTRSOURCE": "长租箱" }, { "CNTRSOURCE": "短租箱" }, { "CNTRSOURCE": "租买箱" }, { "CNTRSOURCE": "ONEWAY" }];
this.storeCNTRSOURCE = Ext.create('Ext.data.Store', {
model: 'CNTRSOURCEmb',
data: CNTRSOURCEData
});
this.storeCNTRSOURCE = Ext.create('DsExt.ux.RefEnumStore', {});
this.storeCNTRSOURCE.load({ params: { enumTypeId: 97015 } });
this.comboxCNTRSOURCE = Ext.create('DsExt.ux.RefEnumCombox', {
fieldLabel: '箱源',
forceSelection: true,
store: this.storeCNTRSOURCE,
fieldLabel: '箱源',
name: 'CNTRSOURCE',
// allowBlank: false,
valueField: 'CNTRSOURCE',
displayField: 'CNTRSOURCE'
valueField: 'EnumValueName',
displayField: 'EnumValueName'
});
this.comboxCNTRSOURCEDetail = Ext.create('DsExt.ux.RefEnumCombox', {

8
DSWeb/Areas/MvcShipping/Controllers/MsRptInvTotalController.cs
Unescape Escape View File

@ -97,7 +97,7 @@ namespace DSWeb.MvcShipping.Controllers
}
else if (feerang == "2")
{
strSql.Append(" and ISNULL(F.INVOICE,0)<>F.AMOUNT ");
strSql.Append(" and ISNULL(F.INVOICE,0)<>F.AMOUNT and ISNULL(F.ISINVOICE,0)=0 ");
}
else if (feerang == "3")
{
@ -105,11 +105,11 @@ namespace DSWeb.MvcShipping.Controllers
}
else if (feerang == "4")
{
strSql.Append(" and ISNULL(F.SETTLEMENT,0)<>0 AND ((F.AMOUNT>0 and ISNULL(F.SETTLEMENT,0)>ISNULL(F.INVOICE,0)) or (F.AMOUNT<0 and ISNULL(F.SETTLEMENT,0)<ISNULL(F.INVOICE,0))) ");
strSql.Append(" and ISNULL(F.SETTLEMENT,0)<>0 and ISNULL(F.ISINVOICE,0)=0 AND ((F.AMOUNT>0 and ISNULL(F.SETTLEMENT,0)>ISNULL(F.INVOICE,0)) or (F.AMOUNT<0 and ISNULL(F.SETTLEMENT,0)<ISNULL(F.INVOICE,0))) ");
}
else if (feerang == "5")
{
strSql.Append(" and ISNULL(F.SETTLEMENT,0)=0 AND ISNULL(F.INVOICE,0)=0 and ISNULL(F.ORDERINVOICE,0)=0 and F.FEETYPE=1 ");
strSql.Append(" and ISNULL(F.SETTLEMENT,0)=0 and ISNULL(F.ISINVOICE,0)=0 AND ISNULL(F.INVOICE,0)=0 and ISNULL(F.ORDERINVOICE,0)=0 and F.FEETYPE=1 ");
}
else if (feerang == "6")
{
@ -117,7 +117,7 @@ namespace DSWeb.MvcShipping.Controllers
}
else if (feerang == "7")
{
strSql.Append(" and ISNULL(F.SETTLEMENT,0)=0 AND ISNULL(F.INVOICE,0)=0 and F.FEETYPE=1 ");
strSql.Append(" and ISNULL(F.SETTLEMENT,0)=0 AND ISNULL(F.INVOICE,0)=0 and ISNULL(F.ISINVOICE,0)=0 and F.FEETYPE=1 ");
}
}

46
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpBillLSEdit.js
Unescape Escape View File

@ -1854,7 +1854,29 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, {
}
],
scope: this
}]
}, '-', {
text: 'OCR', //快速录入,
handler: function (button, event) {
if (this.panelOcr.isHidden()) {
mainform.tabtree.hide();
if (this.panelOcr.width < 2) {
var wSeaePanel = this.panelpage.getWidth();
this.panelOcr.setWidth(wSeaePanel * 0.6);
}
this.panelOcr.body.dom.children[0].src = "/MvcShipping/Ocr/UpOcrAuto";
this.panelOcr.show();
} else {
mainform.tabtree.show();
this.panelOcr.hide();
}
},
scope: this
}]
}); //end 按钮Toolbar
//#endregion
@ -2408,6 +2430,26 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, {
}]
});
this.panelOcr = new Ext.Panel({
title: 'OCR',
id: 'panelbillOcr',
width: 0,
visible: false,
region: 'east',
animate: true,
autoScroll: true,
split: true,
closeAction: 'hide',
closable: true,
html: '<iframe src="" width="100%" height="100%"></iframe>'
});
this.panelOcr.on({
hide: function () {
mainform.tabtree.show();
},
scope: this
});
this.panelbill = new Ext.Panel({
layout: "border",
@ -2451,7 +2493,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, {
Ext.apply(this, {
items: [this.panelBtn, this.panellist, this.panelpage]
items: [this.panelBtn, this.panellist, this.panelpage, this.panelOcr]
});
//#endregion

4
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeFeeIndex.js
Unescape Escape View File

@ -8649,9 +8649,9 @@ Ext.extend(Shipping.MsOpSeaeFeeIndex, Ext.Panel, {
//到港日期
var ETDbgn = form.findField('ETDbgn').getRawValue();
sql = sql + getAndConSql(sql, ETDbgn, "B.ETD >='" + ETDbgn + "'");
sql = sql + getAndConSql(sql, ETDbgn, "B.ATD >='" + ETDbgn + "'");
var ETDend = form.findField('ETDend').getRawValue();
sql = sql + getAndConSql(sql, ETDend, "B.ETD <='" + ETDend + "'");
sql = sql + getAndConSql(sql, ETDend, "B.ATD <='" + ETDend + "'");
//操作人

Write Preview
Loading…
Cancel
Save