From 9d634e18b63dc4d9b0289de89668074ffee42436 Mon Sep 17 00:00:00 2001 From: ddlucky Date: Sat, 8 Oct 2022 10:31:29 +0800 Subject: [PATCH] 20221003-1 --- .../MvcShipping/Viewsjs/MsAireOrder/MsAireOrderEdit.js | 9 +++++++-- .../MsRptOpProfitPerCent/MsRptOpProfitPerCentIndex.js | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsAireOrder/MsAireOrderEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsAireOrder/MsAireOrderEdit.js index 16a0516c..f42b8344 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsAireOrder/MsAireOrderEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsAireOrder/MsAireOrderEdit.js @@ -32,6 +32,9 @@ Ext.extend(Shipping.MsAireOrderEdit, Ext.Panel, { this.SALEORDERDEPTBYOP = 0; this.editcolumnindex = 0; + parentWin = window.parent.opener; + this.mainWin = getMainForm(parentWin); + //#region 信息加载 this.storeDefValue = Ext.create('Ext.data.Store', { model: 'DsShipping.ux.OpDefValue', @@ -3259,8 +3262,10 @@ Ext.extend(Shipping.MsAireOrderEdit, Ext.Panel, { this.panelFee.StoreDrOpRange.load({ params: { optype: "modSeaeOrderList" } }); this.panelFee.StoreCrOpRange.load({ params: { optype: "modSeaeOrderList" } }); - this.panelFee.storeFeeNameRef.load({ params: { condition: "ISSEA='1' " } }); - this.panelFee.storeFeeNameRefCr.load({ params: { condition: "ISSEA='1' " } }); + //this.panelFee.storeFeeNameRef.load({ params: { condition: "ISSEA='1' " } }); + //this.panelFee.storeFeeNameRefCr.load({ params: { condition: "ISSEA='1' " } }); + this.panelFee.storeFeeNameRef.loadData(this.mainWin.GetPubStore("CODE_FEE_AIR").data.items); + this.panelFee.storeFeeNameRefCr.loadData(this.mainWin.GetPubStore("CODE_FEE_AIR").data.items); //#endregion diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfitPerCent/MsRptOpProfitPerCentIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfitPerCent/MsRptOpProfitPerCentIndex.js index 61b8ed85..ad5b7634 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfitPerCent/MsRptOpProfitPerCentIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfitPerCent/MsRptOpProfitPerCentIndex.js @@ -537,7 +537,8 @@ Ext.extend(Shipping.MsRptOpProfitPerCentIndex, Ext.Panel, { { id: 'rdoOp', boxLabel: '操作员', name: 'OBJNAME', inputValue: 'B.OP' }, { id: 'rdoCustService', boxLabel: '客服员', name: 'OBJNAME', inputValue: 'B.CUSTSERVICE' }, { id: 'rdoDestination', boxLabel: '目的港', name: 'OBJNAME', inputValue: 'B.DESTINATION' }, - { id: 'rdoFeeObjName', boxLabel: '收付对象', name: 'OBJNAME', inputValue: 'F.CUSTOMERNAME' } + { id: 'rdoFeeObjName', boxLabel: '收付对象', name: 'OBJNAME', inputValue: 'F.CUSTOMERNAME' }, + { id: 'rdoDOC', boxLabel: '单 证', name: 'OBJNAME', inputValue: 'B.DOC' } ], listeners: { change: function (rd, newValue, oldValue, eOpts) {