From 87e5654c26476fabd1156023350d7726092af8c1 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期日, 30 十一月 2025 18:28:41 +0800
Subject: [PATCH] 调整通知单
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml | 402 +++++++++++++++++++++++++--------------------------------
1 files changed, 175 insertions(+), 227 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml
index c1e4663..5b52c7b 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml
@@ -7,7 +7,7 @@
<Property name="creationType">com.fzzy.igds.domain.InoutNoticeIn</Property>
<PropertyDef name="id">
<Property></Property>
- <Property name="label">閫氱煡鍗曞彿</Property>
+ <Property name="label">鍗曟嵁鍙�</Property>
</PropertyDef>
<PropertyDef name="companyId">
<Property></Property>
@@ -16,29 +16,24 @@
<PropertyDef name="deptId">
<Property></Property>
<Property name="label">鎵�灞炲垎搴�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deptPR#getAllData").getResult()}</Property>
- <Property name="keyProperty">id</Property>
- <Property name="valueProperty">kqmc</Property>
- </Property>
</PropertyDef>
<PropertyDef name="name">
<Property></Property>
- <Property name="label">閫氱煡鍗曞悕绉�</Property>
+ <Property name="label">鍗曟嵁鍚嶇О</Property>
<Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="type">
<Property></Property>
- <Property name="label">绫诲瀷</Property>
+ <Property name="label">鍗曟嵁绫诲瀷</Property>
<Property name="mapping">
<Property name="mapValues">
<Collection>
<Entity>
- <Property name="name">搴撳尯鑷缓</Property>
+ <Property name="name">搴撳尯閫氱煡鍗�</Property>
<Property name="code">10</Property>
</Entity>
<Entity>
- <Property name="name">閾惰鐩戠</Property>
+ <Property name="name">鐩戠閫氱煡鍗�</Property>
<Property name="code">20</Property>
</Entity>
</Collection>
@@ -46,10 +41,11 @@
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
+ <Property name="required">true</Property>
</PropertyDef>
- <PropertyDef name="contractId">
+ <PropertyDef name="contract">
<Property></Property>
- <Property name="label">璐ㄦ娂鍚堝悓</Property>
+ <Property name="label">鍏宠仈鍚堝悓</Property>
<Property name="required">false</Property>
</PropertyDef>
<PropertyDef name="depotId">
@@ -89,13 +85,12 @@
<PropertyDef name="year">
<Property></Property>
<Property name="label">骞翠唤</Property>
- <Property name="required">true</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>
+ <Property name="label">璁″垝鏁伴噺</Property>
</PropertyDef>
<PropertyDef name="completeNumber">
<Property name="dataType">Double</Property>
@@ -155,7 +150,7 @@
</Property>
</PropertyDef>
<PropertyDef name="completeTime">
- <Property name="dataType">DateTime</Property>
+ <Property name="dataType">Date</Property>
<Property name="label">瀹屾垚鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="remark">
@@ -168,72 +163,19 @@
</PropertyDef>
<PropertyDef name="createTime">
<Property name="dataType">DateTime</Property>
- <Property name="label">鍒涘缓鏃堕棿</Property>
- <Property name="readOnly">true</Property>
+ <Property name="label">鍒跺崟鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="createBy">
<Property></Property>
- <Property name="label">鍒涘缓浜�</Property>
- <Property name="readOnly">true</Property>
+ <Property name="label">鍒跺崟浜�</Property>
</PropertyDef>
<PropertyDef name="updateTime">
<Property name="dataType">DateTime</Property>
<Property name="label">鏇存柊鏃堕棿</Property>
- <Property name="readOnly">true</Property>
</PropertyDef>
<PropertyDef name="updateBy">
<Property></Property>
<Property name="label">鏇存柊浜�</Property>
- <Property name="readOnly">true</Property>
- </PropertyDef>
- </DataType>
- <DataType name="dtQuery">
- <PropertyDef name="depotId">
- <Property></Property>
- <Property name="label">瑁呭嵏浠撳簱</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
- <Property name="keyProperty">id</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="customerName">
- <Property></Property>
- <Property name="label">鍙戣揣瀹㈡埛</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>
- </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>
- </DataType>
- <DataType name="dtQueryTitle">
- <PropertyDef name="title">
- <Property name="label">title</Property>
</PropertyDef>
</DataType>
</Model>
@@ -245,14 +187,9 @@
};
query();

