From cc8be6ec772de7e68f2a45ca6ab82e275ddf5a81 Mon Sep 17 00:00:00 2001 From: hanxuntao Date: Fri, 8 Nov 2024 14:13:24 +0800 Subject: [PATCH] 1 --- .../ChPayAppBLsettlementEdit.js | 7 +++++-- .../Chfee_settlement/ChPaysettlementBLEdit.js | 7 +++++-- .../Chfee_settlement/ChPaysettlementIndex.js | 5 +++++ .../DAL/MsBaseInfo/MsBaseInfoDAL.cs | 7 +++++-- .../DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs | 4 ++-- .../Models/MsBaseInfo/ModuTreeRefModel.cs | 2 ++ .../Viewsjs/Comm/BasicDataRefModel.js | 1 + .../MvcShipping/Viewsjs/MainForm/MainForm.js | 19 +++++++++++++++++++ JobAutoCreateFee/JobCreateFee.cs | 1 + 9 files changed, 45 insertions(+), 8 deletions(-) diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPayAppBLsettlementEdit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPayAppBLsettlementEdit.js index 53cf5f31..a1a9af5e 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPayAppBLsettlementEdit.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPayAppBLsettlementEdit.js @@ -4428,6 +4428,7 @@ Ext.extend(Shipping.MsChPayAppSettlementEdit, Ext.Panel, { buttons: [{ text: '确认支付', //"确认修改", minWidth: 70, + id: 'BtnUsdPay', handler: function () { var form = _this.UsdPayForm.getForm(); var PayeeCompanyName = form.findField('PayeeCompanyName').getValue(); @@ -6807,7 +6808,8 @@ Ext.extend(Shipping.MsChPayAppSettlementEdit, Ext.Panel, { }, onCreatePayFn: function () { - + var BtnUsdPay = Ext.getCmp('BtnUsdPay'); + BtnUsdPay.disable(); if (this.storeChfeeFile1.getCount() == 0) { Ext.Msg.show({ title: Zi.LAN.TiShi, msg: '发票文件不能为空！', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); return; @@ -6837,9 +6839,10 @@ Ext.extend(Shipping.MsChPayAppSettlementEdit, Ext.Panel, { icon: Ext.MessageBox.ERROR, buttons: Ext.Msg.OK }); + BtnUsdPay.enable(); return; } else { - + BtnUsdPay.enable(); Ext.Msg.show({ title: Zi.LAN.TiShi, msg: result.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); _this.winUsdPayShow.close(); diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPaysettlementBLEdit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPaysettlementBLEdit.js index 9c549537..cf19436d 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPaysettlementBLEdit.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPaysettlementBLEdit.js @@ -4598,6 +4598,7 @@ Ext.extend(Shipping.MsChPaySettlementBLEdit, Ext.Panel, { buttons: [{ text: '确认支付', //"确认修改", minWidth: 70, + id: 'BtnUsdPay', handler: function () { var form = _this.UsdPayForm.getForm(); var PayeeCompanyName = form.findField('PayeeCompanyName').getValue(); @@ -6808,7 +6809,8 @@ Ext.extend(Shipping.MsChPaySettlementBLEdit, Ext.Panel, { }, onCreatePayFn: function () { - + var BtnUsdPay = Ext.getCmp('BtnUsdPay'); + BtnUsdPay.disable(); if (this.storeChfeeFile1.getCount() == 0) { Ext.Msg.show({ title: Zi.LAN.TiShi, msg: '发票文件不能为空！', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); return; @@ -6838,9 +6840,10 @@ Ext.extend(Shipping.MsChPaySettlementBLEdit, Ext.Panel, { icon: Ext.MessageBox.ERROR, buttons: Ext.Msg.OK }); + BtnUsdPay.enable(); return; } else { - + BtnUsdPay.enable(); Ext.Msg.show({ title: Zi.LAN.TiShi, msg: result.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); _this.winUsdPayShow.close(); diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPaysettlementIndex.js b/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPaysettlementIndex.js index 48d4f7ab..22f4e25d 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPaysettlementIndex.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPaysettlementIndex.js @@ -1441,6 +1441,7 @@ Ext.extend(Shipping.MsChPaysettlementIndex, Ext.Panel, { buttons: [{ text: '确认支付', //"确认修改", minWidth: 70, + id:'BtnUsdPay', handler: function () { var form = _this.UsdPayForm.getForm(); var PayeeCompanyName = form.findField('PayeeCompanyName').getValue(); @@ -2050,6 +2051,8 @@ Ext.extend(Shipping.MsChPaysettlementIndex, Ext.Panel, { onCreatePayFn: function () { + var BtnUsdPay = Ext.getCmp('BtnUsdPay'); + BtnUsdPay.disable(); if (this.storeChfeeFile1.getCount() == 0) { 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, buttons: Ext.Msg.OK }); + BtnUsdPay.enable(); return; } else { + BtnUsdPay.enable(); Ext.Msg.show({ title: Zi.LAN.TiShi, msg: result.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); _this.onDsQuery(); diff --git a/DSWeb/Areas/MvcShipping/DAL/MsBaseInfo/MsBaseInfoDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsBaseInfo/MsBaseInfoDAL.cs index 613c35c4..b7ea3158 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsBaseInfo/MsBaseInfoDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsBaseInfo/MsBaseInfoDAL.cs @@ -107,13 +107,13 @@ namespace DSWeb.MvcShipping.DAL.MsBaseInfoDAL strSql.Append("SELECT "); 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"); } 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(" from sys_module m "); @@ -317,6 +317,9 @@ namespace DSWeb.MvcShipping.DAL.MsBaseInfoDAL if (reader["SORT"] != DBNull.Value) data.SORT = Convert.ToInt16(reader["SORT"]); data.TYPE = Convert.ToInt16(reader["TYPE"]); + if (reader["SHOWROOTSTATE"] != DBNull.Value) + data.SHOWROOTSTATE = Convert.ToInt16(reader["SHOWROOTSTATE"]); + if (data.MODULEURL == "#") { data.leaf = false; diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs index 9f6bc543..41d1b3a5 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs @@ -21394,8 +21394,8 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL if (cargoid == "R") { if (filetype == "E") - r.WriteLine("43::::::::::" + bill.REEFERF + ":C:" + bill.TEMPSET + ":" + bill.TEMPMIN + ":" + bill.TEMPMAX + ":::::'"); - else r.WriteLine("43::::::::::" + GetReeferfEDICode(bill.REEFERF, "YTEDI") + ":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:" + formatEdiStr("txt",bill.TEMPSET) + ":" + bill.TEMPMIN + ":" + bill.TEMPMAX + ":::::'"); } else if (cargoid == "D") { diff --git a/DSWeb/Areas/MvcShipping/Models/MsBaseInfo/ModuTreeRefModel.cs b/DSWeb/Areas/MvcShipping/Models/MsBaseInfo/ModuTreeRefModel.cs index 92823785..d0a66f97 100644 --- a/DSWeb/Areas/MvcShipping/Models/MsBaseInfo/ModuTreeRefModel.cs +++ b/DSWeb/Areas/MvcShipping/Models/MsBaseInfo/ModuTreeRefModel.cs @@ -86,6 +86,8 @@ namespace DSWeb.MvcShipping.Models.ModuTreeRef set { _sort = value; } } + public int SHOWROOTSTATE { get; set; } + [ModelDB] public decimal TYPE { diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/Comm/BasicDataRefModel.js b/DSWeb/Areas/MvcShipping/Viewsjs/Comm/BasicDataRefModel.js index e2898c9e..240bf356 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/Comm/BasicDataRefModel.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/Comm/BasicDataRefModel.js @@ -369,6 +369,7 @@ Ext.define('DsShipping.ux.ModuleModel', { { name: 'DESCRIPTION', type: 'string' }, { name: 'MODULEURL', type: 'string' }, { name: 'SORT', type: 'number' }, + { name: 'SHOWROOTSTATE', type: 'number' }, { name: 'PARENTID', type: 'string' }, { name: 'PARENTNAME', type: 'string' }, { name: 'TYPE', type: 'number' }, diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MainForm/MainForm.js b/DSWeb/Areas/MvcShipping/Viewsjs/MainForm/MainForm.js index d3ba65ec..c4cd92f8 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MainForm/MainForm.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MainForm/MainForm.js @@ -163,6 +163,7 @@ Ext.extend(Shipping.MainForm, Ext.Panel, { { name: 'DESCRIPTION', type: 'string' }, { name: 'MODULEURL', type: 'string' }, { name: 'SORT', type: 'number' }, + { name: 'SHOWROOTSTATE', type: 'number' }, { name: 'PARENTID', type: 'string' }, { name: 'PARENTNAME', type: 'string' }, { name: 'TYPE', type: 'number' }, @@ -1067,6 +1068,24 @@ Ext.extend(Shipping.MainForm, Ext.Panel, { this.PubStore_storeModuleEnable.load({ params: { condition: "sys_module.MODULEURL<>'#' and sys_module.MODULEURL<>'@'" }, 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 }); diff --git a/JobAutoCreateFee/JobCreateFee.cs b/JobAutoCreateFee/JobCreateFee.cs index b89c119f..25ea2d88 100644 --- a/JobAutoCreateFee/JobCreateFee.cs +++ b/JobAutoCreateFee/JobCreateFee.cs @@ -92,6 +92,7 @@ namespace JobCreateFee dbcon.Close(); if (bstable.Rows.Count > 0) { + var OpSeaeList = CreateOpSeaList(bstable); var FeeTemplateDetailList = GetFeeTemplate(enumFeeproject.FA_ID, dbcon); try