1

DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/OrderFeeGrid.js

@@ -880,6 +880,8 @@ Ext.extend(Shipping.OrderFeeGrid, Ext.Panel, {
                 editor: {
                     xtype: 'numberfield',
                     keyNavEnabled: false,
+                    allowDecimals: true,
+                    decimalPrecision: 3,
                     selectOnFocus: true,
                     hideTrigger: true,
                     mouseWheelEnabled: false,
@@ -2820,7 +2822,7 @@ Ext.extend(Shipping.OrderFeeGrid, Ext.Panel, {
     cellEditingChFeeBeforeEdit: function (editor, e) {
         var allow = this.getAllowOperationDetail();
         if (allow == false) {
-            return;
+            return false;
         }
         var chfeefeeStatus = e.record.get('FeeStatus');
         var canedit = chfeefeeStatus == 1 || chfeefeeStatus == 6 || chfeefeeStatus == 2;

DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js

@@ -3026,11 +3026,13 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
         //
         var jsonBody = ConvertRecordsToJsonAll(bodydatas);
         //var jsonDelBody = ConvertRecordsToJsonAll(this.bodyDel);
+        this.formHead.getForm().findField('BSNO').setDisabled(false);
         this.formHead.getForm().findField('ORDNO').setDisabled(false);
         var data = this.formHead.getForm().getValues(false, false, false);
         var data2 = this.formEdit.getForm().getValues(false, false, false);
         var data3 = this.formBill.getForm().getValues(false, false, false);
         this.formHead.getForm().findField('ORDNO').setDisabled(true);
+        this.formHead.getForm().findField('BSNO').setDisabled(true);
         //
         Ext.Msg.wait('正在保存数据, 请稍侯..');
         Ext.Ajax.request({
@@ -3389,12 +3391,14 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
         }
 
         //var jsonDelBody = ConvertRecordsToJsonAll(this.bodyDel);
+        this.formHead.getForm().findField('BSNO').setDisabled(false);
         this.formHead.getForm().findField('ORDNO').setDisabled(false);
         this.formHead.getForm().findField('STLNAME').setDisabled(false);
         this.formHead.getForm().findField('STLDATE').setDisabled(false);
         var data = this.formHead.getForm().getValues(false, false, false);
         var data2 = this.formEdit.getForm().getValues(false, false, false);
         var data3 = this.formBill.getForm().getValues(false, false, false);
+        this.formHead.getForm().findField('BSNO').setDisabled(true);
         this.formHead.getForm().findField('ORDNO').setDisabled(true);
         this.formHead.getForm().findField('STLNAME').setDisabled(true);
         this.formHead.getForm().findField('STLDATE').setDisabled(true);
@@ -3538,11 +3542,12 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
         }
         var jsonBody = ConvertRecordsToJsonAll(bodydatas);
 
+        this.formHead.getForm().findField('BSNO').setDisabled(false);
         this.formHead.getForm().findField('ORDNO').setDisabled(false);
         var data = this.formHead.getForm().getValues(false, false, false);
         var data2 = this.formEdit.getForm().getValues(false, false, false);
         var data3 = this.formBill.getForm().getValues(false, false, false);
-        this.formHead.getForm().findField('ORDNO').setDisabled(true);
+        this.formHead.getForm().findField('BSNO').setDisabled(true);
 
 
         _this = this;
@@ -3647,11 +3652,13 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
         }
 
         var Duino = this.formHead.getForm().findField('ORDNO').getValue();
+        this.formHead.getForm().findField('BSNO').setDisabled(false);
         this.formHead.getForm().findField('ORDNO').setDisabled(false);
         var data = this.formHead.getForm().getValues(false, false, false);
         var data2 = this.formEdit.getForm().getValues(false, false, false);
         var data3 = this.formBill.getForm().getValues(false, false, false);
         this.formHead.getForm().findField('ORDNO').setDisabled(true);
+        this.formHead.getForm().findField('BSNO').setDisabled(true);
 
         _this = this;
 
@@ -3867,11 +3874,13 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
 
         }
 
+        this.formHead.getForm().findField('BSNO').setDisabled(false);
         this.formHead.getForm().findField('ORDNO').setDisabled(false);
         var data = this.formHead.getForm().getValues(false, false, false);
         var data2 = this.formEdit.getForm().getValues(false, false, false);
         var data3 = this.formBill.getForm().getValues(false, false, false);
         this.formHead.getForm().findField('ORDNO').setDisabled(true);
+        this.formHead.getForm().findField('BSNO').setDisabled(true);
 
         var Duino = this.formHead.getForm().findField('ORDNO').getValue();
 

DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderIndex.js

@@ -7,7 +7,7 @@ Shipping.MsSeaeOrderIndex = function (config) {
 };
 
 Ext.extend(Shipping.MsSeaeOrderIndex, Ext.Panel, {
-    PageSize: 20,
+    PageSize: 100,
     OprationStatus: null, //仅当弹出界面时使用
     SelectedRecord: null,
     isShowAdvancedQuery: 0, //是否显示高级查询面板