From 9c136c58963fb453c41865f658d4eef48d536d02 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 26 十二月 2025 17:56:46 +0800
Subject: [PATCH] 抓拍、ai事件查询修改；弹框调整；收储公司、库区、仓库页面交互优化
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SuperInventoryReportService.java | 12 ++-
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutLossOver.view.xml | 1
fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContract.view.xml | 2
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java | 7 +
fzzy-igdss-view/src/main/java/com/fzzy/igds/Dept.view.xml | 60 +++++++++++++++
fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java | 6 +
fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml | 45 +++++++++--
fzzy-igdss-view/src/main/java/com/fzzy/igds/Company.view.xml | 33 ++++++++
fzzy-igdss-view/src/main/java/com/fzzy/igds/DeviceSer.view.xml | 2
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java | 7 +
fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java | 8 +
fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityConf.view.xml | 2
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutSettle.view.xml | 1
fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolConf.view.xml | 1
fzzy-igdss-view/src/main/java/com/fzzy/igds/Bank.view.xml | 1
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutStockChange.view.xml | 1
16 files changed, 160 insertions(+), 29 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java
index d188b13..ee97820 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java
@@ -58,8 +58,11 @@
queryWrapper.apply("dept_id IN (SELECT dept_id FROM sys_dept WHERE parent_id = {0})", param.getKey());
}
//鎶撴媿鏃堕棿妫�绱�
- if (param.getStart() != null && param.getEnd() != null) {
- queryWrapper.between("time", param.getStart(), param.getEnd());
+ if (null != param.getStart()) {
+ queryWrapper.ge("time", param.getStart());
+ }
+ if (null != param.getEnd()) {
+ queryWrapper.le("time", param.getEnd());
}
//浜嬩欢鍚嶇О
if (StringUtils.isNotBlank(param.getName())) {
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java
index 0f611fe..df7fbf0 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java
@@ -54,8 +54,11 @@
queryWrapper.apply("dept_id IN (SELECT dept_id FROM sys_dept WHERE parent_id = {0})", param.getKey());
}
//鎶撴媿鏃堕棿妫�绱�
- if (param.getStart() != null && param.getEnd() != null) {
- queryWrapper.between("snap_time", param.getStart(), param.getEnd());
+ if (null != param.getStart()) {
+ queryWrapper.ge("snap_time",param.getStart());
+ }
+ if (null != param.getEnd()) {
+ queryWrapper.le("snap_time", param.getEnd());
}
//鏍囩妫�绱�
if (StringUtils.isNotBlank(param.getName())) {
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SuperInventoryReportService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SuperInventoryReportService.java
index d8837f3..7e83a03 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SuperInventoryReportService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SuperInventoryReportService.java
@@ -262,7 +262,8 @@
if (StringUtils.isNotBlank(param.getDeptId())) {
depotStoreQueryWrapper.likeRight("dept_id", param.getDeptId());
}
- depotStoreQueryWrapper.between("create_time", param.getStart(), param.getEnd());
+ depotStoreQueryWrapper.ge("create_time", param.getStart());
+ depotStoreQueryWrapper.le("create_time", param.getEnd());
depotStoreQueryWrapper.orderByAsc("create_time");
return depotStoreMapper.selectList(depotStoreQueryWrapper);
}
@@ -276,7 +277,8 @@
if (StringUtils.isNotBlank(param.getDeptId())) {
inoutRecordQueryWrapper.likeRight("dept_id", param.getDeptId());
}
- inoutRecordQueryWrapper.between("create_time", param.getStart(), param.getEnd());
+ inoutRecordQueryWrapper.ge("create_time", param.getStart());
+ inoutRecordQueryWrapper.le("create_time", param.getEnd());
inoutRecordQueryWrapper.orderByAsc("create_time");
return inoutRecordMapper.selectList(inoutRecordQueryWrapper);
}
@@ -290,7 +292,8 @@
if (StringUtils.isNotBlank(param.getDeptId())) {
inoutStockChangeQueryWrapper.likeRight("dept_id", param.getDeptId());
}
- inoutStockChangeQueryWrapper.between("create_time", param.getStart(), param.getEnd());
+ inoutStockChangeQueryWrapper.ge("create_time", param.getStart());
+ inoutStockChangeQueryWrapper.le("create_time", param.getEnd());
inoutStockChangeQueryWrapper.orderByAsc("create_time");
return inoutStockChangeMapper.selectList(inoutStockChangeQueryWrapper);
}
@@ -304,7 +307,8 @@
if (StringUtils.isNotBlank(param.getDeptId())) {
inoutLossOverQueryWrapper.likeRight("dept_id", param.getDeptId());
}
- inoutLossOverQueryWrapper.between("create_time", param.getStart(), param.getEnd());
+ inoutLossOverQueryWrapper.ge("create_time", param.getStart());
+ inoutLossOverQueryWrapper.le("create_time", param.getEnd());
inoutLossOverQueryWrapper.orderByAsc("create_time");
return inoutLossOverMapper.selectList(inoutLossOverQueryWrapper);
}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Bank.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Bank.view.xml
index 40d33f0..7830c6f 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Bank.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Bank.view.xml
@@ -127,7 +127,6 @@
<Property name="caption">閾惰淇℃伅</Property>
<Property name="closeable">false</Property>
<Property name="iconClass">fa fa-tasks</Property>
- <Property name="height">50%</Property>
<Buttons>
<Button>
<ClientEvent name="onClick">view.get("#saveAction").execute(function(){
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 20daf66..02045f3 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
@@ -206,6 +206,36 @@
</DataType>
</Model>
<View layout="padding:10">
+ <ClientEvent name="onReady">/**
+* 鏌ョ湅璇︽儏
+* @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("璇峰厛閫夋嫨鏀跺偍鍏徃鈥︹��");
+ }
+};
+
+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>";
+ arg.dom.innerHTML = htm;
+}</ClientEvent>
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
<Property name="dataProvider">companyPR#getData</Property>
@@ -243,6 +273,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>
@@ -297,7 +328,7 @@
<Property name="caption">鏀跺偍鍏徃淇℃伅</Property>
<Property name="closeable">false</Property>
<Property name="iconClass">fa fa-tasks</Property>
- <Property name="height">80%</Property>
+ <Property name="height">90%</Property>
<Buttons>
<Button id="btnOk">
<ClientEvent name="onClick">view.get("#uaSave").execute(function(result){
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 bcb92bb..628173e 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,17 +16,44 @@
</DataType>
</Model>
<View layout="padding:10">
- <ClientEvent name="onReady">
+ <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;
+}; 
+
+
+
/**
* 鏌ヨ
*/
query = function(){
- view.get("#dataSetdepot").flushAsync();
-}
</ClientEvent>
+ //閫氳繃搴撳尯id鏉ュ姞杞戒粨鍌ㄦ暟鎹�
+ var parentId = getUrlParam("parentId");
+ view.get("#dataSetdepot").set("parameter",{parentId: parentId}).flushAsync();
+};
query();
+
+</ClientEvent>
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dataSetdepot">
<Property name="dataProvider">depotPR#getData</Property>
<Property name="dataType">[dtDepot]</Property>
+ <Property name="loadMode">manual</Property>
</DataSet>
<DataSet id="dataSetUser">
<Property name="dataType">[dataTypeUser]</Property>
@@ -155,7 +182,7 @@
<Property name="iconClass">fa fa-tasks</Property>
<Property name="caption">浠撳簱淇℃伅</Property>
<Property name="width">80%</Property>
- <Property name="height">82%</Property>
+ <Property name="height">90%</Property>
<Property name="closeable">false</Property>
<Buttons>
<Button id="btnOK">
@@ -215,11 +242,11 @@
<Property name="property">deptId</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">storageMax</Property>
- <Property name="property">storageMax</Property>
- <Editor/>
- </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">storageMax</Property>
+ <Property name="property">storageMax</Property>
+ <Editor/>
+ </AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">storeType</Property>
<Property name="property">storeType</Property>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java
index a7ec0d8..4206348 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java
@@ -6,6 +6,7 @@
import com.fzzy.igds.domain.Depot;
import com.fzzy.igds.service.DepotService;
import com.fzzy.igds.utils.ContextUtil;
+import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
@@ -30,7 +31,10 @@
* @return
*/
@DataProvider
- public List<Depot> getData(){
+ public List<Depot> getData(String parentId){
+ if(StringUtils.isNotEmpty(parentId)){
+ return depotService.getData(null,parentId,false);
+ }
return depotService.getData(null, ContextUtil.subDeptId(null) ,false);
}
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 b5a11cb..9078117 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,10 +149,69 @@
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);
+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){
+ var url = "/com.fzzy.igds.Depot.d?parentId="+ id;
+ window.$openTab("浠撳簱绠＄悊", url);
+ }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>";
+ arg.dom.innerHTML = htm;
+}
+</ClientEvent>
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
<Property name="dataProvider">deptPR#getData</Property>
<Property name="dataType">[dtMain]</Property>
+ <Property name="loadMode">manual</Property>
</DataSet>
<Container>
<Property name="className">c-param</Property>
@@ -186,6 +245,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">160</Property>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java
index 6bf5eec..b5345af 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java
@@ -5,10 +5,12 @@
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.service.CoreDeptService;
import com.fzzy.igds.utils.ContextUtil;
+import com.ruoyi.common.utils.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.List;
+import java.util.Map;
/**
* @Description 搴撳尯淇℃伅
@@ -42,8 +44,10 @@
* @return
*/
@DataProvider
- public List<Dept> getData() {
-
+ public List<Dept> getData(String parentId) {
+ if(StringUtils.isNotEmpty(parentId)){
+ return coreDeptService.listDept(null,null,parentId);
+ }
return coreDeptService.getDeptData();
}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeviceSer.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeviceSer.view.xml
index 4543723..b2e5724 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeviceSer.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeviceSer.view.xml
@@ -157,7 +157,7 @@
<Property name="width">65%</Property>
<Property name="caption">鍒嗘満淇℃伅</Property>
<Property name="closeable">false</Property>
- <Property name="height">75%</Property>
+ <Property name="height">90%</Property>
<Buttons>
<Button>
<ClientEvent name="onClick">var cur = view.get("#dsDeviceSer.data:#");
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutLossOver.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutLossOver.view.xml
index 9e995ca..eaa2f8b 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutLossOver.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutLossOver.view.xml
@@ -278,7 +278,6 @@
<Property name="width">60%</Property>
<Property name="caption">鎹熺泭淇℃伅</Property>
<Property name="closeable">false</Property>
- <Property name="height">50%</Property>
<Buttons>
<Button>
<ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutSettle.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutSettle.view.xml
index b3dc04d..9b4eb06 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutSettle.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutSettle.view.xml
@@ -594,7 +594,6 @@
<Property name="caption">缁撶畻淇℃伅</Property>
<Property name="width">65%</Property>
<Property name="closeable">false</Property>
- <Property name="height">70%</Property>
<Buttons>
<Button id="btnOK">
<ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutStockChange.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutStockChange.view.xml
index 6f568c3..a4cf4ab 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutStockChange.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutStockChange.view.xml
@@ -324,7 +324,6 @@
<Property name="caption">鍊掍粨淇℃伅</Property>
<Property name="width">55%</Property>
<Property name="closeable">false</Property>
- <Property name="height">55%</Property>
<Buttons>
<Button id="btnOK">
<ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolConf.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolConf.view.xml
index fe0df02..c94e673 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolConf.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolConf.view.xml
@@ -133,7 +133,6 @@
<Property name="caption">宸℃洿閰嶇疆淇℃伅</Property>
<Property name="closeable">false</Property>
<Property name="iconClass">fa fa-tasks</Property>
- <Property name="height">50%</Property>
<Buttons>
<Button>
<ClientEvent name="onClick">view.get("#saveAction").execute(function(){
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 c2178b9..3ae8bbf 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
@@ -145,7 +145,7 @@
<Property name="caption">璐ㄦ娂鍚堝悓</Property>
<Property name="width">65%</Property>
<Property name="iconClass">fa fa-tasks</Property>
- <Property name="height">78%</Property>
+ <Property name="height">90%</Property>
<Buttons>
<Button id="btnOk">
<ClientEvent name="onClick">view.get("#saveAction").execute(function(){
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityConf.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityConf.view.xml
index 8ea40cc..e5318f8 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityConf.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityConf.view.xml
@@ -314,7 +314,7 @@
<Property name="caption">鏁伴噺妫�娴嬪弬鏁�</Property>
<Property name="width">60%</Property>
<Property name="closeable">false</Property>
- <Property name="height">85%</Property>
+ <Property name="height">90%</Property>
<Buttons>
<Button>
<ClientEvent name="onClick">view.get("#uaMain").execute(function(){
--
Gitblit v1.9.3