diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/PublicreimbursebillNoContractPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/PublicreimbursebillNoContractPlugin.java index 6d2b0cb..57e3974 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/PublicreimbursebillNoContractPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/PublicreimbursebillNoContractPlugin.java @@ -10,8 +10,10 @@ import kd.bos.dataentity.resource.ResManager; import kd.bos.entity.datamodel.IDataModel; import kd.bos.entity.datamodel.events.ChangeData; import kd.bos.entity.datamodel.events.PropertyChangedArgs; +import kd.bos.form.ClientProperties; import kd.bos.form.FormShowParameter; import kd.bos.form.control.AttachmentPanel; +import kd.bos.form.control.EntryGrid; import kd.bos.form.events.AfterDoOperationEventArgs; import kd.bos.form.events.PreOpenFormEventArgs; import kd.bos.form.events.SetFilterEvent; @@ -28,9 +30,7 @@ import kd.bos.servicehelper.BusinessDataServiceHelper; import kd.bos.servicehelper.QueryServiceHelper; import org.apache.commons.lang.StringUtils; -import java.util.ArrayList; -import java.util.EventObject; -import java.util.List; +import java.util.*; /** * 对公报销单无合同列表插件 @@ -61,6 +61,17 @@ public class PublicreimbursebillNoContractPlugin extends AbstractBillPlugIn impl boolean isec=(boolean)this.getModel().getValue("zcgj_isec"); if(isec){ this.getView().setFormTitle(new LocaleString("无合同付款申请单")); + this.getModel().setValue("zcgj_nocontract","NOCONTRACT"); + this.getView().setEnable(false,"zcgj_nocontract"); + + //修改单据体高级面板字段名称 + Map cyf = new HashMap(); + Mapcyf1 = new HashMap(); + cyf.put("zh_CN", "冲预付"); + cyf1.put("text", cyf); + this.getView().updateControlMetadata("advconap", cyf1);//参数1:单据体标识 + this.getView().updateView("advconap"); + } BillShowParameter bsp=(BillShowParameter)this.getView().getFormShowParameter(); if(bsp.getStatus()!=OperationStatus.ADDNEW){ @@ -76,6 +87,9 @@ public class PublicreimbursebillNoContractPlugin extends AbstractBillPlugIn impl } } } + /* EntryGrid entryGrid = this.getControl("writeoffmoney"); + entryGrid.setColumnProperty("advconap", + ClientProperties.Header, new LocaleString("冲预付"));*/ } } diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/FundingplanapplyPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/FundingplanapplyPlugin.java index e68e6eb..f8d4e14 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/FundingplanapplyPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/FundingplanapplyPlugin.java @@ -228,6 +228,7 @@ public class FundingplanapplyPlugin extends AbstractBillPlugIn implements Plugin this.getView().updateView("zcgj_fundplyentry",rowIndex); this.getView().updateView("zcgj_fundplyentry",6); + //本月申请金额带入财务部核定金额分录 if(rowIndex == 2){ BigDecimal amt = (BigDecimal) changeData.getNewValue(); BigDecimal zcgjCashamt2 = fundplyentry.get(2).getBigDecimal("zcgj_cashamt")== null?BigDecimal.ZERO:fundplyentry.get(2).getBigDecimal("zcgj_cashamt"); @@ -243,18 +244,23 @@ public class FundingplanapplyPlugin extends AbstractBillPlugIn implements Plugin if("XJ".equals(zcgjSetttype)){ dynamicObject.set("zcgj_applymonthamt",zcgjCashamt2); dynamicObject.set("zcgj_hdamount",zcgjCashamt2); + dynamicObject.set("zcgj_amount_remaining",zcgjCashamt2); }else if("YHCD".equals(zcgjSetttype)){ dynamicObject.set("zcgj_applymonthamt",zcgjBankamt2); dynamicObject.set("zcgj_hdamount",zcgjBankamt2); + dynamicObject.set("zcgj_amount_remaining",zcgjBankamt2); }else if("SYCD".equals(zcgjSetttype)){ dynamicObject.set("zcgj_applymonthamt",zcgjBusinessamt2); dynamicObject.set("zcgj_hdamount",zcgjBusinessamt2); + dynamicObject.set("zcgj_amount_remaining",zcgjBusinessamt2); }else if("GYL".equals(zcgjSetttype)){ dynamicObject.set("zcgj_applymonthamt",zcgjSupplyamt2); dynamicObject.set("zcgj_hdamount",zcgjSupplyamt2); + dynamicObject.set("zcgj_amount_remaining",zcgjSupplyamt2); }else if("QTJRCP".equals(zcgjSetttype)){ dynamicObject.set("zcgj_applymonthamt",zcgjOtheramt2); dynamicObject.set("zcgj_hdamount",zcgjOtheramt2); + dynamicObject.set("zcgj_amount_remaining",zcgjOtheramt2); } } getView().updateView("zcgj_fin_approved_amount");