Merge branch 'DS7_JingHan' of http://60.209.125.238:13080/dengyu/DS7 into DS7_JingHan

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()

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') {
+        //if (!BillFeeStatus) {
-            Ext.Msg.show({ title: Zi.LAN.FEE.ChuoWu, msg: "只有整票状态为 '未提交'或 '整票驳回'才允许操作费用！", icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
+        //}
-            return false;
+        //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方法

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.gridListSum.reconfigure(_this.storeSumList, _this.girdcolumsSum);
-                    _this.storeSumList.load({
+                    //_this.storeSumList.load({
-                        params: { condition: sql },
+                    //    params: { condition: sql },
-                        waitMsg: "正在查询数据...",
+                    //    waitMsg: "正在查询数据...",
-                        scope: this
+                    //    scope: this
-                    });
+                    //});
 
                 }
             }

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' }
     ]
 });