From 5408346178dd12b7ab78fb51c76f59c300a7e153 Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期四, 31 十月 2024 23:37:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/fzzy/api/view/Api1205.view.xml |   67 +++++++++++++++++++++++++--------
 1 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/fzzy/api/view/Api1205.view.xml b/src/main/java/com/fzzy/api/view/Api1205.view.xml
index 9d67f1c..c88d0a8 100644
--- a/src/main/java/com/fzzy/api/view/Api1205.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1205.view.xml
@@ -26,9 +26,6 @@
         <Property></Property>
         <Property name="label">搴撳尯浠ｇ爜</Property>
       </PropertyDef>
-      <PropertyDef name="id">
-        <Property name="dataType">Integer</Property>
-      </PropertyDef>
       <PropertyDef name="ckywdh">
         <Property></Property>
         <Property name="label">鍑哄簱涓氬姟鍗曞彿</Property>
@@ -36,6 +33,10 @@
       <PropertyDef name="hwdm">
         <Property></Property>
         <Property name="label">璐т綅浠ｇ爜</Property>
+      </PropertyDef>
+      <PropertyDef name="tyhwbm">
+        <Property></Property>
+        <Property name="label">鍥藉缁熶竴璐т綅缂栫爜</Property>
       </PropertyDef>
       <PropertyDef name="cktzdh">
         <Property></Property>
@@ -106,6 +107,11 @@
       <PropertyDef name="lsdjdm">
         <Property></Property>
         <Property name="label">绮绛夌骇浠ｇ爜</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;LSDJ&quot;)}</Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
       </PropertyDef>
       <PropertyDef name="lsxzdm">
         <Property></Property>
@@ -172,6 +178,9 @@
         <Property name="dataType">double</Property>
         <Property name="label">鎵�/澧為噺(鍏枻)</Property>
       </PropertyDef>
+      <PropertyDef name="kzlyy">
+        <Property name="label">鎵ｏ紙澧烇級閲忓師鍥�</Property>
+      </PropertyDef>
       <PropertyDef name="zcbgyxm">
         <Property></Property>
         <Property name="label">鍊间粨淇濈鍛樺鍚�</Property>
@@ -202,7 +211,7 @@
         <Property name="label">鍚屾鏃堕棿</Property>
       </PropertyDef>
       <PropertyDef name="cchlx">
-        <Property/>
+        <Property></Property>
         <Property name="label">杞﹁埞鍙风被鍨�</Property>
       </PropertyDef>
     </DataType>
@@ -370,42 +379,56 @@
       </RowSelectorColumn>
       <DataColumn name="ckywdh">
         <Property name="property">ckywdh</Property>
+        <Property name="align">center</Property>
       </DataColumn>
       <DataColumn name="hwdm">
         <Property name="property">hwdm</Property>
-      </DataColumn>
-      <DataColumn name="cktzdh">
-        <Property name="property">cktzdh</Property>
-      </DataColumn>
-      <DataColumn name="ywlx">
-        <Property name="property">ywlx</Property>
+        <Property name="width">260</Property>
+        <Property name="align">center</Property>
       </DataColumn>
       <DataColumn name="ywrq">
         <Property name="property">ywrq</Property>
+        <Property name="align">center</Property>
       </DataColumn>
       <DataColumn name="cyr">
         <Property name="property">cyr</Property>
+        <Property name="align">center</Property>
+      </DataColumn>
+      <DataColumn>
+        <Property name="property">sfzh</Property>
+        <Property name="name">sfzh</Property>
+        <Property name="align">center</Property>
+        <Property name="width">180</Property>
       </DataColumn>
       <DataColumn name="cch">
         <Property name="property">cch</Property>
+        <Property name="align">center</Property>
       </DataColumn>
       <DataColumn name="shnd">
         <Property name="property">shnd</Property>
+        <Property name="align">center</Property>
       </DataColumn>
-      <DataColumn name="pz">
-        <Property name="property">pz</Property>
+      <DataColumn>
+        <Property name="property">lspzdm</Property>
+        <Property name="align">center</Property>
+        <Property name="name">lspzdm</Property>
       </DataColumn>
-      <DataColumn name="mz">
-        <Property name="property">mz</Property>
+      <DataColumn>
+        <Property name="property">lsdjdm</Property>
+        <Property name="align">center</Property>
+        <Property name="name">lsdjdm</Property>
       </DataColumn>
       <DataColumn name="jz">
         <Property name="property">jz</Property>
-      </DataColumn>
-      <DataColumn name="zhgxsj">
-        <Property name="property">zhgxsj</Property>
+        <Property name="align">center</Property>
       </DataColumn>
       <DataColumn name="czbz">
         <Property name="property">czbz</Property>
+        <Property name="align">center</Property>
+      </DataColumn>
+      <DataColumn name="zhgxsj">
+        <Property name="property">zhgxsj</Property>
+        <Property name="align">center</Property>
       </DataColumn>
     </DataGrid>
     <ToolBar layoutConstraint="bottom">
@@ -456,6 +479,11 @@
           <AutoFormElement>
             <Property name="name">hwdm</Property>
             <Property name="property">hwdm</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">tyhwbm</Property>
+            <Property name="property">tyhwbm</Property>
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
@@ -619,6 +647,11 @@
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
+            <Property name="name">kzlyy</Property>
+            <Property name="property">kzlyy</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
             <Property name="name">zcbgyxm</Property>
             <Property name="property">zcbgyxm</Property>
             <Editor/>

--
Gitblit v1.9.3