diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js index 70dac46e..b804ba4f 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js +++ b/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, diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAire/MsOpAireIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAire/MsOpAireIndex.js index 1bd22c72..6cc91e0e 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAire/MsOpAireIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAire/MsOpAireIndex.js @@ -3093,68 +3093,88 @@ 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 pbsno = bsno; + var BSNOStr = ''; + 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'; - Ext.Ajax.request({ - waitMsg: '正在查询主表数据...', //'正在添加数据...', - url: urlStr, - params: { - optype: 'op_aire', - bsno: bsno, - pbsno: pbsno - }, - callback: function (options, success, response) { - if (success) { - var result = Ext.JSON.decode(response.responseText); - if (!result.Success) { - if (result.Message != '') { - Ext.Msg.show({ - title: '提示', - msg: result.Message, - icon: Ext.MessageBox.ERROR, - buttons: Ext.Msg.OK - }); - } else { - if (_this.winAccess) { _this.winAccess.close(); } - _this.winAccess = new Shipping.DsAudit({ + 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; - }); - _this.winAccess.Record = result.Data; - _this.winAccess.BsNo = bsno; - _this.winAccess.stroplb = 'op_aire'; - _this.winAccess.Parentformname = 'op_aire'; - _this.winAccess.show(); + } else { - return; + var urlStr = '/Account/Chfee_Audit/PLSubmitAuditBL'; + Ext.Ajax.request({ + waitMsg: '正在查询主表数据...', //'正在添加数据...', + url: urlStr, + params: { + optype: 'op_aire', + bsnos: BSNOStr + }, + callback: function (options, success, response) { + if (success) { + var result = Ext.JSON.decode(response.responseText); + if (!result.Success) { + if (result.Message != '') { + Ext.Msg.show({ + title: '提示', + msg: result.Message, + 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({ - } - return; - } else { + }); + _this.winAccess.Record = result.Data; + _this.winAccess.BsNo = result.Message2; + _this.winAccess.Mblno = result.Message3; + _this.winAccess.stroplb = 'op_aire'; + _this.winAccess.Parentformname = 'op_aire'; + _this.winAccess.show(); + return; + } + return; + } else { - if (result.Data != '' && result.Data != null) { - Ext.Msg.show({ - title: '提示', - msg: '已提交审核,' + result.Data, - icon: Ext.MessageBox.ERROR, - buttons: Ext.Msg.OK - }); - } + _this.onDsQuery(); - } - } else { - Ext.MessageBox.alert('请求出现错误,请重试', response.responseText); - } - }, - scope: this - }); + if (result.Data != '' && result.Data != null) { + Ext.Msg.show({ + title: '提示', + msg: '已提交审核,' + result.Data, + icon: Ext.MessageBox.ERROR, + buttons: Ext.Msg.OK + }); + } + + } + } else { + Ext.MessageBox.alert('请求出现错误,请重试', response.responseText); + } + }, + scope: this + }); + } //var BSNOStr = ''; diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAiri/MsOpAiriIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAiri/MsOpAiriIndex.js index ed6cc863..06c84411 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAiri/MsOpAiriIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAiri/MsOpAiriIndex.js @@ -2487,67 +2487,88 @@ 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 pbsno = bsno; + var BSNOStr = ''; + 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'; - Ext.Ajax.request({ - waitMsg: '正在查询主表数据...', //'正在添加数据...', - url: urlStr, - params: { - optype: 'op_airi', - bsno: bsno, - pbsno: pbsno - }, - callback: function (options, success, response) { - if (success) { - var result = Ext.JSON.decode(response.responseText); - if (!result.Success) { - if (result.Message != '') { - Ext.Msg.show({ - title: '提示', - msg: result.Message, - icon: Ext.MessageBox.ERROR, - buttons: Ext.Msg.OK - }); - } else { - if (_this.winAccess) { _this.winAccess.close(); } - _this.winAccess = new Shipping.DsAudit({ + 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; - }); - _this.winAccess.Record = result.Data; - _this.winAccess.BsNo = bsno; - _this.winAccess.stroplb = 'op_airi'; - _this.winAccess.Parentformname = 'op_airi'; - _this.winAccess.show(); + } else { - return; + var urlStr = '/Account/Chfee_Audit/PLSubmitAuditBL'; + Ext.Ajax.request({ + waitMsg: '正在查询主表数据...', //'正在添加数据...', + url: urlStr, + params: { + optype: 'op_airi', + bsnos: BSNOStr + }, + callback: function (options, success, response) { + if (success) { + var result = Ext.JSON.decode(response.responseText); + if (!result.Success) { + if (result.Message != '') { + Ext.Msg.show({ + title: '提示', + msg: result.Message, + 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({ - } - return; - } else { + }); + _this.winAccess.Record = result.Data; + _this.winAccess.BsNo = result.Message2; + _this.winAccess.Mblno = result.Message3; + _this.winAccess.stroplb = 'op_airi'; + _this.winAccess.Parentformname = 'op_airi'; + _this.winAccess.show(); + return; + } + return; + } else { + + _this.onDsQuery(); + + + if (result.Data != '' && result.Data != null) { + Ext.Msg.show({ + title: '提示', + msg: '已提交审核,' + result.Data, + icon: Ext.MessageBox.ERROR, + buttons: Ext.Msg.OK + }); + } - if (result.Data != '' && result.Data != null) { - Ext.Msg.show({ - title: '提示', - msg: '已提交审核,' + result.Data, - icon: Ext.MessageBox.ERROR, - buttons: Ext.Msg.OK - }); } + } else { + Ext.MessageBox.alert('请求出现错误,请重试', response.responseText); } - - } else { - Ext.MessageBox.alert('请求出现错误,请重试', response.responseText); - } - }, - scope: this - }); + }, + scope: this + }); + } diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiIndex.js index 8af0ec3b..cc313edc 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiIndex.js @@ -4808,67 +4808,88 @@ 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 pbsno = bsno; + var BSNOStr = ''; + 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'; - Ext.Ajax.request({ - waitMsg: '正在查询主表数据...', //'正在添加数据...', - url: urlStr, - params: { - optype: 'op_seai', - bsno: bsno, - pbsno: pbsno - }, - callback: function (options, success, response) { - if (success) { - var result = Ext.JSON.decode(response.responseText); - if (!result.Success) { - if (result.Message != '') { - Ext.Msg.show({ - title: '提示', - msg: result.Message, - icon: Ext.MessageBox.ERROR, - buttons: Ext.Msg.OK - }); - } else { - if (_this.winAccess) { _this.winAccess.close(); } - _this.winAccess = new Shipping.DsAudit({ + 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; - }); - _this.winAccess.Record = result.Data; - _this.winAccess.BsNo = bsno; - _this.winAccess.stroplb = 'op_seai'; - _this.winAccess.Parentformname = 'op_seai'; - _this.winAccess.show(); + } else { - return; + var urlStr = '/Account/Chfee_Audit/PLSubmitAuditBL'; + Ext.Ajax.request({ + waitMsg: '正在查询主表数据...', //'正在添加数据...', + url: urlStr, + params: { + optype: 'op_seai', + bsnos: BSNOStr + }, + callback: function (options, success, response) { + if (success) { + var result = Ext.JSON.decode(response.responseText); + if (!result.Success) { + if (result.Message != '') { + Ext.Msg.show({ + title: '提示', + msg: result.Message, + 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({ - } - return; - } else { + }); + _this.winAccess.Record = result.Data; + _this.winAccess.BsNo = result.Message2; + _this.winAccess.Mblno = result.Message3; + _this.winAccess.stroplb = 'op_seai'; + _this.winAccess.Parentformname = 'op_seai'; + _this.winAccess.show(); + return; + } + return; + } else { + + _this.onDsQuery(); + + + if (result.Data != '' && result.Data != null) { + Ext.Msg.show({ + title: '提示', + msg: '已提交审核,' + result.Data, + icon: Ext.MessageBox.ERROR, + buttons: Ext.Msg.OK + }); + } - if (result.Data != '' && result.Data != null) { - Ext.Msg.show({ - title: '提示', - msg: '已提交审核,' + result.Data, - icon: Ext.MessageBox.ERROR, - buttons: Ext.Msg.OK - }); } + } else { + Ext.MessageBox.alert('请求出现错误,请重试', response.responseText); } - - } else { - Ext.MessageBox.alert('请求出现错误,请重试', response.responseText); - } - }, - scope: this - }); + }, + scope: this + }); + }