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-view/src/main/java/com/fzzy/igds/Dept.view.xml | 158 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 111 insertions(+), 47 deletions(-)
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 a04ea00..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
@@ -10,6 +10,16 @@
<Property name="label">搴撳尯缂栫爜</Property>
<Property name="readOnly">true</Property>
</PropertyDef>
+ <PropertyDef name="parentId">
+ <Property></Property>
+ <Property name="label">鏀跺偍鍏徃</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("companyPR#getData").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">dwmc</Property>
+ </Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
<PropertyDef name="companyId">
<Property></Property>
<Property name="label">缁勭粐缂栫爜</Property>
@@ -30,7 +40,7 @@
</PropertyDef>
<PropertyDef name="xzqhmc">
<Property></Property>
- <Property name="label">鍖哄垝鍚嶇О</Property>
+ <Property name="label">鎵�鍦ㄥ尯鍘�</Property>
</PropertyDef>
<PropertyDef name="kqcq">
<Property></Property>
@@ -111,9 +121,9 @@
<Property name="label">鏇存柊浜�</Property>
<Property name="readOnly">true</Property>
</PropertyDef>
- <PropertyDef name="imgId">
+ <PropertyDef name="imgPath">
<Property></Property>
- <Property name="label">楦熺灠鍥緄d</Property>
+ <Property name="label">鍥捐矾寰�</Property>
</PropertyDef>
<PropertyDef name="imgName">
<Property></Property>
@@ -122,27 +132,86 @@
</DataType>
</Model>
<View layout="padding:10">
- <ClientEvent name="onClick">/**
+ <ClientEvent name="onClick">
/**
* 棰勮鍥剧墖
*/
showImg = function(){
var cur = view.get("#dsMain.data:#");
- var imgName = cur.get("imgId");
+ var imgName = cur.get("imgName");
if(!imgName){
- $alert("娌℃湁涓婁紶瑙嗛淇℃伅锛屾棤娉曢瑙堛��");
+ $alert("娌℃湁涓婁紶楦熺灠鍥句俊鎭紝鏃犳硶棰勮銆�");
return;
}
- var id = cur.get("id");
+ var imgPath = cur.get("imgPath");

- view.get("#iFrameImg").set("path", "./basic/file/dept-img?id=" + id);
+ view.get("#iFrameImg").set("path", "/file/dept-img?imgPath=" + imgPath);
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>
@@ -176,26 +245,25 @@
<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>
</DataColumn>
<DataColumn name="kqmc">
<Property name="property">kqmc</Property>
- <Property name="align">center</Property>
+ <Property name="align">left</Property>
</DataColumn>
- <DataColumn name="kqcq">
- <Property name="property">kqcq</Property>
+ <DataColumn name="parentId">
+ <Property name="property">parentId</Property>
+ <Property name="align">left</Property>
+ </DataColumn>
+ <DataColumn name="xzqhmc">
+ <Property name="property">xzqhmc</Property>
<Property name="align">center</Property>
- <Property name="width">120</Property>
</DataColumn>
<DataColumn name="yxcr">
<Property name="property">yxcr</Property>
- <Property name="align">center</Property>
- <Property name="width">180</Property>
- </DataColumn>
- <DataColumn name="zdmj">
- <Property name="property">zdmj</Property>
<Property name="align">center</Property>
<Property name="width">180</Property>
</DataColumn>
@@ -219,7 +287,7 @@
<Dialog id="dialogMain">
<Property name="iconClass">fa fa-tasks</Property>
<Property name="caption">搴撳尯淇℃伅</Property>
- <Property name="width">1200</Property>
+ <Property name="width">65%</Property>
<Property name="closeable">false</Property>
<Buttons>
<Button id="btnOk">
@@ -263,13 +331,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">kqdz</Property>
- <Property name="property">kqdz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">kqcq</Property>
- <Property name="property">kqcq</Property>
+ <Property name="name">parentId</Property>
+ <Property name="property">parentId</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -277,9 +340,9 @@
<Property name="property">yxcr</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement>
- <Property name="name">zdmj</Property>
- <Property name="property">zdmj</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">kqdz</Property>
+ <Property name="property">kqdz</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -298,17 +361,14 @@
<Property name="property">xzqhdm</Property>
<Editor/>
</AutoFormElement>
- <Label>
- <Property name="text"></Property>
- </Label>
<AutoFormElement>
- <Property name="name">createBy</Property>
- <Property name="property">createBy</Property>
+ <Property name="name">zdmj</Property>
+ <Property name="property">zdmj</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement>
- <Property name="name">createTime</Property>
- <Property name="property">createTime</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">remark</Property>
+ <Property name="property">remark</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -345,31 +405,35 @@
<Container>
<Button layoutConstraint="left">
<Property name="action">uploadFileImg</Property>
- <Property name="caption">楦熺灠鍥句笂浼�...</Property>
+ <Property name="caption">楦熺灠鍥句笂浼�</Property>
<Property name="exClassName">btn2</Property>
<Property name="iconClass">fa fa-cloud-upload</Property>
</Button>
+ <Label layoutConstraint="left">
+ <Property name="width">10px</Property>
+ </Label>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">showImg();</ClientEvent>
+ <Property name="caption">楦熺灠鍥鹃瑙�</Property>
+ <Property name="exClassName">btn4</Property>
+ <Property name="iconClass">fa fa-picture-o</Property>
+ </Button>
</Container>
<Link>
- <Property name="href">http://api.map.baidu.com/lbsapi/getpoint/</Property>
+ <Property name="href">https://lbs.amap.com/tools/picker</Property>
<Property name="target">_blank</Property>
<Property name="style">
<Property name="padding-left">150px</Property>
</Property>
<Property name="text">甯姪锛氱偣鍑诲潗鏍囦綅缃嬀鍙�</Property>
</Link>
- <AutoFormElement layoutConstraint="colSpan:3">
- <Property name="name">remark</Property>
- <Property name="property">remark</Property>
- <Editor/>
- </AutoFormElement>
</AutoForm>
</Children>
<Tools/>
</Dialog>
<Dialog id="dialogImg">
- <Property name="width">1000</Property>
- <Property name="height">640</Property>
+ <Property name="width">55%</Property>
+ <Property name="height">65%</Property>
<Property name="iconClass">fa fa-tasks</Property>
<Property name="caption">楦熺灠鍥鹃瑙�</Property>
<Buttons/>
@@ -453,9 +517,9 @@
</Container>
</CustomDropDown>
<UploadAction id="uploadFileImg">
- <ClientEvent name="onFileUploaded">var imgId = arg.returnValue;
+ <ClientEvent name="onFileUploaded">var imgPath = arg.returnValue;
var data = view.get("#dsMain.data:#");
- data.set("imgId",imgId);
+ data.set("imgPath",imgPath);
data.set("imgName",arg.file.name);</ClientEvent>
<Property name="fileResolver">fileUploadManage#imgFile</Property>
<Property name="maxFileSize">50MB</Property>
--
Gitblit v1.9.3