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/ReportInDetail.view.xml | 108 ++++++++++++++++++++++++++++--------------------------
1 files changed, 56 insertions(+), 52 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
index a1f5e7a..328379a 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
@@ -369,7 +369,14 @@
</PropertyDef>
<PropertyDef name="timeDesc">
<Property></Property>
- <Property name="label">鏃堕棿</Property>
+ <Property name="label">鏌ヨ鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="createTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鍒惰〃鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="createUser">
+ <Property name="label">鍒惰〃浜�</Property>
</PropertyDef>
<PropertyDef name="title">
<Property></Property>
@@ -411,7 +418,8 @@

//榛樿鏌ヨ鏌ヨ鎻愭潯浠�
view.get("#dsQuery").insert({
- deptId:deptId
+ deptId:deptId,
+ type:"IN"
});

query = function(){
@@ -431,7 +439,7 @@
var user = encodeURIComponent(select.get("userName"));
var plateNum = encodeURIComponent(select.get("plateNum"));

- view.get("#iFrameImg").set("path", "./basic/inout/inout-img?id=" + select.get("id")+"&plateNum="+plateNum+"&user="+user);
+ view.get("#iFrameImg").set("path", "/basic/inout/inout-img?id=" + select.get("id")+"&plateNum="+plateNum+"&user="+user);
view.get("#dialogImg").show();
}else{
$notify("璇烽�夋嫨鏁版嵁鈥︹��");
@@ -440,19 +448,25 @@
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
<Property name="dataType">[dtMain]</Property>
- <Property name="dataProvider">reportInDetailPR#listRecord</Property>
+ <Property name="dataProvider">reportInoutPR#listRecord</Property>
<Property name="loadMode">manual</Property>
</DataSet>
<DataSet id="dsQuery">
<Property name="dataType">dtQuery</Property>
- <Property name="dataProvider">reportInDetailPR#getQuery</Property>
+ <Property name="dataProvider">reportInoutPR#getQueryInout</Property>
<Property></Property>
<Property name="loadMode">manual</Property>
+ </DataSet>
+ <DataSet id="dsDeptList">
+ <Property name="dataProvider">deptPR#getDeptByUserType</Property>
+ <Property name="userData">搴撳尯鍒楄〃涓嬫媺妗�</Property>
+ <Property name="loadMode">manual</Property>
+ <Property name="dataType">[dtDept]</Property>
</DataSet>
<Container>
<Property name="className">c-param</Property>
<AutoForm id="form1">
- <Property name="cols">*,*,*,*,90,90,140</Property>
+ <Property name="cols">*,*,280,280,90,90,140</Property>
<Property name="dataSet">dsQuery</Property>
<Property name="labelSeparator">锛�</Property>
<Property name="labelAlign">right</Property>
@@ -502,7 +516,7 @@
"start":data.get("start"),
"end":data.get("end")
}
-window.parent.$.table.exportExcelDorado("./export/inOutReport-excel", "鍏ュ簱鏁版嵁", param);</ClientEvent>
+window.parent.$.table.exportExcelDorado("./export/inout-excel", "鍏ュ簱鏁版嵁", param);</ClientEvent>
<Property name="caption">瀵煎嚭EXCEL</Property>
<Property name="exClassName">btn-q2</Property>
<Property name="width">140</Property>
@@ -510,7 +524,7 @@
</Button>
</AutoForm>
<AutoForm id="form2">
- <Property name="cols">*,*,*,*,90,90,140</Property>
+ <Property name="cols">*,*,280,280,90,90,140</Property>
<Property name="dataSet">dsQuery</Property>
<Property name="labelSeparator">锛�</Property>
<Property name="labelAlign">right</Property>
@@ -529,6 +543,7 @@
<Property name="property">deptId</Property>
<Property name="label">鎵�灞炲簱鍖�</Property>
<Property name="hideMode">visibility</Property>
+ <Property name="trigger">dsDeptDropDown</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -571,7 +586,7 @@
"start":data.get("start"),
"end":data.get("end")
}
-window.parent.$.table.exportExcelDorado("./export/inOutReport-excel", "鍏ュ簱鏁版嵁", param);</ClientEvent>
+window.parent.$.table.exportExcelDorado("./export/inout-excel", "鍏ュ簱鏁版嵁", param);</ClientEvent>
<Property name="caption">瀵煎嚭EXCEL</Property>
<Property name="exClassName">btn-q2</Property>
<Property name="width">140</Property>
@@ -582,12 +597,12 @@
<Container>
<Property name="className">c-data</Property>
<AutoForm id="autoForm1" layoutConstraint="top">
- <Property name="cols">*,*,*,*,*,*,*</Property>
+ <Property name="cols">*,*,300</Property>
<Property name="dataSet">dsQuery</Property>
<Property name="labelAlign">right</Property>
<Property name="showHint">false</Property>
<Property name="labelWidth">120</Property>
- <AutoFormElement layoutConstraint="colSpan:7">
+ <AutoFormElement layoutConstraint="colSpan:3">
<Property name="name">title</Property>
<Property name="property">title</Property>
<Property name="showLabel">false</Property>
@@ -598,43 +613,21 @@
</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement>
<Property name="name">timeDesc</Property>
<Property name="property">timeDesc</Property>
<Property name="editorType">Label</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">none</Property>
- <Property name="property">none</Property>
+ <Property name="name">createUser</Property>
+ <Property name="property">createUser</Property>
<Property name="editorType">Label</Property>
- <Property name="showLabel">false</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">none</Property>
- <Property name="property">none</Property>
- <Property name="editorType">Label</Property>
- <Property name="showLabel">false</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">none</Property>
- <Property name="property">none</Property>
- <Property name="editorType">Label</Property>
- <Property name="showLabel">false</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">none</Property>
- <Property name="property">none</Property>
- <Property name="editorType">Label</Property>
- <Property name="showLabel">false</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">unit</Property>
- <Property name="property">unit</Property>
+ <Property name="name">createTime</Property>
+ <Property name="property">createTime</Property>
<Property name="editorType">Label</Property>
<Editor/>
</AutoFormElement>
@@ -701,13 +694,6 @@
<Property name="property">settleWeight</Property>
<Property name="caption">缁撶畻閲嶉噺</Property>
<Property name="align">center</Property>
- <Property name="width">100</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">recordWeight</Property>
- <Property name="align">center</Property>
- <Property name="name">recordWeight</Property>
- <Property name="caption">鍏ュ簱閲嶉噺</Property>
<Property name="width">100</Property>
</DataColumn>
<DataColumn>
@@ -779,13 +765,6 @@
<Property name="width">100</Property>
</DataColumn>
<DataColumn>
- <Property name="property">recordWeight</Property>
- <Property name="align">center</Property>
- <Property name="name">recordWeight</Property>
- <Property name="caption">鍏ュ簱閲嶉噺</Property>
- <Property name="width">100</Property>
- </DataColumn>
- <DataColumn>
<Property name="property">completeTime</Property>
<Property name="align">center</Property>
<Property name="name">completeTime</Property>
@@ -827,5 +806,30 @@
</Children>
<Tools/>
</Dialog>
+ <DataSetDropDown id="dsDeptDropDown">
+ <ClientEvent name="onOpen">
+var entity = view.get("#dsQuery.data");
+if(!entity){
+ $alert("璇峰厛閫夋嫨鎵�灞炲叕鍙�");
+}else{
+ var deptId = entity.get("companyId");
+ if(!deptId){
+ $alert("璇峰厛閫夋嫨鎵�灞炲叕鍙�");
+ }else{
+ view.get("#dsDeptList").set("parameter",entity.get("companyId")).flushAsync();
+ }
+}</ClientEvent>
+ <Property name="dataSet">dsDeptList</Property>
+ <Property name="height">450</Property>
+ <Property name="autoOpen">true</Property>
+ <Property name="assignmentMap">deptId=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>
</View>
</ViewConfig>
--
Gitblit v1.9.3