diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpPrice/MsOpPriceDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpPrice/MsOpPriceDAL.cs index dc77e190..d34708c1 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpPrice/MsOpPriceDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpPrice/MsOpPriceDAL.cs @@ -660,7 +660,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpPriceDAL db.AddInParameter(cmdInsertFee, "@ISOPEN", DbType.Boolean, false); db.AddInParameter(cmdInsertFee, "@ISADVANCEDPAY", DbType.Boolean, false); db.AddInParameter(cmdInsertFee, "@SORT", DbType.Int16, 1); - db.AddInParameter(cmdInsertFee, "@FEESTATUS", DbType.Int16, 0); + db.AddInParameter(cmdInsertFee, "@FEESTATUS", DbType.Int16, 1); db.AddInParameter(cmdInsertFee, "@FEEFRT", DbType.String, "PP"); db.AddInParameter(cmdInsertFee, "@TAXRATE", DbType.Decimal, 0); db.AddInParameter(cmdInsertFee, "@NOTAXAMOUNT", DbType.Decimal, Math.Round(enumValue.SELLPRICE * enumValue.CTNNUM, 2)); @@ -708,7 +708,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpPriceDAL db.AddInParameter(cmdInsertFee, "@ISOPEN", DbType.Boolean, false); db.AddInParameter(cmdInsertFee, "@ISADVANCEDPAY", DbType.Boolean, false); db.AddInParameter(cmdInsertFee, "@SORT", DbType.Int16, 1); - db.AddInParameter(cmdInsertFee, "@FEESTATUS", DbType.Int16, 0); + db.AddInParameter(cmdInsertFee, "@FEESTATUS", DbType.Int16, 1); db.AddInParameter(cmdInsertFee, "@FEEFRT", DbType.String, "PP"); db.AddInParameter(cmdInsertFee, "@TAXRATE", DbType.Decimal, 0); db.AddInParameter(cmdInsertFee, "@NOTAXAMOUNT", DbType.Decimal, Math.Round(enumValue.PRICE * enumValue.CTNNUM, 2)); @@ -755,7 +755,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpPriceDAL db.AddInParameter(cmdInsertFee, "@ISOPEN", DbType.Boolean, false); db.AddInParameter(cmdInsertFee, "@ISADVANCEDPAY", DbType.Boolean, false); db.AddInParameter(cmdInsertFee, "@SORT", DbType.Int16, 1); - db.AddInParameter(cmdInsertFee, "@FEESTATUS", DbType.Int16, 0); + db.AddInParameter(cmdInsertFee, "@FEESTATUS", DbType.Int16, 1); db.AddInParameter(cmdInsertFee, "@FEEFRT", DbType.String, "PP"); db.AddInParameter(cmdInsertFee, "@TAXRATE", DbType.Decimal, 0); db.AddInParameter(cmdInsertFee, "@NOTAXAMOUNT", DbType.Decimal, enumValue.AMOUNT); @@ -802,7 +802,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpPriceDAL db.AddInParameter(cmdInsertFee, "@ISOPEN", DbType.Boolean, false); db.AddInParameter(cmdInsertFee, "@ISADVANCEDPAY", DbType.Boolean, false); db.AddInParameter(cmdInsertFee, "@SORT", DbType.Int16, 1); - db.AddInParameter(cmdInsertFee, "@FEESTATUS", DbType.Int16, 0); + db.AddInParameter(cmdInsertFee, "@FEESTATUS", DbType.Int16, 1); db.AddInParameter(cmdInsertFee, "@FEEFRT", DbType.String, "PP"); db.AddInParameter(cmdInsertFee, "@TAXRATE", DbType.Decimal, 0); db.AddInParameter(cmdInsertFee, "@NOTAXAMOUNT", DbType.Decimal, enumValue.AMOUNT); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MainForm/MainForm.js b/DSWeb/Areas/MvcShipping/Viewsjs/MainForm/MainForm.js index 1c01326f..d3ba65ec 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MainForm/MainForm.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MainForm/MainForm.js @@ -1051,6 +1051,27 @@ Ext.extend(Shipping.MainForm, Ext.Panel, { this.PubStore_SelectCurr = Ext.create('DsExt.ux.RefEnumStore', {}); this.PubStore_SelectCurr.load({ params: { enumTypeId: 45 } }); + this.PubStore_storeModuleEnable = Ext.create('Ext.data.Store', { + model: 'DsShipping.ux.ModuleModel', + remoteSort: true, + proxy: { + type: 'ajax', + url: '/MvcShipping/MsBaseInfo/GetUserModuleEnableList', + reader: { + id: 'id', + root: 'data', + totalProperty: 'totalCount' + } + } + }); + this.PubStore_storeModuleEnable.load({ + params: { condition: "sys_module.MODULEURL<>'#' and sys_module.MODULEURL<>'@'" }, + callback: function (r, options, success) { + }, + scope: this + }); + + //this.LoadPubStore("INFOCLIENT_ISCONTROLLER"); ////var StoreStatusTask = { //Ext的定时器，每隔30秒刷新store。 @@ -1225,6 +1246,27 @@ Ext.extend(Shipping.MainForm, Ext.Panel, { } + }, + + GetModleEn: function (MODULEURL) { + + var result = false; + 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.MODULEURL == MODULEURL) result = true; + }; + } + + return result; + + //if ((result != "") && (result.getCount() == 0) ) { + // setTimeout(function () { + // return this.GetPubStore(STORENAME, 1); + // }, 3000); + //} else { + // return result; + //} } , GetPubStore: function (STORENAME) { diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpPrice/MsOpPriceEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpPrice/MsOpPriceEdit.js index a101248d..d8f05242 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpPrice/MsOpPriceEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpPrice/MsOpPriceEdit.js @@ -815,6 +815,12 @@ Ext.extend(Shipping.MsOpPriceEdit, Ext.Panel, { field.setValue(''); field = basicForm.findField('BILLNO'); field.setValue(''); + field = basicForm.findField('BILLSTATUSREF'); + field.setValue('未提交'); + field = basicForm.findField('BILLSTATUS'); + field.setValue('1'); + this.setSaveBtnStatus(true); + for (var j = 0; j < this.storeCtnList.getCount(); j += 1) { var memberbody = this.storeCtnList.getAt(j); @@ -1922,7 +1928,7 @@ Ext.extend(Shipping.MsOpPriceEdit, Ext.Panel, { if (CURRENCY == 'USD') usdtotal = Add(usdtotal, AMOUNT, 4); if (CURRENCY != 'USD' && CURRENCY != 'RMB') - ottotal = Add(usdtotal, AMOUNT, 4); + ottotal = Add(ottotal, AMOUNT, 4); } var field = this.formHead.getForm().findField('RMBOT'); field.setValue(rmbtotal); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpPrice/MsOpPriceHistryIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpPrice/MsOpPriceHistryIndex.js index 2a77df3d..a1c38641 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpPrice/MsOpPriceHistryIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpPrice/MsOpPriceHistryIndex.js @@ -1485,6 +1485,12 @@ Ext.extend(Shipping.MsOpPriceHistryIndex, Ext.Panel, { return; } var rec = selections[0]; + if (rec.data.PRICETYPE == '报价') { + Ext.Msg.show({ title: '提示', msg: '报价单不能生成报价单！', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); + return; + + } + Ext.Ajax.request({//正在添加数据.. waitMsg: '正在处理...', url: '/MvcShipping/MsOpPrice/CreatePriceSell', diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpPrice/MsOpPriceSellEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpPrice/MsOpPriceSellEdit.js index 6800a022..74abb747 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpPrice/MsOpPriceSellEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpPrice/MsOpPriceSellEdit.js @@ -1959,7 +1959,7 @@ Ext.extend(Shipping.MsOpPriceSellEdit, Ext.Panel, { if (CURRENCY == 'USD') usdtotal = Add(usdtotal, AMOUNT, 4); if (CURRENCY != 'USD' && CURRENCY != 'RMB') - ottotal = Add(usdtotal, AMOUNT, 4); + ottotal = Add(ottotal, AMOUNT, 4); } var field = this.formHead.getForm().findField('SELLRMBOT'); field.setValue(rmbtotal); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsRptSaleBalProfitShare/MsRptSaleMHProfitShareIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptSaleBalProfitShare/MsRptSaleMHProfitShareIndex.js index 18477781..f9c46c67 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsRptSaleBalProfitShare/MsRptSaleMHProfitShareIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptSaleBalProfitShare/MsRptSaleMHProfitShareIndex.js @@ -369,7 +369,6 @@ Ext.extend(Shipping.MsRptSaleBalProfitShareIndex, Ext.Panel, { sortable: false, dataIndex: 'JXXS', header: '绩效系数', - renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '' + lsValue + ''; } } else { return value; } } catch (e) { return value; } return value; }, align: 'right', width: 80 }, { @@ -629,7 +628,31 @@ Ext.extend(Shipping.MsRptSaleBalProfitShareIndex, Ext.Panel, { } } } - }, this.comboxSalesCode, { xtype: 'hiddenfield' }, { xtype: 'hiddenfield' }, { xtype: 'hiddenfield' } + }, this.comboxSalesCode, { + fieldLabel: '从会计期间', + xtype: 'monthfield', + name: 'PS_ACCDATEBGN', + enableKeyEvents: true, + listeners: { + specialkey: function (field, e) { + if (e.getKey() == e.ENTER) { + _this.onRefreshClick(); + } + } + } + }, { + fieldLabel: '从会计期间', + xtype: 'monthfield', + name: 'PS_ACCDATEEND', + enableKeyEvents: true, + listeners: { + specialkey: function (field, e) { + if (e.getKey() == e.ENTER) { + _this.onRefreshClick(); + } + } + } + }, { xtype: 'hiddenfield' } ] } ]//end items(fieldset 1) @@ -923,6 +946,20 @@ Ext.extend(Shipping.MsRptSaleBalProfitShareIndex, Ext.Panel, { var SALE = form.findField('PS_SALE').getValue(); sql = sql + getAndConSql(sql, SALE, "B.SALE='" + SALE + "'"); + var expDate_Min = form.findField('PS_STLDATEBGN').getRawValue(); + if (expDate_Min != '') { + var myexpDate_Min = Ext.util.Format.date(expDate_Min, 'Y-m'); + + sql = sql + getAndConSql(sql, myexpDate_Min, " B.ACCDATE>='" + myexpDate_Min + "'"); + } + + var expDate_Max = form.findField('PS_STLDATEEND').getRawValue(); + if (expDate_Max != '') { + var myexpDate_Max = Ext.util.Format.date(expDate_Max, 'Y-m'); + + sql = sql + getAndConSql(sql, myexpDate_Max, " B.ACCDATE<='" + myexpDate_Min + "'"); + } + //if (this.CheckAllDR.checked) { // sql = sql + getAndConSql(sql, "11", " isnull(B.ISFUMIGATION,0)<>1 "); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js index 7e68557e..64d2e61d 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js @@ -2256,7 +2256,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, { store: this.storeUser, forceSelection: true, name: 'CUSTSERVICE', - valueField: 'UserCode', + valueField: 'UserName', displayField: 'CodeAndName' }); diff --git a/DSWeb/Areas/TruckMng/Controllers/PcHeadEdit_WFSDController.cs b/DSWeb/Areas/TruckMng/Controllers/PcHeadEdit_WFSDController.cs index 670fef0e..a4d4c0e5 100644 --- a/DSWeb/Areas/TruckMng/Controllers/PcHeadEdit_WFSDController.cs +++ b/DSWeb/Areas/TruckMng/Controllers/PcHeadEdit_WFSDController.cs @@ -110,6 +110,17 @@ namespace DSWeb.Areas.TruckMng.Controllers var json = JsonConvert.Serialize(new { Success = true, Message = "查询成功", totalCount = dataList.Count, data = list.ToList() }); return new ContentResult() { Content = json }; } + [SqlKeyWordsFilter(Type = "Action")]//sql 防注入过滤器 + public ContentResult GetHYRDDataList(int start, int limit, string sort, string condition) + { + var dataList = MsRptPcHeadEditDAL.GetHYRDList(condition, CookieConfig.GetCookie_UserId(Request), CookieConfig.GetCookie_UserCode(Request), CookieConfig.GetCookie_UserName(Request), CookieConfig.GetCookie_CompanyId(Request), sort); + + var list = dataList.Skip(start).Take(limit); + + var json = JsonConvert.Serialize(new { Success = true, Message = "查询成功", totalCount = dataList.Count, data = list.ToList() }); + return new ContentResult() { Content = json }; + } + [SqlKeyWordsFilter(Type = "Action")]//sql 防注入过滤器 public ContentResult GetDataFenList(int start, int limit, string sort, string condition) { @@ -147,7 +158,33 @@ namespace DSWeb.Areas.TruckMng.Controllers new { Success = true, Message = "查询成功", data = head }); return new ContentResult() { Content = json }; } + public ContentResult GetHYRDData(string handle, string condition) + { + MsWlPcHead_WFSDEdit head = null; + if (handle == "edit" || handle == "copyadd") + { + head = MsRptPcHeadEditDAL.GetHYRDData(condition); + } + if (head == null) + { + head = new MsWlPcHead_WFSDEdit(); + head.gId = "PC_" + Guid.NewGuid().ToString("N").ToUpper(); + head.PGid = head.gId; + head.UserCode = CookieConfig.GetCookie_UserCode(Request); + head.UserName = Convert.ToString(Session["SHOWNAME"]); + head.BLTYPE = "派车单票"; + var period = ChMonthCloseDAL.GetData("", CookieConfig.GetCookie_CompanyId(Request)); + if (Convert.ToDateTime(period.FDAY) > DateTime.Now) + { + head.ACCDATE = period.PERIOD; + } + else head.ACCDATE = DateTime.Now.ToString("yyyy-MM"); + } + var json = JsonConvert.Serialize( + new { Success = true, Message = "查询成功", data = head }); + return new ContentResult() { Content = json }; + } public ContentResult CreateDriverFee(string FeeValue, string data) { var headData = JsonConvert.Deserialize(data); @@ -454,7 +491,7 @@ namespace DSWeb.Areas.TruckMng.Controllers { Success = result.Success, Message = result.Message, - Data = MsRptPcHeadEditDAL.GetWFSDData("GID='" + BSNO + "'") + Data = MsRptPcHeadEditDAL.GetHYRDData("GID='" + BSNO + "'") }; return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) }; } diff --git a/DSWeb/Areas/TruckMng/DAL/MsRptPcHeadEdit/MsRptPcHeadEditDAL.cs b/DSWeb/Areas/TruckMng/DAL/MsRptPcHeadEdit/MsRptPcHeadEditDAL.cs index fc8aa227..e6195d18 100644 --- a/DSWeb/Areas/TruckMng/DAL/MsRptPcHeadEdit/MsRptPcHeadEditDAL.cs +++ b/DSWeb/Areas/TruckMng/DAL/MsRptPcHeadEdit/MsRptPcHeadEditDAL.cs @@ -31,6 +31,7 @@ using DSWeb.MvcShipping.Models.MsOpOther; using DSWeb.Areas.Account.Models.BSNOLB; using DSWeb.Areas.MvcShipping.DAL.BookingConfirm; using DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL; +using DSWeb.Areas.MvcShipping.Models.Message.VGM; namespace DSWeb.Areas.TruckMng.DAL.MsRptPcHeadEdit @@ -728,7 +729,7 @@ namespace DSWeb.Areas.TruckMng.DAL.MsRptPcHeadEdit data.RowNumber = Convert.ToString(reader["RowNumber"]); data.BillNo = Convert.ToString(reader["BillNo"]); if (reader["ExpDate"] != DBNull.Value) - data.ExpDate = Convert.ToDateTime(reader["ExpDate"]).ToString("yyyy-MM-dd");//到港日期 + data.ExpDate = Convert.ToDateTime(reader["ExpDate"]).ToString("yyyy-MM-dd HH:mm:ss");//到港日期 data.GroupDate = Convert.ToString(reader["GroupDate"]); data.ArriveDate = Convert.ToString(reader["ArriveDate"]); data.ReturnDate = Convert.ToString(reader["ReturnDate"]); @@ -1549,13 +1550,14 @@ namespace DSWeb.Areas.TruckMng.DAL.MsRptPcHeadEdit string str = ""; var strSql = new StringBuilder(); strSql.Append("SELECT "); - strSql.Append(" VISIBLERANGE,OPERATERANGE "); + strSql.Append(" VISIBLERANGE,OPERATERANGE,AUTHORITYID,VSSQL "); strSql.Append(" from VW_User_Authority "); strSql.Append(" where [NAME]='modMsPc' and USERID='" + userid + "' and ISDELETE=0"); string visiblerange = "4"; string operaterange = "4"; - + string AUTHORITYID = ""; + string VSSQL = ""; Database db = DatabaseFactory.CreateDatabase(); using (IDataReader reader = db.ExecuteReader(CommandType.Text, strSql.ToString())) { @@ -1563,6 +1565,8 @@ namespace DSWeb.Areas.TruckMng.DAL.MsRptPcHeadEdit { visiblerange = Convert.ToString(reader["VISIBLERANGE"]); operaterange = Convert.ToString(reader["OPERATERANGE"]); + AUTHORITYID = Convert.ToString(reader["AUTHORITYID"]); + VSSQL = Convert.ToString(reader["VSSQL"]); break; } reader.Close(); @@ -1588,6 +1592,41 @@ namespace DSWeb.Areas.TruckMng.DAL.MsRptPcHeadEdit str = " (t.UserCode in (select CODENAME from [user] where GID in (select USERID from user_company where COMPANYID='" + companyid + "'))" + " OR t.UserName in (select showname from [user] where GID in (select USERID from user_company where COMPANYID='" + companyid + "')))"; } + else if (visiblerange == "5") + { + + var userstr = new StringBuilder(); + userstr.Append(" select COMPANYID from user_authority_range_company where userid='" + userid + "' and AUTHORITYID='" + AUTHORITYID + "' and VISIBLERANGE=1"); + Database userdb = DatabaseFactory.CreateDatabase(); + using (IDataReader reader = userdb.ExecuteReader(CommandType.Text, userstr.ToString())) + { + str = ""; + while (reader.Read()) + { + if (str == "") + { + str = " (t.UserName in (select showname from [user] where GID in (select USERID from user_company where COMPANYID='" + Convert.ToString(reader["COMPANYID"]) + "'))) "; + } + else + { + str = str + " or (t.UserName in (select showname from [user] where GID in (select USERID from user_company where COMPANYID='" + Convert.ToString(reader["COMPANYID"]) + "'))) "; + }; + } + str = str + ")"; + reader.Close(); + } + + + } + else if (visiblerange == "6") + { + + str = " EXISTS (select 1 from user_authority_range_op P left join [user] u on (u.GID=P.OPID) where (t.UserName=U.SHOWNAME ) AND P.userid='" + userid + "' and P.AUTHORITYID='" + AUTHORITYID + "' and P.VISIBLERANGE=1) "; + + } + + + else if (visiblerange == "0") { str = " 1=1 "; @@ -1600,6 +1639,307 @@ namespace DSWeb.Areas.TruckMng.DAL.MsRptPcHeadEdit #endregion + static public List GetHYRDList(string strCondition, string userid, string usercode, string username, string companyid, string sort) + { //合同信息/商品信息 + + if (!string.IsNullOrWhiteSpace(userid) || !string.IsNullOrWhiteSpace(usercode) || !string.IsNullOrWhiteSpace(username) || !string.IsNullOrWhiteSpace(companyid)) + { + var rangstr = GetRangDAStr("index", userid, usercode, username, companyid); + + if (!string.IsNullOrEmpty(rangstr)) + { + if (!string.IsNullOrEmpty(strCondition)) + { + strCondition = strCondition + " and " + rangstr; + } + else + { + strCondition = rangstr; + } + } + } + + var strSql = new StringBuilder(); + strSql.Append(" select CargoID,LoadFactory,PcBillType,PGid,BLTYPE,TRANSSTATUS "); + strSql.Append(" ,(select EnumValueName from tSysEnumValue where LangId=0 and EnumTypeID=99046 and EnumValueID=t.PcBillType) PcBillTypeREF "); + strSql.Append(" ,convert(bigint ,t.TimeMark) as timeMark,gId,UserName "); + strSql.Append(" ,ROW_NUMBER()over (partition by dbo.trimdate(expdate) order by expdate ) RowNumber "); + strSql.Append(" ,BillNo,dbo.trimtime(ExpDate) ExpDate, dbo.trimdate(expdate) GroupDate ,ArriveDate,ReturnDate "); + strSql.Append(" ,CustomerName,F_CustomerName,t.DrvName,t.DdName,t.DrvCode,t.TruckNo,MblNo,LinkMan,DstArea,DetiNation,ContainerQty,GOODSCOUNT,CBM "); + strSql.Append(" ,Ton,t.LoadCount,LoadPlace,TruckSpec,IsDouble,Property,RefBillNo,RefBillNose,MblNoSe,dbo.trimdate(EndPortDate) EndPortDate,VoyVeg,VoyVegSe,dbo.trimdate(EtDate) EtDate "); + strSql.Append(" ,(select sum(amount) from ch_Fee where bsno=t.gid and feename='运费' and FEETYPE=1)YUNFEI "); + strSql.Append(" ,(select sum(amount) from ch_Fee where bsno=t.gid and feename='回程合计' and FEETYPE=1)HCHJ "); + strSql.Append(" ,(select sum(amount) from ch_Fee where bsno=t.gid and feename='装卸费' and FEETYPE=1)ZXF "); + strSql.Append(" ,(select sum(amount) from ch_Fee where bsno=t.gid and feename='代垫费' and FEETYPE=1)DDF "); + strSql.Append(" ,(select sum(amount) from ch_Fee where bsno=t.gid and feename not in('运费','回程合计','装卸费','代垫费') and FEETYPE=1)QTFee "); + strSql.Append(" ,(select sum(amount) from ch_Fee where bsno=t.gid and FEETYPE=1)TotalFee,t.Remark,t.FeeStatus,dbo.trimdate(LrDate) LrDate"); + strSql.Append(" ,case when t.TruckNo='' then '接单' else case when isnull(isend,0)=0 then '派车' else '完成' end end PCSTATUSREF "); + strSql.Append(" ,ContainerType,LinkTel,YardName,LinkManSe,LinkTelSe,RtnYardName,BsType,CustName,CustLikeManName,CustTel,ChangedReson,DispatchName,RoadFee,FactoryAddr,ContainerNo,SealNo"); + strSql.Append(",dbo.F_GetBillDrFeeStatus(t.GId) DRFEESTATUS"); + strSql.Append(",dbo.F_GetBillCrFeeStatus(t.GId) CRFEESTATUS"); + strSql.Append(",(SELECT TOP 1 STATUS FROM V_OP_STATUS WITH (NOLOCK) WHERE BSNO=t.GId ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS"); + strSql.Append(",(select TOP 1 COLOR FROM code_op_status_detail WITH (NOLOCK) WHERE OPSTATUS = (CASE WHEN (SELECT TOP 1 [STATUS] FROM V_OP_STATUS WHERE BSNO=t.GId ORDER BY COMPTIME DESC,INPUTTIME DESC) is null THEN '接受委托' else (SELECT TOP 1[STATUS] FROM V_OP_STATUS WHERE BSNO =t.GId ORDER BY COMPTIME DESC, INPUTTIME DESC) end))AS COLOR"); + + strSql.Append(",t.SALECORPID,(select [NAME] from [company] where GID=t.SALECORPID) as SALECORP,DCLASS,DUNNO"); + + strSql.Append(" ,INVOICENO,KINDPKGS,CUSTNO,SalesName,GoodsName,PORTLOAD,DESTINATION,RtnDocStatus,RtnDocTime,ACCDATE,(CASE FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF,(CASE ISNULL(BillStatus,0) WHEN 1 THEN '锁定' else '未锁定' end) as BSSTATUSREF "); + strSql.Append(",FuelPrice,FuelQty,RealMil,isEnd,RatedMil,RatedFuel,DetiNationSe,FactoryAddrSe,ContainerNoSe,EtDateSe,YardCodeSe,YardNameSe"); + strSql.Append(",ISSHUISHI,ISGAOWEN,ISXIANLIANG,ISCHECHUAN,ISHAIWU,ISFENGXIANG,ISWEISHENBAO,ISBAOGUAN,ISPINGTAI,FrTruckNo,FrDrvName,WmsTruckNo,WmsDrvName"); + + strSql.Append(",I.TTLDR,I.TTLINVDR,I.TTLDUIDR,I.TTLCR,I.TTLINVCR,I.TTLDUICR,ISCANCEL"); + + strSql.Append(" from tMsWlPcHead t "); + strSql.Append(" LEFT JOIN v_op_gain_dr_INV I ON (I.BSNO=t.GID) "); + + + if (!string.IsNullOrEmpty(strCondition)) + { + //strSql.Append(" where 1=1 AND " + strCondition); + strSql.Append(" where (t.GID=t.PGID OR t.PGID='' OR t.PGID IS NULL) AND EXISTS ( select 1 from tMsWlPcHead WHERE t.GID=tMsWlPcHead.PGID AND " + strCondition + " )"); + } + else + { + //strSql.Append(" where 1=1 " ); + strSql.Append(" where (t.GID=t.PGID OR t.PGID='' OR t.PGID IS NULL) "); + + } + + + var sortstring = DatasetSort.Getsortstring(sort); + if (!string.IsNullOrEmpty(sortstring)) + { + if (sortstring.ToUpper().IndexOf("DRINVSTATUS") >= 0) + strSql.Append(" order by " + sortstring.Replace("DRINVSTATUS", " CASE WHEN ISNULL(I.TTLINVDR,0)=0 THEN '未开票' ELSE CASE WHEN ISNULL(I.TTLINVDR,0)=ISNULL(I.TTLDR,0) THEN '已开票' ELSE '部分开票' END END ")); + + if (sortstring.ToUpper().IndexOf("DRDUISTATUS") >= 0) + strSql.Append(" order by " + sortstring.Replace("DRDUISTATUS", " CASE WHEN ISNULL(I.TTLDUIDR,0)=0 THEN '未对账' ELSE CASE WHEN ISNULL(I.TTLDUIDR,0)=ISNULL(I.TTLDR,0) THEN '已对账' ELSE '部分对账' END END ")); + + + strSql.Append(" order by " + sortstring); + } + else + { + strSql.Append(" order by Expdate,billno "); + } + return SetHYRDData(strSql); + } + + + static public MsWlPcHead_WFSDEdit GetHYRDData(string condition) + { + var strSql = new StringBuilder(); + strSql.Append(" select CargoID,LoadFactory,PcBillType,PGid,BLTYPE,TRANSSTATUS "); + strSql.Append(" ,(select EnumValueName from tSysEnumValue where LangId=0 and EnumTypeID=99046 and EnumValueID=t.PcBillType) PcBillTypeREF "); + strSql.Append(" ,convert(bigint ,t.TimeMark) as timeMark,gId,UserName "); + strSql.Append(" ,ROW_NUMBER()over (partition by dbo.trimdate(expdate) order by expdate ) RowNumber "); + strSql.Append(" ,BillNo,dbo.trimtime(ExpDate) ExpDate, dbo.trimdate(expdate) GroupDate ,ArriveDate,ReturnDate "); + strSql.Append(" ,CustomerName,F_CustomerName,t.DrvName,t.DdName,t.DrvCode,t.TruckNo,MblNo,LinkMan,DstArea,DetiNation,ContainerQty,GOODSCOUNT,CBM "); + strSql.Append(" ,Ton,t.LoadCount,LoadPlace,TruckSpec,IsDouble,Property,RefBillNo,RefBillNose,MblNoSe,dbo.trimdate(EndPortDate) EndPortDate,VoyVeg,VoyVegSe,dbo.trimdate(EtDate) EtDate "); + strSql.Append(" ,(select sum(amount) from ch_Fee where bsno=t.gid and feename='运费' and FEETYPE=1)YUNFEI "); + strSql.Append(" ,(select sum(amount) from ch_Fee where bsno=t.gid and feename='回程合计' and FEETYPE=1)HCHJ "); + strSql.Append(" ,(select sum(amount) from ch_Fee where bsno=t.gid and feename='装卸费' and FEETYPE=1)ZXF "); + strSql.Append(" ,(select sum(amount) from ch_Fee where bsno=t.gid and feename='代垫费' and FEETYPE=1)DDF "); + strSql.Append(" ,(select sum(amount) from ch_Fee where bsno=t.gid and feename not in('运费','回程合计','装卸费','代垫费') and FEETYPE=1)QTFee "); + strSql.Append(" ,(select sum(amount) from ch_Fee where bsno=t.gid and FEETYPE=1)TotalFee,t.Remark,t.FeeStatus,dbo.trimdate(LrDate) LrDate"); + strSql.Append(" ,case when t.TruckNo='' then '接单' else case when isnull(isend,0)=0 then '派车' else '完成' end end PCSTATUSREF "); + strSql.Append(" ,ContainerType,ContainerTypeSe,LinkTel,YardName,LinkManSe,LinkTelSe,RtnYardName,BsType,CustName,CustLikeManName,CustTel,ChangedReson,DispatchName,RoadFee,FactoryAddr,ContainerNo,SealNo"); + strSql.Append(",dbo.F_GetBillDrFeeStatus(t.GId) DRFEESTATUS"); + strSql.Append(",dbo.F_GetBillCrFeeStatus(t.GId) CRFEESTATUS"); + strSql.Append(",(SELECT TOP 1 STATUS FROM V_OP_STATUS WITH (NOLOCK) WHERE BSNO=t.GId ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS"); + strSql.Append(",'' AS COLOR"); + strSql.Append(",t.SALECORPID,(select [NAME] from [company] where GID=t.SALECORPID) as SALECORP,DCLASS,DUNNO"); + strSql.Append(",ISSHUISHI,ISGAOWEN,ISXIANLIANG,ISCHECHUAN,ISHAIWU,ISFENGXIANG,ISWEISHENBAO,ISBAOGUAN,ISPINGTAI,FrTruckNo,FrDrvName,WmsTruckNo,WmsDrvName"); + strSql.Append(" ,INVOICENO,KINDPKGS,CUSTNO,SalesName,GoodsName,PORTLOAD,DESTINATION,RtnDocStatus,RtnDocTime,ACCDATE,(CASE FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF,(CASE ISNULL(BillStatus,0) WHEN 1 THEN '锁定' else '未锁定' end) as BSSTATUSREF" + + ",FuelPrice,FuelQty,RealMil,isEnd,RatedMil,RatedFuel,DetiNationSe,FactoryAddrSe,ContainerNoSe,EtDateSe,YardCodeSe,YardNameSe "); + strSql.Append(",I.TTLDR,I.TTLINVDR,I.TTLDUIDR,I.TTLCR,I.TTLINVCR,I.TTLDUICR,ISCANCEL"); + strSql.Append(" from tMsWlPcHead t "); + strSql.Append(" LEFT JOIN v_op_gain_dr_INV I ON (I.BSNO=t.GID) "); + if (!string.IsNullOrEmpty(condition)) + { + strSql.Append(" where " + condition.Replace("~", ""));//str.Replace("b","**"); + } + var list = SetHYRDData(strSql); + if (list.Count > 0) + return list[0]; + + return new MsWlPcHead_WFSDEdit(); + } + + private static List SetHYRDData(StringBuilder strSql) + { + var headList = new List(); + Database db = DatabaseFactory.CreateDatabase(); + using (IDataReader reader = db.ExecuteReader(CommandType.Text, strSql.ToString())) + { + + while (reader.Read()) + { + MsWlPcHead_WFSDEdit data = new MsWlPcHead_WFSDEdit(); + #region Set DB data to Object + + data.PcBillType = Convert.ToString(reader["PcBillType"]); + data.PcBillTypeREF = Convert.ToString(reader["PcBillTypeREF"]); + data.timeMark = Convert.ToDecimal(reader["timeMark"]); + data.gId = Convert.ToString(reader["gId"]); + data.PGid = Convert.ToString(reader["PGid"]); + data.BLTYPE = Convert.ToString(reader["BLTYPE"]); + data.TRANSSTATUS = Convert.ToString(reader["TRANSSTATUS"]); + data.RowNumber = Convert.ToString(reader["RowNumber"]); + data.BillNo = Convert.ToString(reader["BillNo"]); + if (reader["ExpDate"] != DBNull.Value) + data.ExpDate = Convert.ToDateTime(reader["ExpDate"]).ToString("yyyy-MM-dd");//到港日期 + data.GroupDate = Convert.ToString(reader["GroupDate"]); + data.ArriveDate = Convert.ToString(reader["ArriveDate"]); + data.ReturnDate = Convert.ToString(reader["ReturnDate"]); + data.CustomerName = Convert.ToString(reader["CustomerName"]); + data.F_CustomerName = Convert.ToString(reader["F_CustomerName"]); + data.DrvName = Convert.ToString(reader["DrvName"]); + data.DdName = Convert.ToString(reader["DdName"]); + + data.DrvCode = Convert.ToString(reader["DrvCode"]); + data.TruckNo = Convert.ToString(reader["TruckNo"]); + data.MblNo = Convert.ToString(reader["MblNo"]); + data.LinkMan = Convert.ToString(reader["LinkMan"]); + data.DstArea = Convert.ToString(reader["DstArea"]); + data.DetiNation = Convert.ToString(reader["DetiNation"]); + data.ContainerQty = Convert.ToString(reader["ContainerQty"]); + data.Ton = Convert.ToString(reader["Ton"]); + data.GOODSCOUNT = Convert.ToString(reader["GOODSCOUNT"]); + data.CBM = Convert.ToString(reader["CBM"]); + data.LoadCount = Convert.ToString(reader["LoadCount"]); + data.LoadPlace = Convert.ToString(reader["LoadPlace"]); + data.TruckSpec = Convert.ToString(reader["TruckSpec"]); + data.IsDouble = Convert.ToString(reader["IsDouble"]); + data.Property = Convert.ToString(reader["Property"]); + data.YUNFEI = Convert.ToString(reader["yunfei"]); + data.HCHJ = Convert.ToString(reader["HCHJ"]); + data.ZXF = Convert.ToString(reader["ZXF"]); + data.DDF = Convert.ToString(reader["DDF"]); + data.QTFee = Convert.ToString(reader["QTFee"]); + data.TotalFee = Convert.ToString(reader["TotalFee"]); + data.Remark = Convert.ToString(reader["Remark"]); + data.FEESTATUS = Convert.ToString(reader["FeeStatus"]); + data.UserName = Convert.ToString(reader["UserName"]); + data.LrDate = Convert.ToString(reader["LrDate"]); + data.PCSTATUSREF = Convert.ToString(reader["PCSTATUSREF"]); + data.RefBillNo = Convert.ToString(reader["RefBillNo"]); + data.RefBillNose = Convert.ToString(reader["RefBillNose"]); + data.MblNoSe = Convert.ToString(reader["MblNoSe"]); + data.ContainerType = Convert.ToString(reader["ContainerType"]); + if (BasicDataRefDAL.ReadFieldExist(reader, "ContainerTypeSe")) + data.ContainerTypeSe = Convert.ToString(reader["ContainerTypeSe"]); + + data.LinkTel = Convert.ToString(reader["LinkTel"]); + data.YardName = Convert.ToString(reader["YardName"]); + data.LinkManSe = Convert.ToString(reader["LinkManSe"]); + data.LinkTelSe = Convert.ToString(reader["LinkTelSe"]); + data.RtnYardName = Convert.ToString(reader["RtnYardName"]); + data.BsType = Convert.ToString(reader["BsType"]); + data.CustName = Convert.ToString(reader["CustName"]); + data.CustLikeManName = Convert.ToString(reader["CustLikeManName"]); + data.CustTel = Convert.ToString(reader["CustTel"]); + data.ChangedReson = Convert.ToString(reader["ChangedReson"]); + data.FactoryAddr = Convert.ToString(reader["FactoryAddr"]); + data.DispatchName = Convert.ToString(reader["DispatchName"]); + data.INVOICENO = Convert.ToString(reader["INVOICENO"]); + data.KINDPKGS = Convert.ToString(reader["KINDPKGS"]); + data.CUSTNO = Convert.ToString(reader["CUSTNO"]); + data.SalesName = Convert.ToString(reader["SalesName"]); + data.VoyVeg = Convert.ToString(reader["VoyVeg"]); + data.VoyVegSe = Convert.ToString(reader["VoyVegSe"]); + data.EtDate = Convert.ToString(reader["EtDate"]); + data.EndPortDate = Convert.ToString(reader["EndPortDate"]); + data.GoodsName = Convert.ToString(reader["GoodsName"]); + data.PORTLOAD = Convert.ToString(reader["PORTLOAD"]); + data.DESTINATION = Convert.ToString(reader["DESTINATION"]); + data.CargoID = Convert.ToString(reader["CARGOID"]); + data.LoadFactory = Convert.ToString(reader["LOADFACTORY"]); + data.RtnDocStatus = Convert.ToString(reader["RtnDocStatus"]); + data.RtnDocTime = Convert.ToString(reader["RtnDocTime"]); + if (reader["RoadFee"] != DBNull.Value) + data.RoadFee = Convert.ToDecimal(reader["RoadFee"]); + + data.DRFEESTATUS = getfeestatus(Convert.ToString(reader["DRFEESTATUS"])); + data.CRFEESTATUS = getfeestatus(Convert.ToString(reader["CRFEESTATUS"])); + if (reader["FEESTATUSREF"] != DBNull.Value) + data.FEESTATUSREF = Convert.ToString(reader["FEESTATUSREF"]);//费用状态 + // if (reader["BSSTATUSREF"] != DBNull.Value) + data.BSSTATUSREF = Convert.ToString(reader["BSSTATUSREF"]);//费用状态 + data.ACCDATE = Convert.ToString(reader["ACCDATE"]); + data.ContainerNo = Convert.ToString(reader["ContainerNo"]); + data.SealNo = Convert.ToString(reader["SealNo"]); + data.SALECORP = Convert.ToString(reader["SALECORP"]); + data.SALECORPID = Convert.ToString(reader["SALECORPID"]); + data.DCLASS = Convert.ToString(reader["DCLASS"]); + data.DUNNO = Convert.ToString(reader["DUNNO"]); + data.OPSTATUS = Convert.ToString(reader["OPSTATUS"]); + data.COLOR = Convert.ToString(reader["COLOR"]); + + data.FuelPrice = Convert.ToString(reader["FuelPrice"]); + if (reader["FuelQty"] != DBNull.Value) + data.FuelQty = Convert.ToDecimal(reader["FuelQty"]); + if (reader["RealMil"] != DBNull.Value) + data.RealMil = Convert.ToDecimal(reader["RealMil"]); + if (reader["RatedMil"] != DBNull.Value) + data.RatedMil = Convert.ToDecimal(reader["RatedMil"]); + if (reader["RatedFuel"] != DBNull.Value) + data.RatedFuel = Convert.ToDecimal(reader["RatedFuel"]); + data.DetiNationSe = Convert.ToString(reader["DetiNationSe"]); + data.FactoryAddrSe = Convert.ToString(reader["FactoryAddrSe"]); + data.ContainerNoSe = Convert.ToString(reader["ContainerNoSe"]); + if (reader["ISSHUISHI"] != DBNull.Value) + data.ISSHUISHI = Convert.ToBoolean(reader["ISSHUISHI"]); + if (reader["ISGAOWEN"] != DBNull.Value) + data.ISGAOWEN = Convert.ToBoolean(reader["ISGAOWEN"]); + if (reader["ISXIANLIANG"] != DBNull.Value) + data.ISXIANLIANG = Convert.ToBoolean(reader["ISXIANLIANG"]); + if (reader["ISCHECHUAN"] != DBNull.Value) + data.ISCHECHUAN = Convert.ToBoolean(reader["ISCHECHUAN"]); + if (reader["ISHAIWU"] != DBNull.Value) + data.ISHAIWU = Convert.ToBoolean(reader["ISHAIWU"]); + if (reader["ISFENGXIANG"] != DBNull.Value) + data.ISFENGXIANG = Convert.ToBoolean(reader["ISFENGXIANG"]); + if (reader["ISWEISHENBAO"] != DBNull.Value) + data.ISWEISHENBAO = Convert.ToBoolean(reader["ISWEISHENBAO"]); + if (reader["ISBAOGUAN"] != DBNull.Value) + data.ISBAOGUAN = Convert.ToBoolean(reader["ISBAOGUAN"]); + if (reader["ISPINGTAI"] != DBNull.Value) + data.ISPINGTAI = Convert.ToBoolean(reader["ISPINGTAI"]); + data.FrTruckNo = Convert.ToString(reader["FrTruckNo"]); + data.FrDrvName = Convert.ToString(reader["FrDrvName"]); + data.WmsTruckNo = Convert.ToString(reader["WmsTruckNo"]); + data.WmsDrvName = Convert.ToString(reader["WmsDrvName"]); + data.EtDateSe = Convert.ToString(reader["EtDateSe"]); + data.YardCodeSe = Convert.ToString(reader["YardCodeSe"]); + data.YardNameSe = Convert.ToString(reader["YardNameSe"]); + + data.isEnd = Convert.ToString(reader["isEnd"]); + + decimal ttldr = 0; + decimal ttlduidr = 0; + if (reader["TTLDR"] != DBNull.Value) + ttldr = Convert.ToDecimal(reader["TTLDR"]); + decimal ttlinvdr = 0; + if (reader["TTLINVDR"] != DBNull.Value) + ttlinvdr = Convert.ToDecimal(reader["TTLINVDR"]); + if (reader["TTLDUIDR"] != DBNull.Value) + ttlduidr = Convert.ToDecimal(reader["TTLDUIDR"]); + + if (ttlinvdr == 0) data.DRINVSTATUS = "未开票"; + else if (ttlinvdr == ttldr) data.DRINVSTATUS = "已开票"; + else if (ttlinvdr != ttldr) data.DRINVSTATUS = "部分开票"; + + if (ttlduidr == 0) data.DRDUISTATUS = "未对账"; + else if (ttlduidr == ttldr) data.DRDUISTATUS = "已对账"; + else if (ttlduidr != ttldr) data.DRDUISTATUS = "部分对账"; + data.ISCANCEL = Convert.ToString(reader["ISCANCEL"]); + #endregion + headList.Add(data); + } + reader.Close(); + } + return headList; + } public static DBResult SaveFixFee(string LE_ID, List bodyList) { diff --git a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_HYRDIndex.js b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_HYRDIndex.js index 90b4635f..8c6a90a3 100644 --- a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_HYRDIndex.js +++ b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_HYRDIndex.js @@ -298,7 +298,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, { proxy: { type: 'ajax', //url: '/TruckMng/MsRptPcHeadOperate/QryData_ADL', - url: '/TruckMng/PcHeadEdit_WFSD/GetDataList', + url: '/TruckMng/PcHeadEdit_WFSD/GetHYRDDataList', //this.storeList.proxy.url = '/TruckMng/MsRptPcHeadOperate/QryData_ADL'; reader: { id: '', diff --git a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_ZXIndex.js b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_ZXIndex.js index 316c8cf2..02410173 100644 --- a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_ZXIndex.js +++ b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_ZXIndex.js @@ -297,7 +297,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, { proxy: { type: 'ajax', //url: '/TruckMng/MsRptPcHeadOperate/QryData_ADL', - url: '/TruckMng/PcHeadEdit_WFSD/GetDataList', + url: '/TruckMng/PcHeadEdit_WFSD/GetHYRDDataList', //this.storeList.proxy.url = '/TruckMng/MsRptPcHeadOperate/QryData_ADL'; reader: { id: '', diff --git a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcWFSDEdit.js b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcWFSDEdit.js index 7ab6c46a..02804cb6 100644 --- a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcWFSDEdit.js +++ b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcWFSDEdit.js @@ -33,7 +33,7 @@ Ext.extend(DsTruck.MsPcWFSDEdit, Ext.Panel, { { name: 'BLTYPE', type: 'string' }, { name: 'RowNumber', type: 'string' }, { name: 'BillNo', type: 'string' }, - { name: 'ExpDate', type: 'date', dateFormat: 'Y-m-d H:i:s' }, + { name: 'ExpDate', type: 'string'}, { name: 'GroupDate', type: 'string' }, { name: 'EndPortDate', type: 'date'}, { name: 'EtDate', type: 'date' }, @@ -1647,7 +1647,7 @@ Ext.extend(DsTruck.MsPcWFSDEdit, Ext.Panel, { this.opStatus = opstatus; Ext.Ajax.request({ waitMsg: '正在查询主表数据...', - url: '/TruckMng/PcHeadEdit_WFSD/GetData', + url: '/TruckMng/PcHeadEdit_WFSD/GetHYRDData', params: { handle: 'edit', condition: condition diff --git a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcZXEdit.js b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcZXEdit.js index 2b413ff9..a787b4ab 100644 --- a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcZXEdit.js +++ b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcZXEdit.js @@ -2234,7 +2234,7 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, { this.opStatus = opstatus; Ext.Ajax.request({ waitMsg: '正在查询主表数据...', - url: '/TruckMng/PcHeadEdit_WFSD/GetData', + url: '/TruckMng/PcHeadEdit_WFSD/GetHYRDData', params: { handle: opstatus, condition: condition diff --git a/DSWeb/Default.aspx b/DSWeb/Default.aspx index 578fd2bc..db86972e 100644 --- a/DSWeb/Default.aspx +++ b/DSWeb/Default.aspx @@ -97,42 +97,48 @@ window.AddTab = function (modname, url, cname) { var MainCenter = Ext.getCmp("MainCenter"); if (url == '#') return; + var tmpurl = url; + if (tmpurl.indexOf('?') > 0) tmpurl = tmpurl.substring(0, tmpurl.indexOf('?')); var finded = false; + var isenable = false; + var storeModuleEnable = MainCenter.ownerCt.PubStore_storeModuleEnable; + if (storeModuleEnable.getCount() > 0) { + for (var j = 0; j < storeModuleEnable.getCount(); j += 1) { + var member = storeModuleEnable.getAt(j); + if (member.data.MODULEURL == tmpurl) { + isenable = true; + var obj = MainCenter.queryById('pnl' + modname); + if (obj != null) + MainCenter.remove(obj); + + if (finded == false) { + var paneltabitems = new Ext.Panel({ + id: 'pnl' + modname, + layout: "fit", + region: "center", + autoScroll: true, + frame: false, + closable: true, + bodyStyle: { + // background: 'rgba(0, 0, 0, 1) none repeat scroll 0 0 !important' + }, + title: cname, + html: ' ' + }); + MainCenter.add(paneltabitems); + MainCenter.setActiveTab(paneltabitems); + MainCenter.doLayout(); + } + + } + }; + } + if (!isenable) { + Ext.Msg.show({ title: '提示', msg: '没有此模块权限!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); + return; - var obj = MainCenter.queryById('pnl' + modname); - if (obj != null) - MainCenter.remove(obj); - //var children = MainCenter.items; - //if (children) { - // for (var i = 0, len = children.length; i < len; i++) { - // if (children.items[i].id) { - // if (children.items[i].id == 'pnl' + modname) { - // MainCenter.remove(obj); - // //MainCenter.setActiveTab(i); - // //finded = true; - // } - // } - // } - //} - - if (finded == false) { - var paneltabitems = new Ext.Panel({ - id: 'pnl' + modname, - layout: "fit", - region: "center", - autoScroll: true, - frame: false, - closable: true, - bodyStyle: { - // background: 'rgba(0, 0, 0, 1) none repeat scroll 0 0 !important' - }, - title: cname, - html: ' ' - }); - MainCenter.add(paneltabitems); - MainCenter.setActiveTab(paneltabitems); - MainCenter.doLayout(); } + }