From 747a4a421dc8c1faf1c768aaac0fc7abc258e2c0 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期一, 02 三月 2026 11:15:22 +0800
Subject: [PATCH] 巡检配置，起止时间修改
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml | 130 ++++++++++++++++++++++---------------------
1 files changed, 66 insertions(+), 64 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 9b125e6..44064bf 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>
@@ -396,14 +403,12 @@
if(ViewType==1){
view.get("#form1").set("visible",true);
view.get("#dataGridMain1").set("visible",true);
- view.get("#tool").set("visible",true);

}

if(ViewType==2){
view.get("#form2").set("visible",true);
view.get("#dataGridMain2").set("visible",true);
- view.get("#tool").set("visible",true);
}

var deptId = window.parent.DEPT_ID;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�
@@ -411,7 +416,8 @@

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

query = function(){
@@ -431,7 +437,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 +446,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 +514,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 +522,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 +541,7 @@
<Property name="property">deptId</Property>
<Property name="label">鎵�灞炲簱鍖�</Property>
<Property name="hideMode">visibility</Property>
+ <Property name="trigger">dsDeptDropDown</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -543,7 +556,15 @@
</AutoFormElement>
<Button>
<ClientEvent name="onClick"> var data = view.get("#dsQuery.data");
- view.get("#dsMain").set("parameter",data).flushAsync();</ClientEvent>
+ var deptId=data.get("deptId");
+ var companyId=data.get("companyId");
+ if(!companyId || !deptId){
+ $alert("璇峰厛閫夋嫨鏀跺偍鍏徃鍜屽拰鎵�灞炲簱鍖�");
+
+ }else{
+ view.get("#dsMain").set("parameter",data).flushAsync();
+ }
+</ClientEvent>
<Property name="caption">鎼滅储</Property>
<Property name="exClassName">btn-q1</Property>
<Property name="iconClass">fa fa-search</Property>
@@ -563,7 +584,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>
@@ -574,12 +595,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>
@@ -590,43 +611,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>
@@ -696,13 +695,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>
@@ -728,6 +720,7 @@
<RowSelectorColumn/>
<RowNumColumn>
<Property name="caption">搴忓彿</Property>
+ <Property name="width">30</Property>
</RowNumColumn>
<DataColumn>
<Property name="property">companyId</Property>
@@ -771,13 +764,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>
@@ -796,15 +782,6 @@
<Editor/>
</DataColumn>
</DataGrid>
- <ToolBar id="tool" layoutConstraint="bottom">
- <Property name="hideMode">display</Property>
- <Property name="visible">false</Property>
- <Fill/>
- <DataPilot layoutConstraint="right">
- <Property name="itemCodes">pageSize,pages</Property>
- <Property name="dataSet">dsMain</Property>
- </DataPilot>
- </ToolBar>
</Container>
<Dialog id="dialogImg">
<Property name="width">55%</Property>
@@ -819,5 +796,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