From c7fcb7f2763ea83db7611575af90824bd24c7338 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期一, 29 十二月 2025 11:16:19 +0800
Subject: [PATCH] 收储公司、库区、仓库页面交互调整
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/Dept.view.xml | 74 +++++++++---------------
fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml | 43 ++++++-------
fzzy-igdss-view/src/main/java/com/fzzy/igds/Company.view.xml | 47 +++++++++------
3 files changed, 77 insertions(+), 87 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Company.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Company.view.xml
index 02045f3..ee3ced0 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Company.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Company.view.xml
@@ -210,30 +210,31 @@
* 鏌ョ湅璇︽儏
* @param {String/Number} manualId 鎵嬪姩浼犲叆鐨刬d鍊硷紙鍙�夛級
*/
-detail = function(manualId){
- // 浼樺厛浣跨敤鎵嬪姩浼犲叆鐨刬d锛屾病鏈夊垯璧板師鏈夐�変腑琛岄�昏緫
- var id = manualId;
- if(!id){
- var cur = view.get("#dgMain").get("selection");
- if(cur){
- id = cur.get("id");
- }
- }
- 
- // 鏈塱d鍒欐墦寮�璇︽儏椤碉紝鍚﹀垯鎻愮ず
- if(id){
- var url = "/com.fzzy.igds.Dept.d?parentId="+ id;
- window.$openTab("搴撳尯绠＄悊", url);
- }else{
- $notify("璇峰厛閫夋嫨鏀跺偍鍏徃鈥︹��");
- }
+detail = function(){
+ var cur = view.get("#dgMain").get("selection");
+ if (cur) {
+ var id = cur.get("id");
+ var url = "/com.fzzy.igds.Dept.d?parentId=" + id;
+ window.$openTab("搴撳尯绠＄悊", url);
+ }else {
+ $notify("璇峰厛閫夋嫨鏁版嵁鈥︹��");
+ } 
+ 
+};
+
+showDlg=function(){
+ var select = view.get("#dgMain").get("selection");
+ if(select){
+ view.get("#dialogMain").show();;
+ }else{
+ $notify("璇峰厛閫夋嫨鏁版嵁鈥︹��");
+ }
};

renderId = function(arg){
var txt = arg.data.getText("id");
if(!txt) return true;
- // 鍏抽敭淇敼锛氱偣鍑绘椂鎶妕xt浣滀负鍙傛暟浼犵粰detail鏂规硶锛堟敞鎰忚浆涔夊弻寮曞彿锛�
- var htm = "<a href='javascript:;' onClick='detail(\""+txt+"\")' >"+txt+"</a>";
+ var htm = "<a href='javascript:;' onClick='showDlg()' >"+txt+"</a>";
arg.dom.innerHTML = htm;
}</ClientEvent>
<Property name="packages">font-awesome,css-common</Property>
@@ -321,6 +322,14 @@
<Property name="align">center</Property>
<Property name="width">160</Property>
</DataColumn>
+ <DataColumn>
+ <ClientEvent name="onRenderCell">arg.dom.innerHTML = "<a href='javascript:;' onClick='detail()' class='a-btn1'>鏌ョ湅璇︽儏</a>";</ClientEvent>
+ <Property name="width">160</Property>
+ <Property name="caption">鎿嶄綔</Property>
+ <Property name="align">center</Property>
+ <Property name="width">120</Property>
+ <Editor/>
+ </DataColumn>
</DataGrid>
</Container>
<Dialog id="dialogMain">
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml
index fd4251a..6a26327 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml
@@ -16,37 +16,33 @@
</DataType>
</Model>
<View layout="padding:10">
- <ClientEvent name="onReady">// start 閫氳繃搴撳尯id鏉ュ姞杞戒粨鍌ㄦ暟鎹�
-/**
- * 閫氱敤宸ュ叿鍑芥暟锛氳幏鍙朥RL涓殑鎸囧畾鍙傛暟鍊�
- * @param {String} name 瑕佽幏鍙栫殑鍙傛暟鍚�
- * @returns {String/null} 鍙傛暟鍊硷紙鏃犲垯杩斿洖null锛�
- */
-function getUrlParam(name) {
- // 瑙ｆ瀽URL鐨勬煡璇㈠瓧绗︿覆锛�?鍚庨潰鐨勯儴鍒嗭級
- var search = window.location.search.substring(1);
- // 鍒嗗壊鎴愰敭鍊煎鏁扮粍
- var params = search.split("&");
- for (var i = 0; i < params.length; i++) {
- var pair = params[i].split("=");
- // 瑙ｇ爜鍙傛暟鍊硷紙澶勭悊涓枃/鐗规畩瀛楃锛�
- if (decodeURIComponent(pair[0]) === name) {
- return decodeURIComponent(pair[1] || "");
- }
- }
- return null;
-}; 
-
-
+ <ClientEvent name="onReady">

/**
* 鏌ヨ
*/
query = function(){
//閫氳繃搴撳尯id鏉ュ姞杞戒粨鍌ㄦ暟鎹�
- var parentId = getUrlParam("parentId");
+ var parentId = "${request.getParameter('parentId')}";
view.get("#dataSetdepot").set("parameter",{parentId: parentId}).flushAsync();
};
query();
+
+
+showDlg=function(){
+ var select = view.get("#dataGridDepot").get("selection");
+ if(select){
+ view.get("#depotdialog").show();;
+ }else{
+ $notify("璇峰厛閫夋嫨鏁版嵁鈥︹��");
+ }
+};
+
+renderId = function(arg){
+ var txt = arg.data.getText("id");
+ if(!txt) return true;
+ var htm = "<a href='javascript:;' onClick='showDlg()' >"+txt+"</a>";
+ arg.dom.innerHTML = htm;
+}

</ClientEvent>
<Property name="packages">font-awesome,css-common</Property>
@@ -125,6 +121,7 @@
<RowSelectorColumn/>
<RowNumColumn/>
<DataColumn name="id">
+ <ClientEvent name="onRenderCell">renderId(arg);</ClientEvent>
<Property name="property">id</Property>
<Property name="align">center</Property>
<Property name="width">120</Property>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Dept.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Dept.view.xml
index 9078117..86b29a4 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Dept.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Dept.view.xml
@@ -149,64 +149,40 @@
view.get("#dialogImg").show();

};</ClientEvent>
- <ClientEvent name="onReady">
-// start 閫氳繃鏀跺偍鍏徃id鏉ュ姞杞藉簱鍖烘暟鎹�
-/**
- * 閫氱敤宸ュ叿鍑芥暟锛氳幏鍙朥RL涓殑鎸囧畾鍙傛暟鍊�
- * @param {String} name 瑕佽幏鍙栫殑鍙傛暟鍚�
- * @returns {String/null} 鍙傛暟鍊硷紙鏃犲垯杩斿洖null锛�
- */
-function getUrlParam(name) {
- // 瑙ｆ瀽URL鐨勬煡璇㈠瓧绗︿覆锛�?鍚庨潰鐨勯儴鍒嗭級
- var search = window.location.search.substring(1);
- // 鍒嗗壊鎴愰敭鍊煎鏁扮粍
- var params = search.split("&");
- for (var i = 0; i < params.length; i++) {
- var pair = params[i].split("=");
- // 瑙ｇ爜鍙傛暟鍊硷紙澶勭悊涓枃/鐗规畩瀛楃锛�
- if (decodeURIComponent(pair[0]) === name) {
- return decodeURIComponent(pair[1] || "");
- }
- }
- return null;
-};
-
-var parentId = getUrlParam("parentId");
-console.log("parentId",parentId);
+ <ClientEvent name="onReady">var parentId = "${request.getParameter('parentId')}";
view.get("#dsMain").set("parameter",{parentId: parentId}).flushAsync();
-//end 

