diff --git a/DSWeb/Areas/MvcShipping/Models/MsOp_SuperVision_Truck/MsOp_SuperVision_Truck.cs b/DSWeb/Areas/MvcShipping/Models/MsOp_SuperVision_Truck/MsOp_SuperVision_Truck.cs index 06c38ad1..0532e35d 100644 --- a/DSWeb/Areas/MvcShipping/Models/MsOp_SuperVision_Truck/MsOp_SuperVision_Truck.cs +++ b/DSWeb/Areas/MvcShipping/Models/MsOp_SuperVision_Truck/MsOp_SuperVision_Truck.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; +using System.Web.UI.WebControls.Expressions; using Aspose.Words.Lists; using DSWeb.Areas.CommMng.DAL; using HcUtility.Core; @@ -90,6 +91,19 @@ namespace DSWeb.MvcShipping.Models.MsOp_SuperVision_Truck public string REMARK { get; set; } public decimal? TimeMark{get;set;} + + public string BillFeeStatus + { + get { + if (FEESTATUS == true) { + return "1"; + } + else { + return "0"; + } + } + } + #endregion public OP_SuperVision_Truck_md() diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js index e14f2915..9db22213 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js @@ -8647,10 +8647,15 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, { getAllowOperationDetail: function () { var BillFeeStatus = this.EditRecord.get('BillFeeStatus'); - if (BillFeeStatus != '0' && BillFeeStatus != '4') { - Ext.Msg.show({ title: Zi.LAN.FEE.ChuoWu, msg: "只有整票状态为 '未提交'或 '整票驳回'才允许操作费用!", icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK }); - return false; - } + //if (!BillFeeStatus) { + //} + //else + //{ + if (BillFeeStatus != '0' && BillFeeStatus != '4') { + Ext.Msg.show({ title: Zi.LAN.FEE.ChuoWu, msg: "只有整票状态为 '未提交'或 '整票驳回'才允许操作费用!", icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK }); + return false; + } + //} var feeStatus = this.getFeeStatus(); if (isFalse(feeStatus)) { //在MvcShipping/viewsjs/comm/DsCommm当中声明isFalse方法 diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_SuperVision_Truck/MsOp_SuperVision_TruckIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_SuperVision_Truck/MsOp_SuperVision_TruckIndex.js index 43c2eb1d..69fb1b54 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_SuperVision_Truck/MsOp_SuperVision_TruckIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_SuperVision_Truck/MsOp_SuperVision_TruckIndex.js @@ -1090,12 +1090,12 @@ Ext.extend(Shipping.MsOp_SuperVision_TruckIndex, Ext.Panel, { }); - _this.gridListSum.reconfigure(_this.storeSumList, _this.girdcolumsSum); - _this.storeSumList.load({ - params: { condition: sql }, - waitMsg: "正在查询数据...", - scope: this - }); + //_this.gridListSum.reconfigure(_this.storeSumList, _this.girdcolumsSum); + //_this.storeSumList.load({ + // params: { condition: sql }, + // waitMsg: "正在查询数据...", + // scope: this + //}); } } diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_SuperVision_Truck/MsOp_SuperVision_TruckModel.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_SuperVision_Truck/MsOp_SuperVision_TruckModel.js index 1b3ee353..0461ec44 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_SuperVision_Truck/MsOp_SuperVision_TruckModel.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_SuperVision_Truck/MsOp_SuperVision_TruckModel.js @@ -181,8 +181,8 @@ Ext.define('MsOpSuperVisionTruckModel', { { name: 'TRUCKNO', type: 'string' }, { name: 'SJDH', type: 'string' }, { name: 'REMARK', type: 'string' }, - { name: 'TimeMark', type: 'string' } - + { name: 'TimeMark', type: 'string' }, + { name: 'BillFeeStatus', type: 'string' } ] });