From c02c675a487585ab6b9d09e39af671d1d97b9368 Mon Sep 17 00:00:00 2001
From: xiaoshi <2272816786@qq.com>
Date: Sat, 14 Dec 2024 15:46:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zcdev/zcdev/pr/plugin/form/EcContractFromPlugin.java  | 8 +++++++-
 .../zcdev/pr/plugin/form/ResourceFilterExtPlugin.java     | 5 +++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EcContractFromPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EcContractFromPlugin.java
index edc8050..0632bc8 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EcContractFromPlugin.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EcContractFromPlugin.java
@@ -47,6 +47,7 @@ public class EcContractFromPlugin extends AbstractBillPlugIn implements Plugin {
                 dataEntity.set("zcgj_pjnhse", rate);
 //                this.getModel().setValue("zcgj_pjnhbhshte", amount);
 //                this.getModel().setValue("zcgj_pjnhse", rate);
+                this.getView().updateView();
             } else if (name.equals("zcgj_pjnhbhshte")) {
 //                Object zcgjPjnhhshte = this.getModel().getValue("zcgj_pjnhbhshte");
                 Object zcgjPjnhhshte = changeData.getNewValue();
@@ -61,6 +62,7 @@ public class EcContractFromPlugin extends AbstractBillPlugIn implements Plugin {
                 dataEntity.set("zcgj_pjnhbhshte", amount);
                 dataEntity.set("zcgj_pjnhhshte", ofamount);
                 dataEntity.set("zcgj_pjnhse", rate);
+                this.getView().updateView();
             }else if (name.equals("zcgj_yjhshtsr")) {
                 Object zcgjyjhshtsr = this.getModel().getValue("zcgj_yjhshtsr");
                 System.out.println();
@@ -73,6 +75,7 @@ public class EcContractFromPlugin extends AbstractBillPlugIn implements Plugin {
 //                this.getModel().setValue("zcgj_yjzse", rate);
                 dataEntity.set("zcgj_yjbhshtsr", amount);
                 dataEntity.set("zcgj_yjzse", rate);
+                this.getView().updateView();
             } else if (name.equals("zcgj_yjbhshtsr")) {
                 Object zcgjyjbhshtsr = this.getModel().getValue("zcgj_yjbhshtsr");
                 System.out.println();
@@ -85,6 +88,7 @@ public class EcContractFromPlugin extends AbstractBillPlugIn implements Plugin {
 //                this.getModel().setValue("zcgj_yjzse", rate);
                 dataEntity.set("zcgj_yjhshtsr", ofamount);
                 dataEntity.set("zcgj_yjzse", rate);
+                this.getView().updateView();
             }else if (name.equals("zcgj_hshtdj")) {
                 Object zcgjhshtdj = this.getModel().getValue("zcgj_hshtdj");
                 if (zcgjhshtdj != null) {
@@ -93,6 +97,7 @@ public class EcContractFromPlugin extends AbstractBillPlugIn implements Plugin {
                 amount = ofamount.divide(pRate,6, BigDecimal.ROUND_HALF_UP);
                 dataEntity.set("zcgj_bhshtdj", amount);
 //                this.getModel().setValue("zcgj_bhshtdj", ofamount);
+                this.getView().updateView();
             }else if (name.equals("zcgj_bhshtdj")) {
                 Object zcgjbhshtdj = this.getModel().getValue("zcgj_bhshtdj");
                 if (zcgjbhshtdj != null) {
@@ -101,8 +106,9 @@ public class EcContractFromPlugin extends AbstractBillPlugIn implements Plugin {
                 ofamount = amount.multiply(pRate);
                 dataEntity.set("zcgj_hshtdj", ofamount);
 //                this.getModel().setValue("zcgj_hshtdj", ofamount);
+                this.getView().updateView();
             }
-            this.getView().updateView();
+
         }
     }
 }
\ No newline at end of file
diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ResourceFilterExtPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ResourceFilterExtPlugin.java
index 25b21e0..23f6958 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ResourceFilterExtPlugin.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ResourceFilterExtPlugin.java
@@ -28,6 +28,9 @@ public class ResourceFilterExtPlugin extends ResourceItemListPlugin {
                 }else if (contractType.toString().equals("qtcc") || contractType.toString().equals("lwlcc")) {//产出物
                     this.setResourceTypeStyle("turnover");
                     this.afterSelectedTag("turnover");
+                }else{
+                    this.setResourceTypeStyle("material");
+                    this.afterSelectedTag("material");
                 }
             }
         }else{
@@ -56,6 +59,8 @@ public class ResourceFilterExtPlugin extends ResourceItemListPlugin {
                 }else if (contractType.toString().equals("qtcc") || contractType.toString().equals("lwlcc")) {//产出物
                     this.getView().setVisible(true, new String[]{"flexpanelturnover"});
                     this.getView().setVisible(false, new String[]{"flexpanelsub", "flexpanellabour", "flexpanelcomposite", "flexpanelequipment", "flexpanelmaterial","flexpanelother"});
+                }else{
+                    this.getView().setVisible(false, new String[]{"flexpanelturnover","flexpanelsub", "flexpanellabour", "flexpanelcomposite", "flexpanelequipment", "flexpanelmaterial","flexpanelother"});
                 }
             }
         }