From 8ae76246e2eb899335594d2da69ae0aea61f9460 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 27 十月 2023 20:17:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1106.view.xml | 289 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 153 insertions(+), 136 deletions(-)
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1106.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1106.view.xml
index 6d96f15..44a3e15 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1106.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1106.view.xml
@@ -5,9 +5,9 @@
<Model>
<DataType name="dtMain">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1106</Property>
- <PropertyDef name="ajbh">
+ <PropertyDef name="ygbh">
<Property></Property>
- <Property name="label">寤掗棿缂栧彿</Property>
+ <Property name="label">娌圭綈缂栧彿</Property>
</PropertyDef>
<PropertyDef name="jlqybh">
<Property></Property>
@@ -25,79 +25,49 @@
<Property></Property>
<Property name="label">鍐涗緵绔欑偣鍚嶇О</Property>
</PropertyDef>
- <PropertyDef name="sscfbh">
+ <PropertyDef name="ygmc">
<Property></Property>
- <Property name="label">浠撴埧缂栧彿</Property>
+ <Property name="label">娌圭亴鍚嶇О</Property>
</PropertyDef>
- <PropertyDef name="sscfmc">
+ <PropertyDef name="yglx">
<Property></Property>
- <Property name="label">浠撴埧鍚嶇О</Property>
+ <Property name="label">娌圭亴绫诲瀷</Property>
</PropertyDef>
- <PropertyDef name="ajmc">
+ <PropertyDef name="ykdj">
<Property></Property>
- <Property name="label">寤掗棿鍚嶇О</Property>
+ <Property name="label">娌圭亴绛夌骇</Property>
</PropertyDef>
- <PropertyDef name="ajcd">
+ <PropertyDef name="ygor">
<Property name="dataType">Double</Property>
- <Property name="label">寤掗棿闀垮害</Property>
- <Property name="displayFormat">#0.0绫�</Property>
+ <Property name="label">娌圭綈鎬诲</Property>
</PropertyDef>
- <PropertyDef name="ajkd">
+ <PropertyDef name="ygzrd1">
<Property name="dataType">Double</Property>
- <Property name="label">寤掗棿瀹藉害</Property>
- <Property name="displayFormat">#0.0绫�</Property>
+ <Property name="label">娌圭綈缁勫</Property>
</PropertyDef>
- <PropertyDef name="ajgd">
+ <PropertyDef name="lxdh">
<Property></Property>
- <Property name="label">寤掗棿楂樺害</Property>
+ <Property name="label">鑱旂郴鐢佃瘽</Property>
+ </PropertyDef>
+ <PropertyDef name="cfjd">
<Property name="dataType">Double</Property>
- <Property name="displayFormat">#0.0绫�</Property>
+ <Property name="label">浠撴埧缁忓害</Property>
</PropertyDef>
- <PropertyDef name="ajsjcr">
+ <PropertyDef name="cfwd">
<Property name="dataType">Double</Property>
- <Property name="label">寤掗棿璁捐浠撳</Property>
- <Property name="displayFormat">#0.00鍚�</Property>
+ <Property name="label">浠撴埧绾害</Property>
</PropertyDef>
- <PropertyDef name="ajsjcr01">
- <Property name="dataType">Double</Property>
- <Property name="label">寤掗棿瀹為檯浠撳</Property>
- <Property name="displayFormat">#0.00鍚�</Property>
- </PropertyDef>
- <PropertyDef name="ajlxdh">
- <Property></Property>
- <Property name="label">寤掗棿鑱旂郴鐢佃瘽</Property>
- </PropertyDef>
- <PropertyDef name="ajjd">
- <Property name="dataType">Double</Property>
- <Property name="label">寤掗棿缁忓害</Property>
- <Property name="displayFormat">#0.000000搴�</Property>
- </PropertyDef>
- <PropertyDef name="ajwd">
- <Property name="dataType">Double</Property>
- <Property name="label">寤掗棿绾害</Property>
- <Property name="displayFormat">#0.000000搴�</Property>
- </PropertyDef>
- <PropertyDef name="ajqyrq">
+ <PropertyDef name="qyrq">
<Property name="dataType">Date</Property>
- <Property name="label">寤掗棿鍚敤鏃ユ湡</Property>
+ <Property name="label">鍚敤鏃ユ湡</Property>
</PropertyDef>
- <PropertyDef name="ajzt">
+ <PropertyDef name="ygzt">
<Property></Property>
- <Property name="label">寤掗棿鐘舵��</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("CFZT")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
+ <Property name="label">娌圭綈鐘舵��</Property>
</PropertyDef>
- <PropertyDef name="ajsyzt">
+ <PropertyDef name="ygsyzt">
<Property></Property>
- <Property name="label">寤掗棿浣跨敤鐘舵��</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("HWZT")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
+ <Property name="label">娌圭綈浣跨敤鐘舵��</Property>
</PropertyDef>
<PropertyDef name="sfyx">
<Property></Property>
@@ -113,20 +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>
+ </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>
@@ -221,57 +213,53 @@
<RowSelectorColumn>
<Property name="caption">涓婁紶</Property>
</RowSelectorColumn>
- <DataColumn name="ajmc">
- <Property name="property">ajmc</Property>
+ <DataColumn name="ygbh">
+ <Property name="property">ygbh</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="sscfmc">
- <Property name="property">sscfmc</Property>
+ <DataColumn name="ygmc">
+ <Property name="property">ygmc</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="ajcd">
- <Property name="property">ajcd</Property>
+ <DataColumn name="yglx">
+ <Property name="property">yglx</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="ajkd">
- <Property name="property">ajkd</Property>
+ <DataColumn name="lxdh">
+ <Property name="property">lxdh</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="ajgd">
- <Property name="property">ajgd</Property>
+ <DataColumn name="cfjd">
+ <Property name="property">cfjd</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="ajsjcr">
- <Property name="property">ajsjcr</Property>
+ <DataColumn name="cfwd">
+ <Property name="property">cfwd</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="ajsjcr01">
- <Property name="property">ajsjcr01</Property>
+ <DataColumn name="qyrq">
+ <Property name="property">qyrq</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="ajqyrq">
- <Property name="property">ajqyrq</Property>
+ <DataColumn name="ygzt">
+ <Property name="property">ygzt</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="ajzt">
- <Property name="property">ajzt</Property>
+ <DataColumn name="czbz">
+ <Property name="property">czbz</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="ajsyzt">
- <Property name="property">ajsyzt</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="sfyx">
- <Property name="property">sfyx</Property>
+ <DataColumn name="updateTime">
+ <Property name="property">updateTime</Property>
<Property name="align">center</Property>
</DataColumn>
</DataGrid>
</Container>
<Dialog id="dialogMain">
- <Property name="width">60%</Property>
+ <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();
@@ -293,14 +281,12 @@
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*</Property>
- <Property name="labelPosition">left</Property>
+ <Property name="cols">*,*,*,*</Property>
+ <Property name="labelPosition">top</Property>
<Property name="labelSeparator">:</Property>
- <Property name="labelWidth">120</Property>
- <Property name="labelAlign">right</Property>
<AutoFormElement>
- <Property name="name">ajbh</Property>
- <Property name="property">ajbh</Property>
+ <Property name="name">ygbh</Property>
+ <Property name="property">ygbh</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -324,79 +310,68 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">sscfbh</Property>
- <Property name="property">sscfbh</Property>
+ <Property name="name">ygmc</Property>
+ <Property name="property">ygmc</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">sscfmc</Property>
- <Property name="property">sscfmc</Property>
+ <Property name="name">yglx</Property>
+ <Property name="property">yglx</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">ajmc</Property>
- <Property name="property">ajmc</Property>
+ <Property name="name">ykdj</Property>
+ <Property name="property">ykdj</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">ajcd</Property>
- <Property name="property">ajcd</Property>
+ <Property name="name">ygor</Property>
+ <Property name="property">ygor</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">ajkd</Property>
- <Property name="property">ajkd</Property>
+ <Property name="name">ygzrd1</Property>
+ <Property name="property">ygzrd1</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">ajgd</Property>
- <Property name="property">ajgd</Property>
+ <Property name="name">lxdh</Property>
+ <Property name="property">lxdh</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">ajsjcr</Property>
- <Property name="property">ajsjcr</Property>
+ <Property name="name">cfjd</Property>
+ <Property name="property">cfjd</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">ajsjcr01</Property>
- <Property name="property">ajsjcr01</Property>
+ <Property name="name">cfwd</Property>
+ <Property name="property">cfwd</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">ajlxdh</Property>
- <Property name="property">ajlxdh</Property>
+ <Property name="name">qyrq</Property>
+ <Property name="property">qyrq</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">ajjd</Property>
- <Property name="property">ajjd</Property>
+ <Property name="name">ygzt</Property>
+ <Property name="property">ygzt</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">ajwd</Property>
- <Property name="property">ajwd</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ajqyrq</Property>
- <Property name="property">ajqyrq</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ajzt</Property>
- <Property name="property">ajzt</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ajsyzt</Property>
- <Property name="property">ajsyzt</Property>
+ <Property name="name">ygsyzt</Property>
+ <Property name="property">ygsyzt</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
<Property name="name">sfyx</Property>
<Property name="property">sfyx</Property>
- <Property name="trigger">listDropYN</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bz</Property>
+ <Property name="property">bz</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -419,11 +394,6 @@
<Property name="property">kqdm</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement>
- <Property name="name">bz</Property>
- <Property name="property">bz</Property>
- <Editor/>
- </AutoFormElement>
</AutoForm>
</Children>
<Tools/>
@@ -442,6 +412,53 @@
<AjaxAction id="ajaxPush">
<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>
--
Gitblit v1.9.3