1

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

@@ -1495,12 +1495,7 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
                       //    _thisfee.onSubmitAuditAllClick(menu, event, 1);
                       //}
                         //  }
-                        , {
+                        
-                            text: Zi.LAN.FEE.SubmitAuditBillPr, //"整票提交",
-                        handler: function (menu, event) {
-                            _thisfee.onSubmitAuditBillPrClick(menu, event, 1);
-                        }
-                        }
                         , {
                             text: Zi.LAN.FEE.SubmitAuditBill, //"整票提交",
                         id: 'DrSubmitAuditBill',
@@ -1609,6 +1604,11 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
                         this.onTruckDetailClick(button, event, 1);
                     },
                     scope: this
+                }, {
+                    text: Zi.LAN.FEE.SubmitAuditBillPr, //"整票提交",
+                    handler: function (button, event) {
+                        _thisfee.onSubmitAuditBillPrClick(button, event, 1);
+                    }
                 }, {
                     xtype: 'label',
 //                    flex: 0.4,

DSWeb/Areas/MvcShipping/Viewsjs/MsOpAire/MsOpAireIndex.js

@@ -3093,17 +3093,32 @@ Ext.extend(Shipping.MsOpAireIndex, Ext.Panel, {
             Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.QingXianXuanZeYeWu, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); //请先选择要更新的业务!
             return;
         }
-        var bsno = selections[0].data.BSNO;
+        var BSNOStr = '';
-        var pbsno = bsno;
+        for (var i = 0; i < selections.length; i++) {
+            var rec = selections[i];
+            if (rec.data.BillFeeStatus == '0' || rec.data.BillFeeStatus == '4') {
+                var BSNO = rec.data.BSNO;
+                if (BSNOStr == '')
+                    BSNOStr = BSNO;
+                else {
+
+                    BSNOStr = BSNOStr + ',' + BSNO;
+                }
+            }
+        }
+        if (BSNOStr == '') {
+            Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.MeiYouYaoGengXinDeYeWu, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+            return;
 
-        var urlStr = '/Account/Chfee_Audit/IsSubmitAuditBL';
+        } else {
+
+            var urlStr = '/Account/Chfee_Audit/PLSubmitAuditBL';
             Ext.Ajax.request({
                 waitMsg: '正在查询主表数据...', //'正在添加数据...',
                 url: urlStr,
                 params: {
                     optype: 'op_aire',
-                bsno: bsno,
+                    bsnos: BSNOStr
-                pbsno: pbsno
                 },
                 callback: function (options, success, response) {
                     if (success) {
@@ -3116,13 +3131,18 @@ Ext.extend(Shipping.MsOpAireIndex, Ext.Panel, {
                                     icon: Ext.MessageBox.ERROR,
                                     buttons: Ext.Msg.OK
                                 });
+                                if (result.Message4 != '') {
+                                    _this.onDsQuery();
+                                }
+
                             } else {
                                 if (_this.winAccess) { _this.winAccess.close(); }
                                 _this.winAccess = new Shipping.DsAudit({
 
                                 });
                                 _this.winAccess.Record = result.Data;
-                            _this.winAccess.BsNo = bsno;
+                                _this.winAccess.BsNo = result.Message2;
+                                _this.winAccess.Mblno = result.Message3;
                                 _this.winAccess.stroplb = 'op_aire';
                                 _this.winAccess.Parentformname = 'op_aire';
                                 _this.winAccess.show();
@@ -3134,7 +3154,7 @@ Ext.extend(Shipping.MsOpAireIndex, Ext.Panel, {
                             return;
                         } else {
 
-
+                            _this.onDsQuery();
 
 
                             if (result.Data != '' && result.Data != null) {
@@ -3154,7 +3174,7 @@ Ext.extend(Shipping.MsOpAireIndex, Ext.Panel, {
                 },
                 scope: this
             });
-
+        }
 
 
         //var BSNOStr = '';

DSWeb/Areas/MvcShipping/Viewsjs/MsOpAiri/MsOpAiriIndex.js

@@ -2487,17 +2487,32 @@ Ext.extend(Shipping.MsOpAiriIndex, Ext.Panel, {
             Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.QingXianXuanZeYeWu, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); //请先选择要更新的业务!
             return;
         }
-        var bsno = selections[0].data.BSNO;
+        var BSNOStr = '';
-        var pbsno = bsno;
+        for (var i = 0; i < selections.length; i++) {
+            var rec = selections[i];
+            if (rec.data.BillFeeStatus == '0' || rec.data.BillFeeStatus == '4') {
+                var BSNO = rec.data.BSNO;
+                if (BSNOStr == '')
+                    BSNOStr = BSNO;
+                else {
 
-        var urlStr = '/Account/Chfee_Audit/IsSubmitAuditBL';
+                    BSNOStr = BSNOStr + ',' + BSNO;
+                }
+            }
+        }
+        if (BSNOStr == '') {
+            Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.MeiYouYaoGengXinDeYeWu, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+            return;
+
+        } else {
+
+            var urlStr = '/Account/Chfee_Audit/PLSubmitAuditBL';
             Ext.Ajax.request({
                 waitMsg: '正在查询主表数据...', //'正在添加数据...',
                 url: urlStr,
                 params: {
                     optype: 'op_airi',
-                bsno: bsno,
+                    bsnos: BSNOStr
-                pbsno: pbsno
                 },
                 callback: function (options, success, response) {
                     if (success) {
@@ -2510,13 +2525,18 @@ Ext.extend(Shipping.MsOpAiriIndex, Ext.Panel, {
                                     icon: Ext.MessageBox.ERROR,
                                     buttons: Ext.Msg.OK
                                 });
+                                if (result.Message4 != '') {
+                                    _this.onDsQuery();
+                                }
+
                             } else {
                                 if (_this.winAccess) { _this.winAccess.close(); }
                                 _this.winAccess = new Shipping.DsAudit({
 
                                 });
                                 _this.winAccess.Record = result.Data;
-                            _this.winAccess.BsNo = bsno;
+                                _this.winAccess.BsNo = result.Message2;
+                                _this.winAccess.Mblno = result.Message3;
                                 _this.winAccess.stroplb = 'op_airi';
                                 _this.winAccess.Parentformname = 'op_airi';
                                 _this.winAccess.show();
@@ -2528,7 +2548,7 @@ Ext.extend(Shipping.MsOpAiriIndex, Ext.Panel, {
                             return;
                         } else {
 
-
+                            _this.onDsQuery();
 
 
                             if (result.Data != '' && result.Data != null) {
@@ -2548,6 +2568,7 @@ Ext.extend(Shipping.MsOpAiriIndex, Ext.Panel, {
                 },
                 scope: this
             });
+        }
 
 
 

DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiIndex.js

@@ -4808,17 +4808,32 @@ Ext.extend(Shipping.MsOpSeaiIndex, Ext.Panel, {
             Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.QingXianXuanZeYeWu, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); //请先选择要更新的业务!
             return;
         }
-        var bsno = selections[0].data.BSNO;
+        var BSNOStr = '';
-        var pbsno = bsno;
+        for (var i = 0; i < selections.length; i++) {
+            var rec = selections[i];
+            if (rec.data.BillFeeStatus == '0' || rec.data.BillFeeStatus == '4') {
+                var BSNO = rec.data.BSNO;
+                if (BSNOStr == '')
+                    BSNOStr = BSNO;
+                else {
+
+                    BSNOStr = BSNOStr + ',' + BSNO;
+                }
+            }
+        }
+        if (BSNOStr == '') {
+            Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.MeiYouYaoGengXinDeYeWu, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+            return;
+
+        } else {
 
-        var urlStr = '/Account/Chfee_Audit/IsSubmitAuditBL';
+            var urlStr = '/Account/Chfee_Audit/PLSubmitAuditBL';
             Ext.Ajax.request({
                 waitMsg: '正在查询主表数据...', //'正在添加数据...',
                 url: urlStr,
                 params: {
                     optype: 'op_seai',
-                bsno: bsno,
+                    bsnos: BSNOStr
-                pbsno: pbsno
                 },
                 callback: function (options, success, response) {
                     if (success) {
@@ -4831,13 +4846,18 @@ Ext.extend(Shipping.MsOpSeaiIndex, Ext.Panel, {
                                     icon: Ext.MessageBox.ERROR,
                                     buttons: Ext.Msg.OK
                                 });
+                                if (result.Message4 != '') {
+                                    _this.onDsQuery();
+                                }
+
                             } else {
                                 if (_this.winAccess) { _this.winAccess.close(); }
                                 _this.winAccess = new Shipping.DsAudit({
 
                                 });
                                 _this.winAccess.Record = result.Data;
-                            _this.winAccess.BsNo = bsno;
+                                _this.winAccess.BsNo = result.Message2;
+                                _this.winAccess.Mblno = result.Message3;
                                 _this.winAccess.stroplb = 'op_seai';
                                 _this.winAccess.Parentformname = 'op_seai';
                                 _this.winAccess.show();
@@ -4849,7 +4869,7 @@ Ext.extend(Shipping.MsOpSeaiIndex, Ext.Panel, {
                             return;
                         } else {
 
-
+                            _this.onDsQuery();
 
 
                             if (result.Data != '' && result.Data != null) {
@@ -4869,6 +4889,7 @@ Ext.extend(Shipping.MsOpSeaiIndex, Ext.Panel, {
                 },
                 scope: this
             });
+        }