diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_lock/Chfee_lock.js b/DSWeb/Areas/Account/Viewsjs/Chfee_lock/Chfee_lock.js index 08de2bb6..0da9676a 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_lock/Chfee_lock.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_lock/Chfee_lock.js @@ -1178,14 +1178,18 @@ Ext.extend(Shipping.MsChfeelock, Ext.Panel, { this.storeCustCode = Ext.create('DsExt.ux.RefTableStore', { model: 'DsShipping.ux.CustomRefModel', - proxy: { url: '/CommMng/BasicDataRef/GetCustomRefList' } + proxy: { url: '/CommMng/BasicDataRef/GetCustomRefListController' } }); - this.storeCustCode.load({ params: { condition: "ISCONTROLLER='1'"} }); + // this.storeCustCode.load({ params: { condition: "ISCONTROLLER='1'"} }); this.comboxCustCode = Ext.create('DsExt.ux.RefTableCombox', { fieldLabel: '委托单位', store: this.storeCustCode, forceSelection: true, + matchFieldWidth: false, //下拉款自适应宽度 + queryMode: 'remote', + minChars: 1, + queryParam: 'CODENAME', name: 'PS_CUSTOMERNAME', valueField: 'CustName', displayField: 'CodeAndName', @@ -1202,14 +1206,17 @@ Ext.extend(Shipping.MsChfeelock, Ext.Panel, { this.storeEnterpCode = Ext.create('DsExt.ux.RefTableStore', { model: 'DsShipping.ux.CustomerRefModel', - proxy: { url: '/MvcShipping/MsBaseInfo/GetCustomerRefList' } + proxy: { url: '/MvcShipping/MsBaseInfo/GetCustomRefListEnterp' } }); - this.storeEnterpCode.load({ params: { condition: "ISENTERP='1'"} }); + // this.storeEnterpCode.load({ params: { condition: "ISENTERP='1'"} }); this.comboxEnterp = Ext.create('DsExt.ux.RefTableCombox', { fieldLabel: '经营单位', store: this.storeEnterpCode, forceSelection: true, + queryMode: 'remote', + minChars: 0, + queryParam: 'CODENAME', name: 'PS_ENTERP', valueField: 'DESCRIPTION', displayField: 'CodeAndName', diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsCodeVesselSetController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsCodeVesselSetController.cs index 03a36bd5..d05d021c 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsCodeVesselSetController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsCodeVesselSetController.cs @@ -87,7 +87,7 @@ namespace DSWeb.MvcShipping.Controllers if (handle == "edit") { - var list = code_vessel.GetVoynoList(condition); + var list = code_vessel.GetVoynoListById(condition); if (list.Count > 0) head = list[0]; } @@ -170,6 +170,8 @@ namespace DSWeb.MvcShipping.Controllers var jsonRespose = new JsonResponse { Success = re.Success, Message = re.Message }; return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) }; } + headData.DbOperationType = DbOperationType.DbotIns; + } else if (opstatus == "edit") { @@ -187,7 +189,7 @@ namespace DSWeb.MvcShipping.Controllers if (headData.CLOSEDOCDATE == "") headData.CLOSEDOCDATE = null; var modb = new ModelObjectDB(); DBResult result=modb.Save(headData); - var GID = headData.DM_ID; + var GID = headData.VOID; //DBResult result = code_vessel.InsertVoyno(headData); var jRespose = new JsonResponse { diff --git a/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs index 35c6b69d..4cba9966 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs @@ -3134,7 +3134,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL var data9 = new MsFeeUnit(); data9.SUNIT = "DAY"; data9.UNIT = "DAY"; - data9.QUANTITY = 0; + data9.QUANTITY = 1; bodyList.Add(data9); var data10 = new MsFeeUnit(); data10.SUNIT = "individual"; @@ -3168,12 +3168,12 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL var data9 = new MsFeeUnit(); data9.SUNIT = "T-天"; data9.UNIT = "天"; - data9.QUANTITY = 0; + data9.QUANTITY = 1; bodyList.Add(data9); var data10 = new MsFeeUnit(); data10.SUNIT = "G-个"; data10.UNIT = "个"; - data10.QUANTITY = 0; + data10.QUANTITY = 1; bodyList.Add(data10); var data11 = new MsFeeUnit(); data11.SUNIT = "S-小时"; @@ -3183,7 +3183,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL var data12 = new MsFeeUnit(); data12.SUNIT = "S-票"; data12.UNIT = "票"; - data12.QUANTITY = 0; + data12.QUANTITY = 1; bodyList.Add(data12); var data13 = new MsFeeUnit(); data13.SUNIT = "D-吨"; diff --git a/DSWeb/Areas/MvcShipping/DAL/code_vesselModelDal/code_vessel.cs b/DSWeb/Areas/MvcShipping/DAL/code_vesselModelDal/code_vessel.cs index f56c4419..f927bd42 100644 --- a/DSWeb/Areas/MvcShipping/DAL/code_vesselModelDal/code_vessel.cs +++ b/DSWeb/Areas/MvcShipping/DAL/code_vesselModelDal/code_vessel.cs @@ -71,7 +71,7 @@ namespace DSWeb.Areas.MvcShipping.DAL.code_vesselModelDal static public List GetVoynoListById(string headData) { string sql = "select *,(select VESSEL from code_vessel where vsid=code_voyno.vsid) as a,(select TOP 1 PORT from code_loadport where EDICODE=code_voyno.PORTLOAD) as PORTLOADREF " - + ",(select TOP 1 PORT from code_disport where EDICODE=code_voyno.PORTDISCHARGE) as PORTDISCHARGEREF,(select TOP 1 PORT from code_disport where EDICODE=code_voyno.ENTREPORT) as ENTREPORTREF from code_voyno where vsid='" + headData + "'"; + + ",(select TOP 1 PORT from code_disport where EDICODE=code_voyno.PORTDISCHARGE) as PORTDISCHARGEREF,(select TOP 1 PORT from code_disport where EDICODE=code_voyno.ENTREPORT) as ENTREPORTREF from code_voyno where VOID='" + headData + "'"; return SetFootData(sql); } private static List SetFootData(string strSql) diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsCodeVesselSet/FootEditSetEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsCodeVesselSet/FootEditSetEdit.js index b18c4d4d..b9578eb1 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsCodeVesselSet/FootEditSetEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsCodeVesselSet/FootEditSetEdit.js @@ -294,7 +294,7 @@ Ext.extend(Shipping.MsCodeGoodsEdit, Ext.Panel, { basicForm.findField('VESSEL').setValue(this.editRecord.vessel); basicForm.findField('VSID').setValue(this.editRecord.vsid); }else { - condition =this.editRecord.data.VSID; + condition = this.editRecord.data.VOID; this.LoadData(this.opStatus, condition); } }, //end InitData一个笔形成之后 diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiIndex.js index 8b7c96c3..fd3aef30 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiIndex.js @@ -709,24 +709,7 @@ Ext.extend(Shipping.MsOpSeaiIndex, Ext.Panel, { sortable: true, dataIndex: 'UNITPRICE', header: Zi.LAN.UNITPRICE, //'单价', - width: 50, - 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; - } + width: 50 }, { sortable: true,