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

1

Browse Source
dev
hanxuntao 2 weeks ago
parent 92465fc51f
commit cc8be6ec77
9 changed files with 45 additions and 8 deletions
Show Stats Download Patch File Download Diff File

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

@ -4428,6 +4428,7 @@ Ext.extend(Shipping.MsChPayAppSettlementEdit, Ext.Panel, {
buttons: [{ buttons: [{
text: '确认支付', //"确认修改", text: '确认支付', //"确认修改",
minWidth: 70, minWidth: 70,
id: 'BtnUsdPay',
handler: function () { handler: function () {
var form = _this.UsdPayForm.getForm(); var form = _this.UsdPayForm.getForm();
var PayeeCompanyName = form.findField('PayeeCompanyName').getValue(); var PayeeCompanyName = form.findField('PayeeCompanyName').getValue();
@ -6807,7 +6808,8 @@ Ext.extend(Shipping.MsChPayAppSettlementEdit, Ext.Panel, {
}, },
onCreatePayFn: function () { onCreatePayFn: function () {
var BtnUsdPay = Ext.getCmp('BtnUsdPay');
BtnUsdPay.disable();
if (this.storeChfeeFile1.getCount() == 0) { if (this.storeChfeeFile1.getCount() == 0) {
Ext.Msg.show({ title: Zi.LAN.TiShi, msg: '发票文件不能为空！', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.TiShi, msg: '发票文件不能为空！', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
return; return;
@ -6837,9 +6839,10 @@ Ext.extend(Shipping.MsChPayAppSettlementEdit, Ext.Panel, {
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.Msg.OK buttons: Ext.Msg.OK
}); });
BtnUsdPay.enable();
return; return;
} else { } else {
BtnUsdPay.enable();
Ext.Msg.show({ title: Zi.LAN.TiShi, msg: result.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.TiShi, msg: result.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
_this.winUsdPayShow.close(); _this.winUsdPayShow.close();

7
DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPaysettlementBLEdit.js
Unescape Escape View File

@ -4598,6 +4598,7 @@ Ext.extend(Shipping.MsChPaySettlementBLEdit, Ext.Panel, {
buttons: [{ buttons: [{
text: '确认支付', //"确认修改", text: '确认支付', //"确认修改",
minWidth: 70, minWidth: 70,
id: 'BtnUsdPay',
handler: function () { handler: function () {
var form = _this.UsdPayForm.getForm(); var form = _this.UsdPayForm.getForm();
var PayeeCompanyName = form.findField('PayeeCompanyName').getValue(); var PayeeCompanyName = form.findField('PayeeCompanyName').getValue();
@ -6808,7 +6809,8 @@ Ext.extend(Shipping.MsChPaySettlementBLEdit, Ext.Panel, {
}, },
onCreatePayFn: function () { onCreatePayFn: function () {
var BtnUsdPay = Ext.getCmp('BtnUsdPay');
BtnUsdPay.disable();
if (this.storeChfeeFile1.getCount() == 0) { if (this.storeChfeeFile1.getCount() == 0) {
Ext.Msg.show({ title: Zi.LAN.TiShi, msg: '发票文件不能为空！', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.TiShi, msg: '发票文件不能为空！', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
return; return;
@ -6838,9 +6840,10 @@ Ext.extend(Shipping.MsChPaySettlementBLEdit, Ext.Panel, {
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.Msg.OK buttons: Ext.Msg.OK
}); });
BtnUsdPay.enable();
return; return;
} else { } else {
BtnUsdPay.enable();
Ext.Msg.show({ title: Zi.LAN.TiShi, msg: result.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.TiShi, msg: result.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
_this.winUsdPayShow.close(); _this.winUsdPayShow.close();

5
DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPaysettlementIndex.js
Unescape Escape View File

@ -1441,6 +1441,7 @@ Ext.extend(Shipping.MsChPaysettlementIndex, Ext.Panel, {
buttons: [{ buttons: [{
text: '确认支付', //"确认修改", text: '确认支付', //"确认修改",
minWidth: 70, minWidth: 70,
id:'BtnUsdPay',
handler: function () { handler: function () {
var form = _this.UsdPayForm.getForm(); var form = _this.UsdPayForm.getForm();
var PayeeCompanyName = form.findField('PayeeCompanyName').getValue(); var PayeeCompanyName = form.findField('PayeeCompanyName').getValue();
@ -2050,6 +2051,8 @@ Ext.extend(Shipping.MsChPaysettlementIndex, Ext.Panel, {
onCreatePayFn: function () { onCreatePayFn: function () {
var BtnUsdPay = Ext.getCmp('BtnUsdPay');
BtnUsdPay.disable();
if (this.storeChfeeFile1.getCount() == 0) { if (this.storeChfeeFile1.getCount() == 0) {
Ext.Msg.show({ title: Zi.LAN.TiShi, msg: '发票文件不能为空！', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.TiShi, msg: '发票文件不能为空！', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
@ -2080,8 +2083,10 @@ Ext.extend(Shipping.MsChPaysettlementIndex, Ext.Panel, {
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.Msg.OK buttons: Ext.Msg.OK
}); });
BtnUsdPay.enable();
return; return;
} else { } else {
BtnUsdPay.enable();
Ext.Msg.show({ title: Zi.LAN.TiShi, msg: result.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.TiShi, msg: result.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
_this.onDsQuery(); _this.onDsQuery();

7
DSWeb/Areas/MvcShipping/DAL/MsBaseInfo/MsBaseInfoDAL.cs
Unescape Escape View File

@ -107,13 +107,13 @@ namespace DSWeb.MvcShipping.DAL.MsBaseInfoDAL
strSql.Append("SELECT "); strSql.Append("SELECT ");
if (strLANGUAGES == "en-us") if (strLANGUAGES == "en-us")
{ {
strSql.Append(" GID,NAME,ENAME DESCRIPTION,MODULEURL,SORT,PARENTID,TYPE"); strSql.Append(" GID,NAME,ENAME DESCRIPTION,MODULEURL,SORT,PARENTID,TYPE,SHOWROOTSTATE");
strSql.Append(",(select ENAME from sys_module where GID=m.PARENTID) AS PARENTNAME"); strSql.Append(",(select ENAME from sys_module where GID=m.PARENTID) AS PARENTNAME");
} }
else else
{ {
strSql.Append(" GID,NAME,DESCRIPTION,MODULEURL,SORT,PARENTID,TYPE"); strSql.Append(" GID,NAME,DESCRIPTION,MODULEURL,SORT,PARENTID,TYPE,SHOWROOTSTATE");
strSql.Append(",(select DESCRIPTION from sys_module where GID=m.PARENTID) AS PARENTNAME"); strSql.Append(",(select DESCRIPTION from sys_module where GID=m.PARENTID) AS PARENTNAME");
} }
strSql.Append(" from sys_module m "); strSql.Append(" from sys_module m ");
@ -317,6 +317,9 @@ namespace DSWeb.MvcShipping.DAL.MsBaseInfoDAL
if (reader["SORT"] != DBNull.Value) if (reader["SORT"] != DBNull.Value)
data.SORT = Convert.ToInt16(reader["SORT"]); data.SORT = Convert.ToInt16(reader["SORT"]);
data.TYPE = Convert.ToInt16(reader["TYPE"]); data.TYPE = Convert.ToInt16(reader["TYPE"]);
if (reader["SHOWROOTSTATE"] != DBNull.Value)
data.SHOWROOTSTATE = Convert.ToInt16(reader["SHOWROOTSTATE"]);
if (data.MODULEURL == "#") if (data.MODULEURL == "#")
{ {
data.leaf = false; data.leaf = false;

4
DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs
Unescape Escape View File

@ -21394,8 +21394,8 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
if (cargoid == "R") if (cargoid == "R")
{ {
if (filetype == "E") if (filetype == "E")
r.WriteLine("43::::::::::" + bill.REEFERF + ":C:" + bill.TEMPSET + ":" + bill.TEMPMIN + ":" + bill.TEMPMAX + ":::::'"); r.WriteLine("43::::::::::" + bill.REEFERF + ":C:" + formatEdiStr("txt",bill.TEMPSET) + ":" + bill.TEMPMIN + ":" + bill.TEMPMAX + ":::::'");
else r.WriteLine("43::::::::::" + GetReeferfEDICode(bill.REEFERF, "YTEDI") + ":C:" + bill.TEMPSET + ":" + bill.TEMPMIN + ":" + bill.TEMPMAX + ":::::'"); else r.WriteLine("43::::::::::" + GetReeferfEDICode(bill.REEFERF, "YTEDI") + ":C:" + formatEdiStr("txt",bill.TEMPSET) + ":" + bill.TEMPMIN + ":" + bill.TEMPMAX + ":::::'");
} }
else if (cargoid == "D") else if (cargoid == "D")
{ {

2
DSWeb/Areas/MvcShipping/Models/MsBaseInfo/ModuTreeRefModel.cs
Unescape Escape View File

@ -86,6 +86,8 @@ namespace DSWeb.MvcShipping.Models.ModuTreeRef
set { _sort = value; } set { _sort = value; }
} }
public int SHOWROOTSTATE { get; set; }
[ModelDB] [ModelDB]
public decimal TYPE public decimal TYPE
{ {

1
DSWeb/Areas/MvcShipping/Viewsjs/Comm/BasicDataRefModel.js
Unescape Escape View File

@ -369,6 +369,7 @@ Ext.define('DsShipping.ux.ModuleModel', {
{ name: 'DESCRIPTION', type: 'string' }, { name: 'DESCRIPTION', type: 'string' },
{ name: 'MODULEURL', type: 'string' }, { name: 'MODULEURL', type: 'string' },
{ name: 'SORT', type: 'number' }, { name: 'SORT', type: 'number' },
{ name: 'SHOWROOTSTATE', type: 'number' },
{ name: 'PARENTID', type: 'string' }, { name: 'PARENTID', type: 'string' },
{ name: 'PARENTNAME', type: 'string' }, { name: 'PARENTNAME', type: 'string' },
{ name: 'TYPE', type: 'number' }, { name: 'TYPE', type: 'number' },

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

@ -163,6 +163,7 @@ Ext.extend(Shipping.MainForm, Ext.Panel, {
{ name: 'DESCRIPTION', type: 'string' }, { name: 'DESCRIPTION', type: 'string' },
{ name: 'MODULEURL', type: 'string' }, { name: 'MODULEURL', type: 'string' },
{ name: 'SORT', type: 'number' }, { name: 'SORT', type: 'number' },
{ name: 'SHOWROOTSTATE', type: 'number' },
{ name: 'PARENTID', type: 'string' }, { name: 'PARENTID', type: 'string' },
{ name: 'PARENTNAME', type: 'string' }, { name: 'PARENTNAME', type: 'string' },
{ name: 'TYPE', type: 'number' }, { name: 'TYPE', type: 'number' },
@ -1067,6 +1068,24 @@ Ext.extend(Shipping.MainForm, Ext.Panel, {
this.PubStore_storeModuleEnable.load({ this.PubStore_storeModuleEnable.load({
params: { condition: "sys_module.MODULEURL<>'#' and sys_module.MODULEURL<>'@'" }, params: { condition: "sys_module.MODULEURL<>'#' and sys_module.MODULEURL<>'@'" },
callback: function (r, options, success) { callback: function (r, options, success) {
if (success) {
if (this.PubStore_storeModuleEnable.getCount() > 0) {
for (var j = 0; j < this.PubStore_storeModuleEnable.getCount(); j += 1) {
var member = this.PubStore_storeModuleEnable.getAt(j);
if (member.data.SHOWROOTSTATE == 1) {
this.clicktree(member);
}
};
} else {
}
}
}, },
scope: this scope: this
}); });

1
JobAutoCreateFee/JobCreateFee.cs
Unescape Escape View File

@ -92,6 +92,7 @@ namespace JobCreateFee
dbcon.Close(); dbcon.Close();
if (bstable.Rows.Count > 0) if (bstable.Rows.Count > 0)
{ {
var OpSeaeList = CreateOpSeaList(bstable); var OpSeaeList = CreateOpSeaList(bstable);
var FeeTemplateDetailList = GetFeeTemplate(enumFeeproject.FA_ID, dbcon); var FeeTemplateDetailList = GetFeeTemplate(enumFeeproject.FA_ID, dbcon);
try try

Write Preview
Loading…
Cancel
Save