From 0329de5a2343a179be54a9c70844515db202a998 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 19 一月 2026 09:42:52 +0800
Subject: [PATCH] 细节调整1
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/zy/InoutNoticeOut.view.xml | 390 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 277 insertions(+), 113 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/zy/InoutNoticeOut.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/zy/InoutNoticeOut.view.xml
index 97be764..de7df60 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/zy/InoutNoticeOut.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/zy/InoutNoticeOut.view.xml
@@ -3,16 +3,205 @@
<Arguments/>
<Context/>
<Model>
- <DataType name="dtMain" parent="dtNoticeOut"/>
+ <DataType name="dtMain">
+ <Property name="creationType">com.fzzy.igds.domain.InoutNoticeOut</Property>
+ <PropertyDef name="id">
+ <Property></Property>
+ <Property name="label">閫氱煡鍗曞彿</Property>
+ </PropertyDef>
+ <PropertyDef name="deptId">
+ <Property></Property>
+ <Property name="label">鎵�灞炲垎搴�</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">id</Property>
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#getDeptByUserType").getResult()}</Property>
+ <Property name="valueProperty">kqmc</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property></Property>
+ <Property name="label">缁勭粐缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="name">
+ <Property></Property>
+ <Property name="label">鍗曟嵁鍚嶇О</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="type">
+ <Property></Property>
+ <Property name="label">鍗曟嵁绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="name">搴撳尯閫氱煡鍗�</Property>
+ <Property name="code">10</Property>
+ </Entity>
+ <Entity>
+ <Property name="name">鐩戠閫氱煡鍗�</Property>
+ <Property name="code">20</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="contract">
+ <Property></Property>
+ <Property name="label">鍏宠仈鍚堝悓</Property>
+ <Property name="required">false</Property>
+ </PropertyDef>
+ <PropertyDef name="depotId">
+ <Property></Property>
+ <Property name="label">鍑哄簱浠撳簱</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getData").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="customerName">
+ <Property></Property>
+ <Property name="label">鏀惰揣瀹㈡埛</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="unitName">
+ <Property></Property>
+ <Property name="label">鍙戣揣鍗曚綅</Property>
+ <Property name="required">false</Property>
+ </PropertyDef>
+ <PropertyDef name="foodVariety">
+ <Property></Property>
+ <Property name="label">绮鍝佺</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicPR#sysDictData").getResult("FOOD_VARIETY_")}</Property>
+ <Property name="keyProperty">dictValue</Property>
+ <Property name="valueProperty">dictLabel</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="year">
+ <Property></Property>
+ <Property name="label">绮骞翠唤</Property>
+ </PropertyDef>
+ <PropertyDef name="targetNumber">
+ <Property name="dataType">double</Property>
+ <Property name="displayFormat">#0.0 KG</Property>
+ <Property name="required">true</Property>
+ <Property name="label">璁″垝鏁伴噺</Property>
+ </PropertyDef>
+ <PropertyDef name="completeNumber">
+ <Property name="dataType">double</Property>
+ <Property name="label">瀹屾垚鏁伴噺</Property>
+ <Property name="displayFormat">#0.0 KG</Property>
+ </PropertyDef>
+ <PropertyDef name="auditStatus">
+ <Property></Property>
+ <Property name="label">瀹℃牳鐘舵��</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicPR#triggerStatusType").getResult()}</Property>
+ <Property name="keyProperty">dictValue</Property>
+ <Property name="valueProperty">dictLabel</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="auditUser">
+ <Property></Property>
+ <Property name="label">瀹℃牳浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="auditDate">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">瀹℃壒鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="completeStatus">
+ <Property></Property>
+ <Property name="label">瀹屾垚鐘舵��</Property>
+ <Property name="mapping">
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="name">鏈畬鎴�</Property>
+ <Property name="code">NONE</Property>
+ </Entity>
+ <Entity>
+ <Property name="name">宸插畬鎴�</Property>
+ <Property name="code">COMPLETE</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="completeTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">瀹屾垚鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="remark">
+ <Property></Property>
+ <Property name="label">澶囨敞淇℃伅</Property>
+ </PropertyDef>
+ <PropertyDef name="createTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鍒跺崟鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="createBy">
+ <Property></Property>
+ <Property name="label">鍒跺崟浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鏇存柊鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="updateBy">
+ <Property></Property>
+ <Property name="label">鏇存柊浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="bankId">
+ <Property></Property>
+ <Property name="label">鐩戠潱閾惰</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("bankPR#listAll").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="visible">true</Property>
+ </PropertyDef>
+ <PropertyDef name="auditStatus">
+ <Property></Property>
+ <Property name="label">瀹℃牳鐘舵��</Property>
+ <Property name="mapping">
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="name">鐩戠瀹℃牳</Property>
+ <Property name="code">10</Property>
+ </Entity>
+ <Entity>
+ <Property name="name">閾惰瀹℃牳</Property>
+ <Property name="code">20</Property>
+ </Entity>
+ <Entity>
+ <Property name="name">宸插鏍�</Property>
+ <Property name="code">30</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ </DataType>
</Model>
<View layout="padding:10">
- <ClientEvent name="onReady">var deptId = window.parent.deptId;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�
-var TYPE = "NOTICE_OUT";
-query = function(){
- view.get("#dsQuery").set("parameter",{deptId:deptId}).flushAsync();
+ <ClientEvent name="onReady">query = function(){
+ var param = view.get("#dsQuery.data");
+ view.get("#dsMain").set("parameter",param).flushAsync();
};
-query();
- 
+

//瀹ｄ紶鎿嶄綔
renderCell1 = function(arg,self){
@@ -39,11 +228,17 @@

//鐐瑰嚮瀹℃牳
audit = function(){
- 
+ var cur = view.get("#dsMain.data:#");
+ var url ="com.fzzy.work.WorkOrder.d?businessId="+cur.get("id");
+ window.$openParentTab("宸ュ崟绠＄悊",url);
}
//鐐瑰嚮璇︾粏
showDetail = function(){
- 
+ view.get("#dialogMain").show();
+}
+//鐐瑰嚮鎵撳嵃
+print = function(){
+ $alert("鏈幏鍙栧埌鎵撳嵃妯℃澘鈥︹��");
}</ClientEvent>
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
@@ -55,37 +250,32 @@
<DataSet id="dsQuery">
<Property name="dataType">dtNoticeParam</Property>
<Property name="dataProvider">inoutNoticePR#getYearQuery</Property>
- <Property name="loadMode">manual</Property>
</DataSet>
<Container>
<Property name="className">c-param</Property>
<AutoForm>
- <Property name="cols">*,*,*,90,90,*</Property>
+ <Property name="cols">*,*,90,90,*</Property>
<Property name="dataSet">dsQuery</Property>
<Property name="labelAlign">right</Property>
<Property name="labelWidth">100</Property>
<AutoFormElement>
<Property name="name">deptId</Property>
<Property name="property">deptId</Property>
+ <Property name="trigger">autoMappingDropDown2</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">depotId</Property>
- <Property name="property">depotId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">year</Property>
- <Property name="property">year</Property>
+ <Property name="name">customerName</Property>
+ <Property name="property">customerName</Property>
<Editor/>
</AutoFormElement>
<Button>
<ClientEvent name="onClick">var data = view.get("#dsQuery.data");
- if(data){
- view.get("#dsMain").set("parameter",data).flushAsync();
- }else{
- view.get("#dsMain").flushAsync();
- }</ClientEvent>
+ if(data){
+ view.get("#dsMain").set("parameter",data.toJSON()).flushAsync();
+ }else{
+ view.get("#dsMain").flushAsync();
+ }</ClientEvent>
<Property name="caption">鎼滅储</Property>
<Property name="iconClass">fa fa-search</Property>
<Property name="exClassName">btn-q1</Property>
@@ -100,15 +290,8 @@
</Container>
<Container>
<Property name="className">c-data</Property>
- <ToolBar>
- <ToolBarButton layoutConstraint="left">
- <Property name="caption">瀵煎嚭EXCEL</Property>
- <Property name="exClassName">btn4</Property>
- <Property name="iconClass">fa fa-file-excel-o</Property>
- </ToolBarButton>
- </ToolBar>
<DataGrid id="dataGridMain" layoutConstraint="padding:8">
- <ClientEvent name="onDataRowClick">view.get("#dataGridMain").set("selection",arg.data);</ClientEvent>
+ <ClientEvent name="onDataRowClick">self.set("selection",arg.data);</ClientEvent>
<Property name="dataSet">dsMain</Property>
<Property name="readOnly">true</Property>
<Property name="selectionMode">singleRow</Property>
@@ -120,18 +303,18 @@
</RowNumColumn>
<DataColumn name="id">
<Property name="property">id</Property>
- <Property name="width">180</Property>
+ <Property name="width">200</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn>
<Property name="property">deptId</Property>
- <Property name="align">center</Property>
- <Property name="width">300</Property>
+ <Property name="align">left</Property>
<Property name="name">deptId</Property>
</DataColumn>
<DataColumn name="name">
<Property name="property">name</Property>
<Property name="align">center</Property>
+ <Property name="width">120</Property>
</DataColumn>
<DataColumn name="customerName">
<Property name="property">customerName</Property>
@@ -140,19 +323,24 @@
<DataColumn name="depotId">
<Property name="property">depotId</Property>
<Property name="align">center</Property>
- <Property name="width">150</Property>
- </DataColumn>
- <DataColumn name="auditStatus">
- <ClientEvent name="onRenderCell">renderStatus(arg);</ClientEvent>
- <Property name="property">auditStatus</Property>
<Property name="width">120</Property>
- <Property name="align">center</Property>
</DataColumn>
<DataColumn>
<Property name="property">targetNumber</Property>
<Property name="name">targetNumber</Property>
<Property name="align">center</Property>
- <Property name="width">200</Property>
+ <Property name="width">120</Property>
+ </DataColumn>
+ <DataColumn name="auditStatus">
+ <Property name="property">auditStatus</Property>
+ <Property name="width">100</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn>
+ <Property name="property">createTime</Property>
+ <Property name="align">center</Property>
+ <Property name="name">createTime</Property>
+ <Property name="width">160</Property>
</DataColumn>
<DataColumn>
<ClientEvent name="onRenderCell">renderCell1(arg,self);</ClientEvent>
@@ -173,26 +361,13 @@
<Dialog id="dialogMain">
<Property name="closeable">false</Property>
<Property name="caption">鍑哄簱閫氱煡鍗�</Property>
- <Property name="width">1200</Property>
+ <Property name="width">85%</Property>
+ <Property name="height">90%</Property>
<Property name="iconClass">fa fa-tasks</Property>
<Buttons>
- <Button id="btnOk">
- <ClientEvent name="onClick">view.get("#updateSave").execute(function(result){
- if(result){
- $alert(result);
- return;
- }
- $notify("鏁版嵁鎵ц瀹屾垚锛侊紒");
- self.get("parent").hide();
- });</ClientEvent>
- <Property name="caption">淇濆瓨</Property>
- <Property name="iconClass">fa fa-check-circle</Property>
- <Property name="exClassName">btn1</Property>
- <Property name="width">120</Property>
- </Button>
<Button>
<ClientEvent name="onClick">view.get("#dsMain.data:#").cancel();
- self.get("parent").hide();</ClientEvent>
+ self.get("parent").hide();</ClientEvent>
<Property name="caption">鍙栨秷</Property>
<Property name="exClassName">btn3</Property>
<Property name="iconClass">fa fa-times-circle</Property>
@@ -205,6 +380,7 @@
<Property name="dataSet">dsMain</Property>
<Property name="showHint">false</Property>
<Property name="cols">210,*,210</Property>
+ <Property name="readOnly">true</Property>
<Control/>
<AutoFormElement>
<Property name="name">name</Property>
@@ -231,7 +407,8 @@
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
<Property name="labelWidth">120</Property>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="readOnly">true</Property>
+ <AutoFormElement>
<Property name="name">name</Property>
<Property name="property">name</Property>
<Editor/>
@@ -239,12 +416,26 @@
<AutoFormElement>
<Property name="name">type</Property>
<Property name="property">type</Property>
+ <Property name="trigger">autoMappingDropDown1</Property>
<Property name="editorType">RadioGroup</Property>
+ <Property name="showHint">false</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement id="formItemBank">
+ <Property name="name">bankId</Property>
+ <Property name="property">bankId</Property>
+ <Property name="hideMode">visibility</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
<Property name="name">depotId</Property>
<Property name="property">depotId</Property>
+ <Property name="trigger">dsDepotDropDown</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -258,20 +449,37 @@
<Property name="trigger">defaultYearDropDown</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement id="formItemCustomerName" layoutConstraint="colSpan:2">
<Property name="name">customerName</Property>
<Property name="property">customerName</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">unitName</Property>
- <Property name="property">unitName</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
<Property name="name">targetNumber</Property>
<Property name="property">targetNumber</Property>
<Property name="readOnly">false</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">createTime</Property>
+ <Property name="property">createTime</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">createBy</Property>
+ <Property name="property">createBy</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">createTime</Property>
+ <Property name="property">createTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:3">
+ <Property name="name">remark</Property>
+ <Property name="property">remark</Property>
+ <Property name="editorType">TextArea</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -291,17 +499,6 @@
<Property name="readOnly">false</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement>
- <Property name="name">createBy</Property>
- <Property name="property">createBy</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">auditStatus</Property>
- <Property name="property">auditStatus</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">contract</Property>
<Property name="property">contract</Property>
@@ -313,32 +510,16 @@
</Property>
<Property name="text">娉細鐩戠閫氱煡鍗曪紝鍙～鍐欒川鎶煎悎鍚屽悕绉�</Property>
</Label>
- <AutoFormElement layoutConstraint="colSpan:3">
- <Property name="name">remark</Property>
- <Property name="property">remark</Property>
- <Property name="editorType">TextArea</Property>
- <Editor/>
- </AutoFormElement>
<AutoFormElement>
- <Property name="name">createTime</Property>
- <Property name="property">createTime</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">auditUser</Property>
- <Property name="property">auditUser</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">auditDate</Property>
- <Property name="property">auditDate</Property>
+ <Property name="name">auditStatus</Property>
+ <Property name="property">auditStatus</Property>
<Property name="readOnly">true</Property>
<Editor/>
</AutoFormElement>
<HtmlContainer layoutConstraint="colSpan:3">
- <Property name="content">1.鍑哄簱閫氱煡鍗曚綔涓哄嚭搴撲綔涓氱殑鍓嶇疆鏉′欢锛屽繀椤婚厤缃紝鍚﹀垯鏃犳硶杩涜鍏ュ簱浣滀笟銆�<br>
- 2.鍗曟嵁绫诲瀷=搴撳尯閫氱煡鍗曪紝琛ㄧず搴撳尯鑷繁浣滀笟涓氬姟锛屼笉鍙楃洃绠＄鐞嗐��</Property>
+ <Property name="content">1.鍏ュ簱閫氱煡鍗曚綔涓哄叆搴撲綔涓氱殑鍓嶇疆鏉′欢锛屽繀椤婚厤缃紝鍚﹀垯鏃犳硶杩涜鍑哄簱浣滀笟銆�<br>
+ 2.鍗曟嵁绫诲瀷=搴撳尯閫氱煡鍗曪紝琛ㄧず搴撳尯鑷繁浣滀笟涓氬姟锛屼笉鍙楃洃绠＄鐞嗐��<br>
+ 3.鍗曟嵁绫诲瀷=璐ㄦ娂鐩戠閫氱煡鍗曪紝鍗曟嵁蹇呴』濉啓鐩戠潱閾惰銆�</Property>
<Property name="exClassName">h-tip</Property>
<Property name="contentOverflow">hidden</Property>
</HtmlContainer>
@@ -347,22 +528,5 @@
</Children>
<Tools/>
</Dialog>
- <UpdateAction id="updateSave">
- <Property name="dataResolver">inoutNoticePR#saveOut</Property>
- <UpdateItem>
- <Property name="dataPath">[#current]</Property>
- <Property name="dataSet">dsMain</Property>
- </UpdateItem>
- </UpdateAction>
- <AjaxAction id="ajaxDel">
- <Property name="service">inoutNoticePR#delDataOut</Property>
- <Property name="confirmMessage">纭畾瑕佹墽琛屽垹闄や箞锛�</Property>
- </AjaxAction>
- <AjaxAction id="ajaxInitAdd">
- <Property name="service">inoutNoticePR#initAddOut</Property>
- </AjaxAction>
- <AjaxAction id="recalculate">
- <Property name="service">inoutNoticePR#updateSumNoticeOut</Property>
- </AjaxAction>
</View>
</ViewConfig>
--
Gitblit v1.9.3