From e7ab049344b954b044fc474992c378fcbbeeba33 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期日, 08 二月 2026 19:08:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContract.view.xml |   50 +++++++++++++++++++++++++-------------------------
 1 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContract.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContract.view.xml
index 9b9f70d..65e21b9 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContract.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContract.view.xml
@@ -182,7 +182,7 @@
       </Buttons>
       <Children>
         <Container>
-          <AutoForm layoutConstraint="top ">
+          <AutoForm layoutConstraint="top">
             <Property name="dataSet">dsMain</Property>
             <Property name="showHint">false</Property>
             <Property name="cols">210,*,210</Property>
@@ -297,7 +297,7 @@
             <HtmlContainer layoutConstraint="colSpan:3">
               <Property name="content">1.褰撳墠鍗曟嵁浠呬綔涓哄綋鍓嶇郴缁熶笟鍔′俊鎭櫥璁颁娇鐢紝涓嶄綔涓哄疄闄呭弻鏂瑰悎绾︾害鏉熴��&lt;br>&#xD;
 2.褰撳墠鍗曟嵁榛樿鏀寔涓�1涓悎绾﹀搴�1涓簱鍖猴紝濡傛灉鍚屾椂瀵瑰簲澶氫釜搴撳尯璇锋暟鎹櫥璁般��&lt;br>&#xD;
-3.璐ㄦ娂鐘舵�佸鏋�=瑙ｅ帇锛岀郴缁熷搴斿偓鍔炴彁閱掔瓑鍔熻兘鑷姩瀹屾垚銆�&lt;br></Property>
+3.璐ㄦ娂鐘舵�佸鏋�=瑙ｆ娂锛岀郴缁熷搴斿偓鍔炴彁閱掔瓑鍔熻兘鑷姩瀹屾垚銆�&lt;br></Property>
               <Property name="exClassName">h-tip</Property>
               <Property name="contentOverflow">hidden</Property>
             </HtmlContainer>
@@ -347,17 +347,17 @@
     </DataSetDropDown>
     <CustomDropDown id="CDDDept">
       <ClientEvent name="onOpen">&#xD;
-          var entity = view.get(&quot;#dsMain.data:#&quot;);&#xD;
-          if(!entity){&#xD;
-          $alert(&quot;璇峰厛閫夋嫨璐ㄦ娂搴撳尯&quot;);&#xD;
-          }else{&#xD;
-          var pledgeDept = entity.get(&quot;pledgeDept&quot;);&#xD;
-          if(!pledgeDept){&#xD;
-          $alert(&quot;璇峰厛閫夋嫨璐ㄦ娂搴撳尯&quot;);&#xD;
-          }else{&#xD;
-          view.get(&quot;#dsDeptSelect&quot;).set(&quot;parameter&quot;,entity.get(&quot;pledgeDept&quot;)).flushAsync();&#xD;
-          }
-          }</ClientEvent>
+var entity = view.get(&quot;#dsMain.data:#&quot;);&#xD;
+if(!entity){&#xD;
+    $alert(&quot;璇峰厛閫夋嫨璐ㄦ娂搴撳尯&quot;);&#xD;
+}else{&#xD;
+    var pledgeDept = entity.get(&quot;pledgeDept&quot;);&#xD;
+    if(!pledgeDept){&#xD;
+        $alert(&quot;璇峰厛閫夋嫨璐ㄦ娂搴撳尯&quot;);&#xD;
+    }else{&#xD;
+        view.get(&quot;#dsDeptSelect&quot;).set(&quot;parameter&quot;,entity.get(&quot;pledgeDept&quot;)).flushAsync();&#xD;
+    }
+}</ClientEvent>
       <Property name="minWidth">400</Property>
       <Property name="minHeight">400</Property>
       <Property name="assignmentMap">depotIds=depotIds,depotNames=depotNames</Property>
@@ -366,18 +366,18 @@
         <Buttons>
           <Button>
             <ClientEvent name="onClick">var selection = view.get(&quot;#dgDepotSelect&quot;).get(&quot;selection&quot;);&#xD;
-                if(!selection || selection.length == 0){&#xD;
-                $alert(&quot;璇烽�夋嫨浠撳簱&quot;);&#xD;
-                return;&#xD;
-                }&#xD;
-                &#xD;
-                var depotIds = &quot;&quot;,depotNames=&quot;&quot;;&#xD;
-                selection.each(function(item){&#xD;
-                depotIds += item.get(&quot;id&quot;)+&quot;,&quot;;&#xD;
-                depotNames+=item.get(&quot;name&quot;)+&quot;,&quot;;&#xD;
-                });&#xD;
-                &#xD;
-                view.get(&quot;#CDDDept&quot;).close({depotIds:depotIds,depotNames:depotNames});</ClientEvent>
+if(!selection || selection.length == 0){&#xD;
+    $alert(&quot;璇烽�夋嫨浠撳簱&quot;);&#xD;
+    return;&#xD;
+}&#xD;
+&#xD;
+var depotIds = &quot;&quot;,depotNames=&quot;&quot;;&#xD;
+selection.each(function(item){&#xD;
+    depotIds += item.get(&quot;id&quot;)+&quot;,&quot;;&#xD;
+    depotNames+=item.get(&quot;name&quot;)+&quot;,&quot;;&#xD;
+});&#xD;
+&#xD;
+view.get(&quot;#CDDDept&quot;).close({depotIds:depotIds,depotNames:depotNames});</ClientEvent>
             <Property name="caption">纭閫夋嫨</Property>
           </Button>
           <Button>

--
Gitblit v1.9.3