From e9260e2cac4ad51b6d785af4f0e147fc5d918ae5 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 30 十月 2023 10:49:05 +0800
Subject: [PATCH] 增加4.0版本计划及计划详细
---
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1106.view.xml | 387 ++++++++++++++++++++++++++-----------------------------
1 files changed, 184 insertions(+), 203 deletions(-)
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1214.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1106.view.xml
similarity index 60%
copy from src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1214.view.xml
copy to src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1106.view.xml
index 76c1084..44a3e15 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1214.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1106.view.xml
@@ -4,99 +4,78 @@
<Context/>
<Model>
<DataType name="dtMain">
- <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1214</Property>
- <PropertyDef name="crkid">
- <Property/>
- <Property name="label">鍑哄叆搴撹褰旾D</Property>
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1106</Property>
+ <PropertyDef name="ygbh">
+ <Property></Property>
+ <Property name="label">娌圭綈缂栧彿</Property>
</PropertyDef>
<PropertyDef name="jlqybh">
- <Property/>
+ <Property></Property>
<Property name="label">鍐涚伯浼佷笟缂栧彿</Property>
</PropertyDef>
- <PropertyDef name="ssqymc">
- <Property/>
+ <PropertyDef name="jlqymc">
+ <Property></Property>
<Property name="label">鍐涚伯浼佷笟鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="jgzdbh">
- <Property/>
+ <Property></Property>
<Property name="label">鍐涗緵绔欑偣缂栧彿</Property>
</PropertyDef>
<PropertyDef name="jgzdmc">
- <Property/>
+ <Property></Property>
<Property name="label">鍐涗緵绔欑偣鍚嶇О</Property>
</PropertyDef>
- <PropertyDef name="ywrq">
- <Property/>
- <Property name="label">涓氬姟鏃ユ湡</Property>
+ <PropertyDef name="ygmc">
+ <Property></Property>
+ <Property name="label">娌圭亴鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="yglx">
+ <Property></Property>
+ <Property name="label">娌圭亴绫诲瀷</Property>
+ </PropertyDef>
+ <PropertyDef name="ykdj">
+ <Property></Property>
+ <Property name="label">娌圭亴绛夌骇</Property>
+ </PropertyDef>
+ <PropertyDef name="ygor">
+ <Property name="dataType">Double</Property>
+ <Property name="label">娌圭綈鎬诲</Property>
+ </PropertyDef>
+ <PropertyDef name="ygzrd1">
+ <Property name="dataType">Double</Property>
+ <Property name="label">娌圭綈缁勫</Property>
+ </PropertyDef>
+ <PropertyDef name="lxdh">
+ <Property></Property>
+ <Property name="label">鑱旂郴鐢佃瘽</Property>
+ </PropertyDef>
+ <PropertyDef name="cfjd">
+ <Property name="dataType">Double</Property>
+ <Property name="label">浠撴埧缁忓害</Property>
+ </PropertyDef>
+ <PropertyDef name="cfwd">
+ <Property name="dataType">Double</Property>
+ <Property name="label">浠撴埧绾害</Property>
+ </PropertyDef>
+ <PropertyDef name="qyrq">
<Property name="dataType">Date</Property>
+ <Property name="label">鍚敤鏃ユ湡</Property>
</PropertyDef>
- <PropertyDef name="crklx">
- <Property/>
- <Property name="label">鍑哄叆搴撶被鍨�</Property>
+ <PropertyDef name="ygzt">
+ <Property></Property>
+ <Property name="label">娌圭綈鐘舵��</Property>
</PropertyDef>
- <PropertyDef name="ywlx">
- <Property/>
- <Property name="label">涓氬姟绫诲瀷</Property>
+ <PropertyDef name="ygsyzt">
+ <Property></Property>
+ <Property name="label">娌圭綈浣跨敤鐘舵��</Property>
</PropertyDef>
- <PropertyDef name="crkpz">
- <Property/>
- <Property name="label">鍑哄叆搴撳嚟璇�</Property>
+ <PropertyDef name="sfyx">
+ <Property></Property>
+ <Property name="label">鏄惁鏈夋晥</Property>
</PropertyDef>
- <PropertyDef name="jljgqybh">
- <Property/>
- <Property name="label">鍔犲伐浼佷笟缂栧彿</Property>
- </PropertyDef>
- <PropertyDef name="jljgqymc">
- <Property/>
- <Property name="label">鍔犲伐浼佷笟鍚嶇О</Property>
- </PropertyDef>
- <PropertyDef name="khbh">
- <Property/>
- <Property name="label">瀹㈡埛缂栧彿</Property>
- </PropertyDef>
- <PropertyDef name="glzxm">
- <Property/>
- <Property name="label">瀹㈡埛濮撳悕</Property>
- </PropertyDef>
- <PropertyDef name="shdw">
- <Property/>
- <Property name="label">鏀惰揣鍗曚綅</Property>
- </PropertyDef>
- <PropertyDef name="shlxr">
- <Property/>
- <Property name="label">鏀惰揣鑱旂郴浜�</Property>
- </PropertyDef>
- <PropertyDef name="shlxrdh">
- <Property/>
- <Property name="label">鏀惰揣鑱旂郴鐢佃瘽</Property>
- </PropertyDef>
- <PropertyDef name="rjfaid">
- <Property/>
- <Property name="label">搴旀�ユ柟妗圛D</Property>
- </PropertyDef>
- <PropertyDef name="jhid">
- <Property/>
- <Property name="label">绛规帾璁″垝ID</Property>
- </PropertyDef>
- <PropertyDef name="htid">
- <Property/>
- <Property name="label">鍚堝悓ID</Property>
- </PropertyDef>
- <PropertyDef name="psrwid">
- <Property/>
- <Property name="label">閰嶉�佷换鍔d</Property>
- </PropertyDef>
- <PropertyDef name="yscch">
- <Property/>
- <Property name="label">杩愯緭杞﹁埞鍙�</Property>
- </PropertyDef>
- <PropertyDef name="cyr">
- <Property/>
- <Property name="label">鎵胯繍浜�</Property>
- </PropertyDef>
- <PropertyDef name="cyrdh">
- <Property/>
- <Property name="label">鎵胯繍浜虹數璇�</Property>
+ <PropertyDef name="bz">
+ <Property></Property>
+ <Property name="label">澶囨敞</Property>
</PropertyDef>
<PropertyDef name="bizId">
<Property></Property>
@@ -104,24 +83,42 @@
</PropertyDef>
<PropertyDef name="updateTime">
<Property name="dataType">Date</Property>
- <Property name="label">鏇存柊鏃堕棿</Property>
+ <Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
</PropertyDef>
<PropertyDef name="czbz">
<Property></Property>
<Property name="label">鎿嶄綔鏍囧織</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("CZBZ")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
</PropertyDef>
<PropertyDef name="kqdm">
<Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
- <PropertyDef name="bz">
- <Property/>
- <Property name="label">澶囨敞</Property>
+ </DataType>
+ <DataType name="dtGBArea">
+ <Property name="creationType">com.fzzy.api.entity.GbArea</Property>
+ <PropertyDef name="code">
+ <Property></Property>
+ <Property name="label">鎺ュ彛缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="name">
+ <Property></Property>
+ <Property name="label">鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="parentCode">
+ <Property></Property>
+ <Property name="label">鐖剁紪鐮�</Property>
+ </PropertyDef>
+ <PropertyDef name="disabledTag">
+ <Property></Property>
+ <Property name="label">绂佺敤</Property>
+ </PropertyDef>
+ <PropertyDef name="simple">
+ <Property></Property>
+ <Property name="label">鏄惁榛樿</Property>
+ </PropertyDef>
+ <PropertyDef name="remark">
+ <Property></Property>
+ <Property name="label">澶囨敞璇存槑</Property>
</PropertyDef>
</DataType>
</Model>
@@ -129,7 +126,7 @@
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
<Property name="dataType">[dtMain]</Property>
- <Property name="dataProvider">whjlApi1214PR#listData</Property>
+ <Property name="dataProvider">whjlApi1106PR#listData</Property>
</DataSet>
<Container layout="regionPadding:10" layoutConstraint="top">
<Property name="exClassName">bg-color</Property>
@@ -216,48 +213,44 @@
<RowSelectorColumn>
<Property name="caption">涓婁紶</Property>
</RowSelectorColumn>
- <DataColumn name="crkid">
- <Property name="property">crkid</Property>
+ <DataColumn name="ygbh">
+ <Property name="property">ygbh</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="ssqymc">
- <Property name="property">ssqymc</Property>
+ <DataColumn name="ygmc">
+ <Property name="property">ygmc</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="jgzdmc">
- <Property name="property">jgzdmc</Property>
+ <DataColumn name="yglx">
+ <Property name="property">yglx</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="ywrq">
- <Property name="property">ywrq</Property>
+ <DataColumn name="lxdh">
+ <Property name="property">lxdh</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="crklx">
- <Property name="property">crklx</Property>
+ <DataColumn name="cfjd">
+ <Property name="property">cfjd</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="ywlx">
- <Property name="property">ywlx</Property>
+ <DataColumn name="cfwd">
+ <Property name="property">cfwd</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="crkpz">
- <Property name="property">crkpz</Property>
+ <DataColumn name="qyrq">
+ <Property name="property">qyrq</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="glzxm">
- <Property name="property">glzxm</Property>
+ <DataColumn name="ygzt">
+ <Property name="property">ygzt</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="cyr">
- <Property name="property">cyr</Property>
+ <DataColumn name="czbz">
+ <Property name="property">czbz</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="cyrdh">
- <Property name="property">cyrdh</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="yscch">
- <Property name="property">yscch</Property>
+ <DataColumn name="updateTime">
+ <Property name="property">updateTime</Property>
<Property name="align">center</Property>
</DataColumn>
</DataGrid>
@@ -266,7 +259,7 @@
<Property name="width">85%</Property>
<Property name="closeable">false</Property>
<Property name="iconClass">fa fa-sliders</Property>
- <Property name="caption">瀹㈡埛淇℃伅</Property>
+ <Property name="caption">鍐涚伯浼佷笟淇℃伅</Property>
<Buttons>
<Button>
<ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
@@ -291,10 +284,9 @@
<Property name="cols">*,*,*,*</Property>
<Property name="labelPosition">top</Property>
<Property name="labelSeparator">:</Property>
- <Property name="labelAlign">left</Property>
<AutoFormElement>
- <Property name="name">crkid</Property>
- <Property name="property">crkid</Property>
+ <Property name="name">ygbh</Property>
+ <Property name="property">ygbh</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -303,8 +295,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">ssqymc</Property>
- <Property name="property">ssqymc</Property>
+ <Property name="name">jlqymc</Property>
+ <Property name="property">jlqymc</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -318,115 +310,68 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">ywrq</Property>
- <Property name="property">ywrq</Property>
+ <Property name="name">ygmc</Property>
+ <Property name="property">ygmc</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">crklx</Property>
- <Property name="property">crklx</Property>
- <Property name="trigger">listDropInOut</Property>
+ <Property name="name">yglx</Property>
+ <Property name="property">yglx</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">ywlx</Property>
- <Property name="property">ywlx</Property>
- <Property name="trigger">listDropType</Property>
+ <Property name="name">ykdj</Property>
+ <Property name="property">ykdj</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">crkpz</Property>
- <Property name="property">crkpz</Property>
+ <Property name="name">ygor</Property>
+ <Property name="property">ygor</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">jljgqybh</Property>
- <Property name="property">jljgqybh</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText">-----鐢ㄤ簬鍏ュ簱-----</Property>
- </TextEditor>
- </Editor>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">jljgqymc</Property>
- <Property name="property">jljgqymc</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText">-----鐢ㄤ簬鍏ュ簱-----</Property>
- </TextEditor>
- </Editor>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">khbh</Property>
- <Property name="property">khbh</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText">-----鐢ㄤ簬鍑哄簱-----</Property>
- </TextEditor>
- </Editor>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">glzxm</Property>
- <Property name="property">glzxm</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText">-----鐢ㄤ簬鍑哄簱-----</Property>
- </TextEditor>
- </Editor>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">shdw</Property>
- <Property name="property">shdw</Property>
+ <Property name="name">ygzrd1</Property>
+ <Property name="property">ygzrd1</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">shlxr</Property>
- <Property name="property">shlxr</Property>
+ <Property name="name">lxdh</Property>
+ <Property name="property">lxdh</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">shlxrdh</Property>
- <Property name="property">shlxrdh</Property>
+ <Property name="name">cfjd</Property>
+ <Property name="property">cfjd</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">rjfaid</Property>
- <Property name="property">rjfaid</Property>
+ <Property name="name">cfwd</Property>
+ <Property name="property">cfwd</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">jhid</Property>
- <Property name="property">jhid</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText">-----鐢ㄤ簬鍏ュ簱-----</Property>
- </TextEditor>
- </Editor>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">htid</Property>
- <Property name="property">htid</Property>
+ <Property name="name">qyrq</Property>
+ <Property name="property">qyrq</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">psrwid</Property>
- <Property name="property">psrwid</Property>
+ <Property name="name">ygzt</Property>
+ <Property name="property">ygzt</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">yscch</Property>
- <Property name="property">yscch</Property>
+ <Property name="name">ygsyzt</Property>
+ <Property name="property">ygsyzt</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">cyr</Property>
- <Property name="property">cyr</Property>
+ <Property name="name">sfyx</Property>
+ <Property name="property">sfyx</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">cyrdh</Property>
- <Property name="property">cyrdh</Property>
+ <Property name="name">bz</Property>
+ <Property name="property">bz</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -449,17 +394,12 @@
<Property name="property">kqdm</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement>
- <Property name="name">bz</Property>
- <Property name="property">bz</Property>
- <Editor/>
- </AutoFormElement>
</AutoForm>
</Children>
<Tools/>
</Dialog>
<UpdateAction id="updateSave">
- <Property name="dataResolver">whjlApi1214PR#saveData</Property>
+ <Property name="dataResolver">whjlApi1106PR#saveData</Property>
<UpdateItem>
<Property name="dataPath">[#current]</Property>
<Property name="dataSet">dsMain</Property>
@@ -467,11 +407,58 @@
</UpdateAction>
<AjaxAction id="ajaxDel">
<Property name="confirmMessage">褰撳墠鏁版嵁鍒犻櫎鍚庢棤娉曟仮澶嶏紝璇风‘璁よ鍒犻櫎涔堬紵</Property>
- <Property name="service">whjlApi1214PR#delData</Property>
+ <Property name="service">whjlApi1106PR#delData</Property>
</AjaxAction>
<AjaxAction id="ajaxPush">
- <Property name="service">whjlApi1214PR#pushData</Property>
+ <Property name="service">whjlApi1106PR#pushData</Property>
</AjaxAction>
+ <CustomDropDown id="cddGbArea">
+ <Property name="assignmentMap">qyxzqhdm=code,qyxzqhmc=name</Property>
+ <Property name="height">500</Property>
+ <Property name="minHeight">500</Property>
+ <Property name="maxHeight">500</Property>
+ <Property name="width">400</Property>
+ <Container layout="regionPadding:5">
+ <DataSet id="dsGBArea">
+ <Property name="dataProvider">gbAreaPR#findByCode</Property>
+ <Property name="dataType">[dtGBArea]</Property>
+ </DataSet>
+ <Container layout="hbox regionPadding:5">
+ <TextEditor id="key2">
+ <Property name="blankText"> -- 缂栫爜鎴栬�呭悕绉� --</Property>
+ <Property name="width">200</Property>
+ </TextEditor>
+ <Button>
+ <ClientEvent name="onClick">var key = view.get("#key2.value");
+view.get("#dsGBArea").set("parameter",{key:key}).flushAsync();</ClientEvent>
+ <Property name="iconClass">fa fa-search</Property>
+ <Property name="caption">鏌ヨ</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">var data = view.get("#dsGBArea.data:#");
+if (data) {
+ view.get("#cddGbArea").close(data.toJSON());
+}</ClientEvent>
+ <Property name="caption">纭畾</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ </Button>
+ </Container>
+ <DataGrid>
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsGBArea.data:#");
+if(data){
+ view.get("#cddGbArea").close(data.toJSON());
+}</ClientEvent>
+ <Property name="dataSet">dsGBArea</Property>
+ <Property name="readOnly">true</Property>
+ <DataColumn name="code">
+ <Property name="property">code</Property>
+ </DataColumn>
+ <DataColumn name="name">
+ <Property name="property">name</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ </CustomDropDown>
<Dialog id="dialogLog">
<Property name="width">90%</Property>
<Property name="height">90%</Property>
@@ -500,12 +487,6 @@
</Dialog>
<ListDropDown id="listDropYN">
<Property name="items">鏄�,鍚�</Property>
- </ListDropDown>
- <ListDropDown id="listDropType">
- <Property name="items">鏃ュ父鍑哄簱,鏃ュ父鍏ュ簱,搴旀�ュ嚭搴�,搴旀�ュ叆搴�</Property>
- </ListDropDown>
- <ListDropDown id="listDropInOut">
- <Property name="items">鍏ュ簱,鍑哄簱</Property>
</ListDropDown>
</View>
</ViewConfig>
--
Gitblit v1.9.3