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 | 138 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 129 insertions(+), 9 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 04e23f7..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
@@ -21,6 +21,18 @@
<ClientEvent name="onReady">self.insert({});</ClientEvent>
<Property name="dataType">dtBaseParam</Property>
</DataSet>
+ <DataSet id="dsDeptList">
+ <Property name="dataProvider">deptPR#getData</Property>
+ <Property name="userData">搴撳尯鍒楄〃涓嬫媺妗�</Property>
+ <Property name="loadMode">manual</Property>
+ <Property name="dataType">[dtDept]</Property>
+ </DataSet>
+ <DataSet id="dsDepotList">
+ <Property name="dataProvider">depotPR#getData</Property>
+ <Property name="userData">浠撳簱鍒楄〃涓嬫媺妗�</Property>
+ <Property name="loadMode">manual</Property>
+ <Property name="dataType">[dtDepot]</Property>
+ </DataSet>
<Container>
<Property name="className">c-param</Property>
<AutoForm>
@@ -67,8 +79,11 @@
</ToolBarButton>
<ToolBarButton>
<ClientEvent name="onClick">var data = view.get("#dgMain").get("selection");
-view.get("#dialogMain").show();
- </ClientEvent>
+if(data){
+ view.get("#dialogMain").show();
+}else{
+ $notify("璇烽�夋嫨闇�瑕佷慨鏀圭殑淇℃伅鈥︹��");
+}
</ClientEvent>
<Property name="id">btnUpdate</Property>
<Property name="caption">淇敼</Property>
<Property name="exClassName">btn2</Property>
@@ -78,8 +93,8 @@
<ToolBarButton>
<ClientEvent name="onClick">var data = view.get("#dgMain").get("selection")
if(!data){
- $alert("璇烽�夋嫨鏁版嵁");
- }else{
+ $alert("璇烽�夋嫨闇�瑕佸垹闄ょ殑淇℃伅鈥︹��");
+}else{
view.get("#ajaxDelData").set("parameter", data).execute(function(result){
if("200"!=result.code){
$alert("寮傚父淇℃伅锛�"+result.message);
@@ -143,8 +158,9 @@
<Dialog id="dialogMain" layout="regionPadding:8">
<Property name="closeable">false</Property>
<Property name="caption">璐ㄦ娂鍚堝悓</Property>
- <Property name="width">1250</Property>
+ <Property name="width">80%</Property>
<Property name="iconClass">fa fa-tasks</Property>
+ <Property name="height">90%</Property>
<Buttons>
<Button id="btnOk">
<ClientEvent name="onClick">view.get("#saveAction").execute(function(){
@@ -166,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>
@@ -211,11 +227,13 @@
<AutoFormElement>
<Property name="name">pledgeDept</Property>
<Property name="property">pledgeDept</Property>
+ <Property name="trigger">dsDeptDropDown</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">status</Property>
- <Property name="property">status</Property>
+ <Property name="name">depotNames</Property>
+ <Property name="property">depotNames</Property>
+ <Property name="trigger">CDDDept</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -253,6 +271,11 @@
<Property name="property">repaidAmount</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">status</Property>
+ <Property name="property">status</Property>
+ <Editor/>
+ </AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:3">
<Property name="name">remark</Property>
<Property name="property">remark</Property>
@@ -274,7 +297,7 @@
<HtmlContainer layoutConstraint="colSpan:3">
<Property name="content">1.褰撳墠鍗曟嵁浠呬綔涓哄綋鍓嶇郴缁熶笟鍔′俊鎭櫥璁颁娇鐢紝涓嶄綔涓哄疄闄呭弻鏂瑰悎绾︾害鏉熴��<br>
2.褰撳墠鍗曟嵁榛樿鏀寔涓�1涓悎绾﹀搴�1涓簱鍖猴紝濡傛灉鍚屾椂瀵瑰簲澶氫釜搴撳尯璇锋暟鎹櫥璁般��<br>
-3.璐ㄦ娂鐘舵�佸鏋�=瑙ｅ帇锛岀郴缁熷搴斿偓鍔炴彁閱掔瓑鍔熻兘鑷姩瀹屾垚銆�<br></Property>
+3.璐ㄦ娂鐘舵�佸鏋�=瑙ｆ娂锛岀郴缁熷搴斿偓鍔炴彁閱掔瓑鍔熻兘鑷姩瀹屾垚銆�<br></Property>
<Property name="exClassName">h-tip</Property>
<Property name="contentOverflow">hidden</Property>
</HtmlContainer>
@@ -297,5 +320,102 @@
<AjaxAction id="ajaxInitAdd">
<Property name="service">pledgeContractPR#initAdd</Property>
</AjaxAction>
+ <DataSetDropDown id="dsDeptDropDown">
+ <ClientEvent name="onOpen">
+var entity = view.get("#dsMain.data:#");
+if(!entity){
+ $alert("璇峰厛閫夋嫨璐ㄦ娂鍏徃");
+}else{
+ var pledgeCompany = entity.get("pledgeCompany");
+ if(!pledgeCompany){
+ $alert("璇峰厛閫夋嫨璐ㄦ娂鍏徃");
+ }else{
+ view.get("#dsDeptList").set("parameter",entity.get("pledgeCompany")).flushAsync();
+ }
+}</ClientEvent>
+ <Property name="dataSet">dsDeptList</Property>
+ <Property name="height">450</Property>
+ <Property name="autoOpen">true</Property>
+ <Property name="assignmentMap">pledgeDept=id</Property>
+ <Property name="width">400</Property>
+ <DataColumn>
+ <Property name="align">center</Property>
+ <Property name="name">kqmc</Property>
+ <Property name="property">kqmc</Property>
+ <Editor/>
+ </DataColumn>
+ </DataSetDropDown>
+ <CustomDropDown id="CDDDept">
+ <ClientEvent name="onOpen">
+var entity = view.get("#dsMain.data:#");
+if(!entity){
+ $alert("璇峰厛閫夋嫨璐ㄦ娂搴撳尯");
+}else{
+ var pledgeDept = entity.get("pledgeDept");
+ if(!pledgeDept){
+ $alert("璇峰厛閫夋嫨璐ㄦ娂搴撳尯");
+ }else{
+ view.get("#dsDeptSelect").set("parameter",entity.get("pledgeDept")).flushAsync();
+ }
+}</ClientEvent>
+ <Property name="minWidth">400</Property>
+ <Property name="minHeight">400</Property>
+ <Property name="assignmentMap">depotIds=depotIds,depotNames=depotNames</Property>
+ <Panel>
+ <Property name="showCaptionBar">false</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">var selection = view.get("#dgDepotSelect").get("selection");
+if(!selection || selection.length == 0){
+ $alert("璇烽�夋嫨浠撳簱");
+ return;
+}
+
+var depotIds = "",depotNames="";
+selection.each(function(item){
+ depotIds += item.get("id")+",";
+ depotNames+=item.get("name")+",";
+});
+
+view.get("#CDDDept").close({depotIds:depotIds,depotNames:depotNames});</ClientEvent>
+ <Property name="caption">纭閫夋嫨</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">view.get("#CDDDept").close({});
+ view.get("#dgDepotSelect").set("selection",null);</ClientEvent>
+ <Property name="caption">鍙栨秷鎿嶄綔</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <DataSet id="dsDeptSelect">
+ <Property name="dataType">[dtDepot]</Property>
+ <Property name="dataProvider">depotPR#getData</Property>
+ <Property name="userData">搴撳尯鍒楄〃涓嬫媺妗�</Property>
+ <Property name="loadMode">manual</Property>
+ </DataSet>
+ <DataGrid id="dgDepotSelect">
+ <Property name="dataSet">dsDeptSelect</Property>
+ <Property name="selectionMode">multiRows</Property>
+ <RowSelectorColumn>
+ <Property name="caption">閫夋嫨</Property>
+ <Property name="width">50</Property>
+ </RowSelectorColumn>
+ <DataColumn name="name">
+ <Property name="property">name</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="id">
+ <Property name="property">id</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="depotType">
+ <Property name="property">depotType</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ </DataGrid>
+ </Children>
+ <Tools/>
+ </Panel>
+ </CustomDropDown>
</View>
</ViewConfig>
--
Gitblit v1.9.3