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

12

Browse Source
DS7_HYRD
hanxuntao 1 year ago
parent ebe5fc95fe
commit d2ffeafdd2
7 changed files with 181 additions and 8 deletions
Show Stats Download Patch File Download Diff File

4
DSWeb/Areas/MvcShipping/Controllers/MsRptOpProfitController.cs
Unescape Escape View File

@ -46,6 +46,10 @@ namespace DSWeb.MvcShipping.Controllers
{
return View();
}
public ActionResult ViewIndex()
{
return View();
}
//
// GET：/RptMng/MsRptPcHeadQry/QryData

9
DSWeb/Areas/MvcShipping/Viewsjs/MsCodeFeeTemplate/MsCodeFeeTemplateEdit.js
Unescape Escape View File

@ -245,12 +245,15 @@ Ext.extend(Shipping.MsCodeFeeTemplateEdit, Ext.Panel, {
this.storeFeeNameRef = Ext.create('DsExt.ux.RefTableStore', {
model: 'DsShipping.ux.FeeTypeRefModel',
proxy: { url: '/MvcShipping/MsChFee/GetFeeTypeRefList' }
proxy: { url: '/MvcShipping/MsChFee/GetFeeTypeRefListNew' }
});
this.storeFeeNameRef.load({ params: { condition: ""} });
this.comboxFeeNameRef = Ext.create('DsExt.ux.RefTableCombox', {
this.storeFeeNameRef.load({ params: { condition: "" } });
this.comboxFeeNameRef = Ext.create('DsExt.ux.DCombox', {
store: this.storeFeeNameRef,
minChars: 1,
matchFieldWidth: false,
lazyRender: false,
forceSelection: true,
name: 'FEENAME',
valueField: 'Name',

9
DSWeb/Areas/MvcShipping/Viewsjs/MsCodeFeeTemplateAgent/MsCodeFeeTemplateAgentEdit.js
Unescape Escape View File

@ -203,12 +203,15 @@ Ext.extend(Shipping.MsCodeFeeTemplateAgentEdit, Ext.Panel, {
this.storeFeeNameRef = Ext.create('DsExt.ux.RefTableStore', {
model: 'DsShipping.ux.FeeTypeRefModel',
proxy: { url: '/MvcShipping/MsChFee/GetFeeTypeRefList' }
proxy: { url: '/MvcShipping/MsChFee/GetFeeTypeRefListNew' }
});
this.storeFeeNameRef.load({ params: { condition: ""} });
this.comboxFeeNameRef = Ext.create('DsExt.ux.RefTableCombox', {
this.storeFeeNameRef.load({ params: { condition: "" } });
this.comboxFeeNameRef = Ext.create('DsExt.ux.DCombox', {
store: this.storeFeeNameRef,
minChars: 1,
matchFieldWidth: false,
lazyRender: false,
forceSelection: true,
name: 'FEENAME',
valueField: 'Name',

7
DSWeb/Areas/MvcShipping/Viewsjs/MsCodeFeeTemplateAuto/MsCodeFeeTemplateEdit.js
Unescape Escape View File

@ -284,12 +284,15 @@ Ext.extend(Shipping.MsCodeFeeTemplateEdit, Ext.Panel, {
this.storeFeeNameRef = Ext.create('DsExt.ux.RefTableStore', {
model: 'DsShipping.ux.FeeTypeRefModel',
proxy: { url: '/MvcShipping/MsChFee/GetFeeTypeRefList' }
proxy: { url: '/MvcShipping/MsChFee/GetFeeTypeRefListNew' }
});
this.storeFeeNameRef.load({ params: { condition: ""} });
this.comboxFeeNameRef = Ext.create('DsExt.ux.RefTableCombox', {
this.comboxFeeNameRef = Ext.create('DsExt.ux.DCombox', {
store: this.storeFeeNameRef,
minChars: 1,
matchFieldWidth: false,
lazyRender: false,
forceSelection: true,
name: 'FEENAME',
valueField: 'Name',

12
DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOtherModel.js
Unescape Escape View File

@ -119,4 +119,16 @@ Ext.define('MsCodeOpService', {
{ name: 'OPTYPESTR', type: 'string' },
{ name: 'REMARK', type: 'string' }
]
});
Ext.define('CODE_BLTYPE', {
extend: 'Ext.data.Model',
idProperty: 'BLTYPE',
fields: [
{ name: 'BLTYPE', type: 'string' },
{ name: 'NOBILL', type: 'string' },
{ name: 'ENAME', type: 'string' },
{ name: 'COPYNOBILL', type: 'string' }
]
});

146
DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfit/MsRptOpProfitIndex.js
Unescape Escape View File

@ -47,6 +47,7 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
portloadlistsortdire: '',
bltypelistsortfield: '',
bltypelistsortdire: '',
sqlselect: '1=2',
initUIComponents: function () {
@ -2096,6 +2097,17 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
this.girdcolumssale = DsTruck.GetGridPanel(USERID, this.formname + 'sale', this.girdcolumssale, 1);
// this.gridListSale.reconfigure(this.storeSaleList, this.girdcolumssale);
this.gridListSale.addListener('itemdblclick', function (dataview, record, item, index, e, b) {
this.sqlselect = " B.SALE='" + record.data.SALE + "'";
var openSet = "height=700, width=1024, toolbar=no, menubar=no,scrollbars=1, resizable=1,location=no, status=no,Top= " + (screen.height - 750) / 2 + ",Left= " + (screen.width - 1100) / 2
var openType = "_blank";
var openUrl = "";
openUrl = "../MvcShipping/MsRptOpProfit/ViewIndex";
window.open(openUrl, openType, openSet);
// DsOpenEditWin("/TruckMng/MsWlPc/Edit");
}, this);
this.gridListSale.addListener('sortchange', function (ct, column, direction, eOpts) {
this.salelistsortfield = column.dataIndex;
@ -2760,6 +2772,17 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
});
// this.gridListCust.reconfigure(this.storeCustList, this.girdcolumscust);
this.gridListCust.addListener('itemdblclick', function (dataview, record, item, index, e, b) {
this.sqlselect = " B.CUSTOMERNAME='" + record.data.CUSTOMERNAME + "'";
var openSet = "height=700, width=1024, toolbar=no, menubar=no,scrollbars=1, resizable=1,location=no, status=no,Top= " + (screen.height - 750) / 2 + ",Left= " + (screen.width - 1100) / 2
var openType = "_blank";
var openUrl = "";
openUrl = "../MvcShipping/MsRptOpProfit/ViewIndex";
window.open(openUrl, openType, openSet);
// DsOpenEditWin("/TruckMng/MsWlPc/Edit");
}, this);
this.gridListCust.addListener('sortchange', function (ct, column, direction, eOpts) {
this.custlistsortfield = column.dataIndex;
this.custlistsortdire = direction;
@ -3422,6 +3445,16 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
})
});
// this.gridListCust.reconfigure(this.storeCustList, this.girdcolumscust);
this.gridListCarrier.addListener('itemdblclick', function (dataview, record, item, index, e, b) {
this.sqlselect = " B.CARRIER='" + record.data.CARRIER + "'";
var openSet = "height=700, width=1024, toolbar=no, menubar=no,scrollbars=1, resizable=1,location=no, status=no,Top= " + (screen.height - 750) / 2 + ",Left= " + (screen.width - 1100) / 2
var openType = "_blank";
var openUrl = "";
openUrl = "../MvcShipping/MsRptOpProfit/ViewIndex";
window.open(openUrl, openType, openSet);
// DsOpenEditWin("/TruckMng/MsWlPc/Edit");
}, this);
this.gridListCarrier.addListener('sortchange', function (ct, column, direction, eOpts) {
this.carrierlistsortfield = column.dataIndex;
@ -4082,6 +4115,17 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
});
// this.gridListCust.reconfigure(this.storeCustList, this.girdcolumscust);
this.gridListForwarder.addListener('itemdblclick', function (dataview, record, item, index, e, b) {
this.sqlselect = " B.FORWARDER='" + record.data.FORWARDER + "'";
var openSet = "height=700, width=1024, toolbar=no, menubar=no,scrollbars=1, resizable=1,location=no, status=no,Top= " + (screen.height - 750) / 2 + ",Left= " + (screen.width - 1100) / 2
var openType = "_blank";
var openUrl = "";
openUrl = "../MvcShipping/MsRptOpProfit/ViewIndex";
window.open(openUrl, openType, openSet);
// DsOpenEditWin("/TruckMng/MsWlPc/Edit");
}, this);
this.gridListForwarder.addListener('sortchange', function (ct, column, direction, eOpts) {
this.forwarderlistsortfield = column.dataIndex;
this.forwarderlistsortdire = direction;
@ -4766,7 +4810,16 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
this.girdcolumsdept = DsTruck.GetGridPanel(USERID, this.formname + 'dept', this.girdcolumsdept, 1);
// this.gridListDept.reconfigure(this.storeDeptList, this.girdcolumsdept);
this.gridListDept.addListener('itemdblclick', function (dataview, record, item, index, e, b) {
this.sqlselect = " B.SALE IN (SELECT SHOWNAME FROM VW_user WHERE DEPTNAME='" + record.data.SALEDEPT + "')";
var openSet = "height=700, width=1024, toolbar=no, menubar=no,scrollbars=1, resizable=1,location=no, status=no,Top= " + (screen.height - 750) / 2 + ",Left= " + (screen.width - 1100) / 2
var openType = "_blank";
var openUrl = "";
openUrl = "../MvcShipping/MsRptOpProfit/ViewIndex";
window.open(openUrl, openType, openSet);
// DsOpenEditWin("/TruckMng/MsWlPc/Edit");
}, this);
this.gridListDept.addListener('sortchange', function (ct, column, direction, eOpts) {
this.deptlistsortfield = column.dataIndex;
this.deptlistsortdire = direction;
@ -5449,6 +5502,17 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
})
});
this.gridListOp.addListener('itemdblclick', function (dataview, record, item, index, e, b) {
this.sqlselect = " B.OP='" + record.data.SALEDEPT + "'";
var openSet = "height=700, width=1024, toolbar=no, menubar=no,scrollbars=1, resizable=1,location=no, status=no,Top= " + (screen.height - 750) / 2 + ",Left= " + (screen.width - 1100) / 2
var openType = "_blank";
var openUrl = "";
openUrl = "../MvcShipping/MsRptOpProfit/ViewIndex";
window.open(openUrl, openType, openSet);
// DsOpenEditWin("/TruckMng/MsWlPc/Edit");
}, this);
this.gridListOp.addListener('sortchange', function (ct, column, direction, eOpts) {
this.oplistsortfield = column.dataIndex;
this.oplistsortdire = direction;
@ -6121,6 +6185,16 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
emptyMsg: Zi.LAN.emptyMsg
})
});
this.gridListOpDept.addListener('itemdblclick', function (dataview, record, item, index, e, b) {
this.sqlselect = " B.OP IN (SELECT SHOWNAME FROM VW_user WHERE DEPTNAME='" + record.data.OPDEPT + "')";
var openSet = "height=700, width=1024, toolbar=no, menubar=no,scrollbars=1, resizable=1,location=no, status=no,Top= " + (screen.height - 750) / 2 + ",Left= " + (screen.width - 1100) / 2
var openType = "_blank";
var openUrl = "";
openUrl = "../MvcShipping/MsRptOpProfit/ViewIndex";
window.open(openUrl, openType, openSet);
// DsOpenEditWin("/TruckMng/MsWlPc/Edit");
}, this);
this.gridListOpDept.addListener('sortchange', function (ct, column, direction, eOpts) {
this.opdeptlistsortfield = column.dataIndex;
@ -6800,7 +6874,16 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
});
// this.gridListBsSource.reconfigure(this.storeBsSourceList, this.girdcolumsbssource);
this.gridListBsSource.addListener('itemdblclick', function (dataview, record, item, index, e, b) {
this.sqlselect = " B.BSSOURCE='" + record.data.BSSOURCE + "'";
var openSet = "height=700, width=1024, toolbar=no, menubar=no,scrollbars=1, resizable=1,location=no, status=no,Top= " + (screen.height - 750) / 2 + ",Left= " + (screen.width - 1100) / 2
var openType = "_blank";
var openUrl = "";
openUrl = "../MvcShipping/MsRptOpProfit/ViewIndex";
window.open(openUrl, openType, openSet);
// DsOpenEditWin("/TruckMng/MsWlPc/Edit");
}, this);
this.gridListBsSource.addListener('sortchange', function (ct, column, direction, eOpts) {
this.bssourcelistsortfield = column.dataIndex;
@ -7489,7 +7572,16 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
this.girdcolumsbssourcedetail = DsTruck.GetGridPanel(USERID, this.formname + 'bssourcedetail', this.girdcolumsbssourcedetail, 1);
// this.gridListBsSourceDetail.reconfigure(this.storeBsSourceDetailList, this.girdcolumsbssourcedetail);
this.gridListBsSourceDetail.addListener('itemdblclick', function (dataview, record, item, index, e, b) {
this.sqlselect = " B.BSSOURCE='" + record.data.BSSOURCE + "' AND B.BSSOURCEDETAIL='" + record.data.BSSOURCEDETAIL+"'";
var openSet = "height=700, width=1024, toolbar=no, menubar=no,scrollbars=1, resizable=1,location=no, status=no,Top= " + (screen.height - 750) / 2 + ",Left= " + (screen.width - 1100) / 2
var openType = "_blank";
var openUrl = "";
openUrl = "../MvcShipping/MsRptOpProfit/ViewIndex";
window.open(openUrl, openType, openSet);
// DsOpenEditWin("/TruckMng/MsWlPc/Edit");
}, this);
this.gridListBsSourceDetail.addListener('sortchange', function (ct, column, direction, eOpts) {
this.bssourcedetaillistsortfield = column.dataIndex;
this.bssourcedetaillistsortdire = direction;
@ -8170,7 +8262,16 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
});
this.girdcolumslane = DsTruck.GetGridPanel(USERID, this.formname + 'lane', this.girdcolumslane, 1);
// this.gridListBsSourceDetail.reconfigure(this.storeBsSourceDetailList, this.girdcolumsbssourcedetail);
this.gridListLane.addListener('itemdblclick', function (dataview, record, item, index, e, b) {
this.sqlselect = " B.LANE='" + record.data.LANE + "' ";
var openSet = "height=700, width=1024, toolbar=no, menubar=no,scrollbars=1, resizable=1,location=no, status=no,Top= " + (screen.height - 750) / 2 + ",Left= " + (screen.width - 1100) / 2
var openType = "_blank";
var openUrl = "";
openUrl = "../MvcShipping/MsRptOpProfit/ViewIndex";
window.open(openUrl, openType, openSet);
// DsOpenEditWin("/TruckMng/MsWlPc/Edit");
}, this);
this.gridListLane.addListener('sortchange', function (ct, column, direction, eOpts) {
this.lanelistsortfield = column.dataIndex;
@ -8831,7 +8932,16 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
});
this.girdcolumsport = DsTruck.GetGridPanel(USERID, this.formname + 'port', this.girdcolumsport, 1);
// this.gridListBsSourceDetail.reconfigure(this.storeBsSourceDetailList, this.girdcolumsbssourcedetail);
this.gridListPort.addListener('itemdblclick', function (dataview, record, item, index, e, b) {
this.sqlselect = " B.PORTDISCHARGE='" + record.data.PORTDISCHARGE + "' ";
var openSet = "height=700, width=1024, toolbar=no, menubar=no,scrollbars=1, resizable=1,location=no, status=no,Top= " + (screen.height - 750) / 2 + ",Left= " + (screen.width - 1100) / 2
var openType = "_blank";
var openUrl = "";
openUrl = "../MvcShipping/MsRptOpProfit/ViewIndex";
window.open(openUrl, openType, openSet);
// DsOpenEditWin("/TruckMng/MsWlPc/Edit");
}, this);
this.gridListPort.addListener('sortchange', function (ct, column, direction, eOpts) {
this.portlistsortfield = column.dataIndex;
@ -9514,7 +9624,16 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
});
this.girdcolumsportload = DsTruck.GetGridPanel(USERID, this.formname + 'portload', this.girdcolumsportload, 1);
// this.gridListBsSourceDetail.reconfigure(this.storeBsSourceDetailList, this.girdcolumsbssourcedetail);
this.gridListPortLoad.addListener('itemdblclick', function (dataview, record, item, index, e, b) {
this.sqlselect = " B.PORTLOAD='" + record.data.PORTLOAD + "' ";
var openSet = "height=700, width=1024, toolbar=no, menubar=no,scrollbars=1, resizable=1,location=no, status=no,Top= " + (screen.height - 750) / 2 + ",Left= " + (screen.width - 1100) / 2
var openType = "_blank";
var openUrl = "";
openUrl = "../MvcShipping/MsRptOpProfit/ViewIndex";
window.open(openUrl, openType, openSet);
// DsOpenEditWin("/TruckMng/MsWlPc/Edit");
}, this);
this.gridListPortLoad.addListener('sortchange', function (ct, column, direction, eOpts) {
this.portloadlistsortfield = column.dataIndex;
@ -10199,7 +10318,16 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
});
this.girdcolumsdoc = DsTruck.GetGridPanel(USERID, this.formname + 'doc', this.girdcolumsdoc, 1);
// this.gridListBsSourceDetail.reconfigure(this.storeBsSourceDetailList, this.girdcolumsbssourcedetail);
this.gridListDoc.addListener('itemdblclick', function (dataview, record, item, index, e, b) {
this.sqlselect = " B.DOC='" + record.data.DOC + "' ";
var openSet = "height=700, width=1024, toolbar=no, menubar=no,scrollbars=1, resizable=1,location=no, status=no,Top= " + (screen.height - 750) / 2 + ",Left= " + (screen.width - 1100) / 2
var openType = "_blank";
var openUrl = "";
openUrl = "../MvcShipping/MsRptOpProfit/ViewIndex";
window.open(openUrl, openType, openSet);
// DsOpenEditWin("/TruckMng/MsWlPc/Edit");
}, this);
this.gridListDoc.addListener('sortchange', function (ct, column, direction, eOpts) {
this.doclistsortfield = column.dataIndex;
@ -10883,7 +11011,16 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
});
this.girdcolumscustservice = DsTruck.GetGridPanel(USERID, this.formname + 'custservice', this.girdcolumscustservice, 1);
// this.gridListBsSourceDetail.reconfigure(this.storeBsSourceDetailList, this.girdcolumsbssourcedetail);
this.gridListCustService.addListener('itemdblclick', function (dataview, record, item, index, e, b) {
this.sqlselect = " B.CUSTSERVICE='" + record.data.CUSTSERVICE + "' ";
var openSet = "height=700, width=1024, toolbar=no, menubar=no,scrollbars=1, resizable=1,location=no, status=no,Top= " + (screen.height - 750) / 2 + ",Left= " + (screen.width - 1100) / 2
var openType = "_blank";
var openUrl = "";
openUrl = "../MvcShipping/MsRptOpProfit/ViewIndex";
window.open(openUrl, openType, openSet);
// DsOpenEditWin("/TruckMng/MsWlPc/Edit");
}, this);
this.gridListCustService.addListener('sortchange', function (ct, column, direction, eOpts) {
this.custservicelistsortfield = column.dataIndex;
@ -11566,7 +11703,16 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
});
this.girdcolumsbltype = DsTruck.GetGridPanel(USERID, this.formname + 'bltype', this.girdcolumsbltype, 1);
// this.gridListBsSourceDetail.reconfigure(this.storeBsSourceDetailList, this.girdcolumsbssourcedetail);
this.gridListBltype.addListener('itemdblclick', function (dataview, record, item, index, e, b) {
this.sqlselect = " B.BLTYPE='" + record.data.BLTYPE + "' ";
var openSet = "height=700, width=1024, toolbar=no, menubar=no,scrollbars=1, resizable=1,location=no, status=no,Top= " + (screen.height - 750) / 2 + ",Left= " + (screen.width - 1100) / 2
var openType = "_blank";
var openUrl = "";
openUrl = "../MvcShipping/MsRptOpProfit/ViewIndex";
window.open(openUrl, openType, openSet);
// DsOpenEditWin("/TruckMng/MsWlPc/Edit");
}, this);
this.gridListBltype.addListener('sortchange', function (ct, column, direction, eOpts) {
this.bltypelistsortfield = column.dataIndex;

2
DSWeb/DSWeb.csproj
Unescape Escape View File

@ -1777,6 +1777,7 @@
<Content Include="Areas\MvcShipping\Viewsjs\MsRptOpProfitPerCent\Zi_zh-cn.js" />
<Content Include="Areas\MvcShipping\Viewsjs\MsRptOpProfitZou\Zi_en-us.js" />
<Content Include="Areas\MvcShipping\Viewsjs\MsRptOpProfitZou\Zi_zh-cn.js" />
<Content Include="Areas\MvcShipping\Viewsjs\MsRptOpProfit\MsRptProfitViewIndex.js" />
<Content Include="Areas\MvcShipping\Viewsjs\MsRptOpProfit\MsRptZjTotalIndex.js" />
<Content Include="Areas\MvcShipping\Viewsjs\MsRptOpProfit\Zi_en-us.js" />
<Content Include="Areas\MvcShipping\Viewsjs\MsRptOpProfit\Zi_zh-cn.js" />
@ -2867,6 +2868,7 @@
<Content Include="Areas\MvcShipping\Views\MsRptOpBsList\OpXsIndex2.aspx" />
<Content Include="Areas\MvcShipping\Views\MsRptOpBsList\OpXsIndex.aspx" />
<Content Include="Areas\MvcShipping\Views\MsRptOpProfitFee\Index.aspx" />
<Content Include="Areas\MvcShipping\Views\MsRptOpProfit\ViewIndex.aspx" />
<Content Include="Areas\MvcShipping\Views\MsRptOpProfit\ZJIndex.aspx" />
<Content Include="Areas\MvcShipping\Views\MsRptSaleBalProfitShare\TCIndex.aspx" />
<Content Include="Areas\MvcShipping\Views\MsRptSaleBalProfitShare\TBIndex.aspx" />

Write Preview
Loading…
Cancel
Save