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

Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev

Browse Source
YingHang
hanxuntao 9 months ago
parent f5fe003489 93362235a3
commit 42493f530e
6 changed files with 114 additions and 30 deletions
Show Stats Download Patch File Download Diff File

66
DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPayAppBLsettlementEdit.js
Unescape Escape View File

@ -33,6 +33,8 @@ Ext.extend(Shipping.MsChPayAppSettlementEdit, Ext.Panel, {
this.sqlcontext = '';
this.formname = "MsChPayAppSettlementEdit"; //页面名称
parentWin = window.parent.opener;
mainWin = getMainForm(parentWin);
this.storeMustBe = Ext.create('Ext.data.Store', {
model: 'DsShipping.ux.OpDefValue',
@ -1311,6 +1313,39 @@ Ext.extend(Shipping.MsChPayAppSettlementEdit, Ext.Panel, {
this.girdfeecolums = this.initgirdfeecolums;
var addDetailMenu = [
{
text: Zi.LAN.AllApplyAmount,
handler: function (menu, event) {
_this.onAddDetailClick(menu, event, '');
}
}
];
var CurrList = mainWin.GetPubStore("SelectCurr").data;
CurrList.each(function (record) {
//jsonArray.push(record.get('ORGID'));
//alert(strLANGUAGES);//zh-cn
var data = record.data;
var text = data.EnumValueName;
if (strLANGUAGES == "en-us") {
text = data.EnumValueName_2
}
var curr = data.EnumValueId;
if (curr != "") {
addDetailMenu.push(
{
text: text,
handler: function (menu, event) {
_this.onAddDetailClick(menu, event, curr);
}
}
)
}
});
this.gridAddFeeList = new Ext.grid.GridPanel({
store: this.storeAddFeeList,
enableHdMenu: false,
@ -1329,20 +1364,23 @@ Ext.extend(Shipping.MsChPayAppSettlementEdit, Ext.Panel, {
text: Zi.LAN.AddApplyDetail,
id: "btnadddetail",
iconCls: 'btnadddetail',
menu: [
{ text: Zi.LAN.AllApplyAmount,
handler: function (menu, event) {
_this.onAddDetailClick(menu, event, '');
}
}, { text: Zi.LAN.OnlyRMBApplyAmount,
handler: function (menu, event) {
_this.onAddDetailClick(menu, event, 'RMB');
}
}, { text: Zi.LAN.OnlyUSDApplyAmount,
handler: function (menu, event) {
_this.onAddDetailClick(menu, event, 'USD');
}
}],
menu: addDetailMenu,
// [
// { text: Zi.LAN.AllApplyAmount,
// handler: function (menu, event) {
// _this.onAddDetailClick(menu, event, '');
// }
// }, { text: Zi.LAN.OnlyRMBApplyAmount,
// handler: function (menu, event) {
// _this.onAddDetailClick(menu, event, 'RMB');
// }
// }, { text: Zi.LAN.OnlyUSDApplyAmount,
// handler: function (menu, event) {
// _this.onAddDetailClick(menu, event, 'USD');
// }
// }
//],
scope: this
}, '-', {

66
DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChRecvAppBLsettlementEdit.js
Unescape Escape View File

@ -33,6 +33,9 @@ Ext.extend(Shipping.MsChRecvAppSettlementEdit, Ext.Panel, {
this.sqlcontext = '';
this.formname = "MsChRecvAppSettlementEdit"; //页面名称
parentWin = window.parent.opener;
mainWin = getMainForm(parentWin);
this.storeMustBe = Ext.create('Ext.data.Store', {
model: 'DsShipping.ux.OpDefValue',
remoteSort: true,
@ -1100,6 +1103,39 @@ Ext.extend(Shipping.MsChRecvAppSettlementEdit, Ext.Panel, {
this.girdfeecolums = this.initgirdfeecolums;
var addDetailMenu = [
{
text: Zi.LAN.AllApplyAmount,
handler: function (menu, event) {
_this.onAddDetailClick(menu, event, '');
}
}
];
var CurrList = mainWin.GetPubStore("SelectCurr").data;
CurrList.each(function (record) {
//jsonArray.push(record.get('ORGID'));
//alert(strLANGUAGES);//zh-cn
var data = record.data;
var text = data.EnumValueName;
if (strLANGUAGES == "en-us") {
text = data.EnumValueName_2
}
var curr = data.EnumValueId;
if (curr != "") {
addDetailMenu.push(
{
text: text,
handler: function (menu, event) {
_this.onAddDetailClick(menu, event, curr);
}
}
)
}
});
this.gridAddFeeList = new Ext.grid.GridPanel({
store: this.storeAddFeeList,
enableHdMenu: false,
@ -1118,20 +1154,22 @@ Ext.extend(Shipping.MsChRecvAppSettlementEdit, Ext.Panel, {
text: Zi.LAN.AddApplyDetail ,
id: "btnadddetail",
iconCls: 'btnadddetail',
menu: [
{ text: Zi.LAN.AllApplyAmount,
handler: function (menu, event) {
_this.onAddDetailClick(menu, event, '');
}
}, { text: Zi.LAN.OnlyRMBApplyAmount,
handler: function (menu, event) {
_this.onAddDetailClick(menu, event, 'RMB');
}
}, { text: Zi.LAN.OnlyUSDApplyAmount,
handler: function (menu, event) {
_this.onAddDetailClick(menu, event, 'USD');
}
}],
menu: addDetailMenu,
//[
// { text: Zi.LAN.AllApplyAmount,
// handler: function (menu, event) {
// _this.onAddDetailClick(menu, event, '');
// }
// }, { text: Zi.LAN.OnlyRMBApplyAmount,
// handler: function (menu, event) {
// _this.onAddDetailClick(menu, event, 'RMB');
// }
// }, { text: Zi.LAN.OnlyUSDApplyAmount,
// handler: function (menu, event) {
// _this.onAddDetailClick(menu, event, 'USD');
// }
// }],
scope: this
}, '-', {

2
DSWeb/Areas/Dispatch/Controllers/WxAppController.cs
Unescape Escape View File

@ -1877,7 +1877,7 @@ namespace DSWeb.Areas.Dispatch.Controllers
//{
// "中石油","中石化","金盾","大象"
//};
var jyzlistList = cdc.tSysEnumValue.Where(x => x.EnumTypeID == 7001).ToList();
var jyzlistList = cdc.tSysEnumValue.Where(x => x.EnumTypeID == 7001).OrderBy(o=>o.DispIndex).ThenBy(o=>o.EnumValueID).ToList();
var jyzlist = jyzlistList.Select(s => s.EnumValueID).ToArray();

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

@ -1048,6 +1048,9 @@ Ext.extend(Shipping.MainForm, Ext.Panel, {
});
this.PubStore_OpCode.load();
this.PubStore_SelectCurr = Ext.create('DsExt.ux.RefEnumStore', {});
this.PubStore_SelectCurr.load({ params: { enumTypeId: 45 } });
//this.LoadPubStore("INFOCLIENT_ISCONTROLLER");
////var StoreStatusTask = { //Ext的定时器，每隔30秒刷新store。
@ -1271,6 +1274,10 @@ Ext.extend(Shipping.MainForm, Ext.Panel, {
result = this.PubStore_OpCode;
}
if (STORENAME == "SelectCurr") {
result = this.PubStore_SelectCurr;
}
return result;
//if ((result != "") && (result.getCount() == 0) ) {

2
DSWeb/Areas/SoftMng/Viewsjs/Export/index_source_by_zxb_24d7a12c-df2d-423b-98d7-163919c03352.js
Unescape Escape View File

@ -75,7 +75,7 @@ $('#table_1').bootstrapTable({
queryParams: QueryParams, //额外传递参数（*）
sidePagination: "server", //分页方式：client客户端分页，server服务端分页（*）
pageNumber: 1, //初始化加载第一页，默认第一页
pageSize: 10, //每页的记录行数（*）
pageSize: 100, //每页的记录行数（*）
pageList: [10, 20, 50, 100, "All"], //可供选择的每页的行数（*）
//showPaginationSwitch:true,
showColumns: false, //是否显示的列控制按钮

1
DSWeb/Default.aspx
Unescape Escape View File

@ -65,6 +65,7 @@
</script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/BasicDataRefModel.js"></script>
<script type="text/javascript" src="../../../../Areas/CommMng/Viewsjs/Comm/DsExtjsEx.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MainForm/MainForm.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MainForm/Main.js"></script>

Write Preview
Loading…
Cancel
Save