/**
* 鏌ョ湅璇︽儏
* @param {String/Number} manualId 鎵嬪姩浼犲叆鐨刬d鍊硷紙鍙�夛級
*/
-detail = function(manualId){
- // 浼樺厛浣跨敤鎵嬪姩浼犲叆鐨刬d锛屾病鏈夊垯璧板師鏈夐�変腑琛岄�昏緫
- var id = manualId;
- if(!id){
- var cur = view.get("#dgMain").get("selection");
- if(cur){
- id = cur.get("id");
- }
- }
- 
- // 鏈塱d鍒欐墦寮�璇︽儏椤碉紝鍚﹀垯鎻愮ず
- if(id){
+detail = function(){
+ var cur = view.get("#dgMain").get("selection");
+ if (cur) {
+ var id = cur.get("id");
var url = "/com.fzzy.igds.Depot.d?parentId="+ id;
- window.$openTab("浠撳簱绠＄悊", url);
- }else{
- $notify("璇峰厛閫夋嫨搴撳尯鈥︹��");
- }
+ window.$openTab("搴撳尯绠＄悊", url);
+ }else {
+ $notify("璇峰厛閫夋嫨鏁版嵁鈥︹��");
+ } 
+};
+
+
+showDlg=function(){
+ var select = view.get("#dgMain").get("selection");
+ if(select){
+ view.get("#dialogMain").show();;
+ }else{
+ $notify("璇峰厛閫夋嫨鏁版嵁鈥︹��");
+ }
};

renderId = function(arg){
var txt = arg.data.getText("id");
if(!txt) return true;
- // 鍏抽敭淇敼锛氱偣鍑绘椂鎶妕xt浣滀负鍙傛暟浼犵粰detail鏂规硶锛堟敞鎰忚浆涔夊弻寮曞彿锛�
- var htm = "<a href='javascript:;' onClick='detail(\""+txt+"\")' >"+txt+"</a>";
+ var htm = "<a href='javascript:;' onClick='showDlg()' >"+txt+"</a>";
arg.dom.innerHTML = htm;
-}
-</ClientEvent>
+}</ClientEvent>
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
<Property name="dataProvider">deptPR#getData</Property>
@@ -282,6 +258,14 @@
<Property name="align">center</Property>
<Property name="width">160</Property>
</DataColumn>
+ <DataColumn>
+ <ClientEvent name="onRenderCell">arg.dom.innerHTML = "<a href='javascript:;' onClick='detail()' class='a-btn1'>鏌ョ湅璇︽儏</a>";</ClientEvent>
+ <Property name="width">160</Property>
+ <Property name="caption">鎿嶄綔</Property>
+ <Property name="align">center</Property>
+ <Property name="width">120</Property>
+ <Editor/>
+ </DataColumn>
</DataGrid>
</Container>
<Dialog id="dialogMain">
--
Gitblit v1.9.3