-queryTitle = function(){
- view.get("#dsQueryTitle").set("parameter",{type:TYPE,deptId:deptId}).flushAsync();
-};
-queryTitle();
- 
//鏂板
add = function(){
- view.get("#ajaxInitAdd").set("parameter", TYPE).execute(function(data){
+ view.get("#ajaxInitAdd").execute(function(data){
view.get("#dsMain").insert(data);
view.get("#dialogMain").show();
});
@@ -265,14 +202,9 @@
<Property name="loadMode">lazy</Property>
</DataSet>
<DataSet id="dsQuery">
- <Property name="dataType">dtQuery</Property>
<Property name="dataProvider">inoutNoticePR#getYearQuery</Property>
<Property name="loadMode">manual</Property>
- </DataSet>
- <DataSet id="dsQueryTitle">
- <Property name="dataType">dtQueryTitle</Property>
- <Property name="dataProvider">inoutNoticePR#getTitle</Property>
- <Property name="loadMode">manual</Property>
+ <Property name="dataType">dtNoticeParam</Property>
</DataSet>
<Container>
<Property name="className">c-param</Property>
@@ -310,7 +242,7 @@
}</ClientEvent>
<Property name="caption">鎼滅储</Property>
<Property name="iconClass">fa fa-search</Property>
- <Property name="exClassName">btn-q1</Property>>
+ <Property name="exClassName">btn-q1</Property>
</Button>
<Button>
<ClientEvent name="onClick">view.get("#dsQuery").flushAsync();</ClientEvent>
@@ -443,34 +375,29 @@
<Property name="width">160</Property>
</DataColumn>
</DataGrid>
- </Container>
- <Container layoutConstraint="bottom">
- <Property name="className">c-bottom</Property>
- <DataPilot layoutConstraint="right">
- <Property name="itemCodes">pageSize,pages</Property>
- <Property name="dataSet">dsMain</Property>
- </DataPilot>
+ <ToolBar layoutConstraint="bottom">
+ <Fill/>
+ <DataPilot layoutConstraint="right">
+ <Property name="itemCodes">pageSize,pages</Property>
+ <Property name="dataSet">dsMain</Property>
+ </DataPilot>
+ </ToolBar>
</Container>
<Dialog id="dialogMain" layout="regionPadding:8">
<Property name="closeable">false</Property>
<Property name="caption">鍏ュ簱閫氱煡鍗�</Property>
- <Property name="width">60%</Property>
+ <Property name="width">1200</Property>
<Property name="iconClass">fa fa-tasks</Property>
<Buttons>
<Button id="btnOk">
- <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
- if(data.validate() != 'ok'){
- $notify("鏁版嵁鏍￠獙澶辫触锛侊紒");
- return;
- }
- view.get("#ajaxSave").set("parameter",data).execute(function(result){
- if(result){
- $alert(result);
- return;
- }
- $notify("鏁版嵁鎵ц瀹屾垚锛侊紒");
- self.get("parent").hide();
- });</ClientEvent>
+ <ClientEvent name="onClick">view.get("#udpateSave").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>
@@ -487,134 +414,148 @@
</Buttons>
<Children>
<Container>
- <AutoForm id="autoForm1" layoutConstraint="top padding:10">
- <Property name="cols">*,*,*,*,*,*,*</Property>
- <Property name="dataSet">dsQueryTitle</Property>
- <Property name="labelAlign">right</Property>
+ <AutoForm layoutConstraint="top ">
+ <Property name="dataSet">dsMain</Property>
<Property name="showHint">false</Property>
- <AutoFormElement layoutConstraint="colSpan:7">
- <Property name="name">title</Property>
- <Property name="property">title</Property>
- <Property name="showLabel">false</Property>
+ <Property name="cols">210,*,210</Property>
+ <Control/>
+ <AutoFormElement>
+ <Property name="name">name</Property>
+ <Property name="property">name</Property>
<Property name="editorType">Label</Property>
- <Property name="style">
- <Property name="font">bold 30px Georgia, serif;</Property>
- <Property name="text-align">center</Property>
- </Property>
+ <Property name="showLabel">false</Property>
+ <Property name="showHint">false</Property>
+ <Property name="className">f-title</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">id</Property>
+ <Property name="property">id</Property>
+ <Property name="editorType">Label</Property>
+ <Property name="showHint">false</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="showLabel">false</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
- <Container layout="padding:15">
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*</Property>
- <Property name="labelAlign">right</Property>
- <Property name="labelSeparator">锛�</Property>
- <Property name="labelWidth">120</Property>
- <AutoFormElement>
- <Property name="name">name</Property>
- <Property name="property">name</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">depotId</Property>
- <Property name="property">depotId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">id</Property>
- <Property name="property">id</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">foodVariety</Property>
- <Property name="property">foodVariety</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <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">year</Property>
- <Property name="property">year</Property>
- <Property name="trigger">defaultYearDropDown</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">completeNumber</Property>
- <Property name="property">completeNumber</Property>
- <Property name="readOnly">false</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">type</Property>
- <Property name="property">type</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">completeStatus</Property>
- <Property name="property">completeStatus</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">completeTime</Property>
- <Property name="property">completeTime</Property>
- <Property name="readOnly">false</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">contractId</Property>
- <Property name="property">contractId</Property>
- <Editor/>
- </AutoFormElement>
- <Label layoutConstraint="colSpan:2">
- <Property name="style">
- <Property name="color">blue</Property>
- </Property>
- <Property name="text">娉細绫诲瀷涓洪摱琛岀洃绠℃椂锛岄渶鍏宠仈璐ㄦ娂鍚堝悓</Property>
- </Label>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">remark</Property>
- <Property name="property">remark</Property>
- <Property name="editorType">TextArea</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>
- <Property name="name">updateBy</Property>
- <Property name="property">updateBy</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">updateTime</Property>
- <Property name="property">updateTime</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
- </Container>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelWidth">120</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">name</Property>
+ <Property name="property">name</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">type</Property>
+ <Property name="property">type</Property>
+ <Property name="editorType">RadioGroup</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">depotId</Property>
+ <Property name="property">depotId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">foodVariety</Property>
+ <Property name="property">foodVariety</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">year</Property>
+ <Property name="property">year</Property>
+ <Property name="trigger">defaultYearDropDown</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement 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">completeNumber</Property>
+ <Property name="property">completeNumber</Property>
+ <Property name="readOnly">false</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">completeStatus</Property>
+ <Property name="property">completeStatus</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">completeTime</Property>
+ <Property name="property">completeTime</Property>
+ <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>
+ <Editor/>
+ </AutoFormElement>
+ <Label>
+ <Property name="style">
+ <Property name="color">blue</Property>
+ </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="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <HtmlContainer layoutConstraint="colSpan:3">
+ <Property name="content">1.鍏ュ簱閫氱煡鍗曚綔涓哄叆搴撲綔涓氱殑鍓嶇疆鏉′欢锛屽繀椤婚厤缃紝鍚﹀垯鏃犳硶杩涜鍏ュ簱浣滀笟銆�<br>
+2.鍗曟嵁绫诲瀷=搴撳尯閫氱煡鍗曪紝琛ㄧず搴撳尯鑷繁浣滀笟涓氬姟锛屼笉鍙楃洃绠＄鐞嗐��</Property>
+ <Property name="exClassName">h-tip</Property>
+ <Property name="contentOverflow">hidden</Property>
+ </HtmlContainer>
+ </AutoForm>
</Container>
</Children>
<Tools/>
@@ -622,6 +563,13 @@
<AjaxAction id="ajaxSave">
<Property name="service">inoutNoticePR#saveIn</Property>
</AjaxAction>
+ <UpdateAction id="udpateSave">
+ <Property name="dataResolver">inoutNoticePR#saveIn</Property>
+ <UpdateItem>
+ <Property name="dataPath">[#current]</Property>
+ <Property name="dataSet">dsMain</Property>
+ </UpdateItem>
+ </UpdateAction>
<AjaxAction id="ajaxDel">
<Property name="service">inoutNoticePR#delDataIn</Property>
<Property name="confirmMessage">纭畾瑕佹墽琛屽垹闄や箞锛�</Property>
--
Gitblit v1.9.3