chitanda 部署微服务应用 [TrainSys，网页端]

trainsys-core/src/main/resources/liquibase/h2_table.xml

@@ -2,7 +2,7 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
 
     <!--输出实体[BXD]数据结构 -->
-    <changeSet author="root" id="tab-bxd-16-1">
+    <changeSet author="root" id="tab-bxd-20-1">
         <createTable tableName="T_BXD">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -25,7 +25,7 @@
     </changeSet>
 
     <!--输出实体[BXDMX]数据结构 -->
-    <changeSet author="root" id="tab-bxdmx-18-2">
+    <changeSet author="root" id="tab-bxdmx-22-2">
         <createTable tableName="T_BXDMX">
                 <column name="BXDMXID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_BXDMX"/>
@@ -187,7 +187,7 @@
 
 
     <!--输出实体[BXDMX]外键关系 -->
-    <changeSet author="root" id="fk-bxdmx-18-8">
+    <changeSet author="root" id="fk-bxdmx-22-8">
        <addForeignKeyConstraint baseColumnNames="BXDID" baseTableName="T_BXDMX" constraintName="F821DB7B87E31B879F" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="BXDID" referencedTableName="T_BXD" validate="true"/>
     </changeSet>
 

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/BXDMX.json

@@ -1778,6 +1778,12 @@
     "name" : "报销单明细实体数据多项选择视图",
     "realModelSubType" : "DEMPICKUPVIEW",
     "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "GridView9",
+    "logicName" : "报销单明细实体表格视图（部件视图）",
+    "name" : "报销单明细实体表格视图（部件视图）",
+    "realModelSubType" : "DEGRIDVIEW9",
+    "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "EditView2",
     "logicName" : "报销单明细实体编辑视图（左右关系）",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD/PSGRIDS/Main.json

@@ -9,14 +9,14 @@
     "id" : "fetch"
   },
   "groupMode" : "NONE",
-  "hookEventNames" : [ "ROWDBLCLICK", "SELECTIONCHANGE", "REMOVE", "LOAD", "BEFORELOAD" ],
+  "hookEventNames" : [ "ROWDBLCLICK", "SELECTIONCHANGE", "LOAD", "BEFORELOAD" ],
   "logicName" : "主表格",
   "getPSAppDataEntity" : {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
   },
   "getPSControlLogics" : [ {
-    "eventNames" : "ROWDBLCLICK;SELECTIONCHANGE;REMOVE;LOAD;BEFORELOAD",
+    "eventNames" : "ROWDBLCLICK;SELECTIONCHANGE;LOAD;BEFORELOAD",
     "logicTag" : "grid",
     "logicType" : "APPVIEWENGINE",
     "name" : "engine_grid",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX/PSFORMS/Main.json

@@ -79,47 +79,34 @@
     "hidden" : true,
     "dataType" : 25
   }, {
-    "id" : "bxdmxname",
+    "id" : "bxdid",
+    "hidden" : true,
     "dataType" : 25,
     "getPSAppDEField" : {
-      "name" : "BXDMXNAME",
-      "codeName" : "BXDMXName"
+      "name" : "BXDID",
+      "codeName" : "BXDId"
     }
   }, {
-    "id" : "createman",
+    "id" : "bxdmxid",
+    "hidden" : true,
     "dataType" : 25,
     "getPSAppDEField" : {
-      "name" : "CREATEMAN",
-      "codeName" : "CreateMan"
-    }
-  }, {
-    "id" : "createdate",
-    "dataType" : 5,
-    "getPSAppDEField" : {
-      "name" : "CREATEDATE",
-      "codeName" : "CreateDate"
+      "name" : "BXDMXID",
+      "codeName" : "BXDMXId"
     }
   }, {
-    "id" : "updateman",
+    "id" : "bxdname",
     "dataType" : 25,
     "getPSAppDEField" : {
-      "name" : "UPDATEMAN",
-      "codeName" : "UpdateMan"
+      "name" : "BXDNAME",
+      "codeName" : "BXDName"
     }
   }, {
-    "id" : "updatedate",
-    "dataType" : 5,
-    "getPSAppDEField" : {
-      "name" : "UPDATEDATE",
-      "codeName" : "UpdateDate"
-    }
-  }, {
-    "id" : "bxdmxid",
-    "hidden" : true,
+    "id" : "bxdmxname",
     "dataType" : 25,
     "getPSAppDEField" : {
-      "name" : "BXDMXID",
-      "codeName" : "BXDMXId"
+      "name" : "BXDMXNAME",
+      "codeName" : "BXDMXName"
     }
   } ],
   "getPSDEFormPages" : [ {
@@ -136,8 +123,8 @@
       "detailType" : "GROUPPANEL",
       "name" : "group1",
       "getPSDEFormDetails" : [ {
-        "caption" : "报销单明细名称",
-        "codeName" : "bxdmxname",
+        "caption" : "报销单标识",
+        "codeName" : "bxdid",
         "dataType" : 25,
         "detailStyle" : "DEFAULT",
         "detailType" : "FORMITEM",
@@ -145,171 +132,133 @@
         "ignoreInput" : 0,
         "labelPos" : "LEFT",
         "labelWidth" : 130,
-        "name" : "bxdmxname",
+        "name" : "bxdid",
         "noPrivDisplayMode" : 1,
         "getPSAppDEField" : {
-          "name" : "BXDMXNAME",
-          "codeName" : "BXDMXName"
+          "name" : "BXDID",
+          "codeName" : "BXDId"
         },
         "getPSEditor" : {
-          "editorType" : "TEXTBOX",
-          "maxLength" : 200,
-          "name" : "bxdmxname"
+          "editorType" : "HIDDEN",
+          "name" : "bxdid"
         },
         "getPSLayoutPos" : {
           "colMD" : 24,
           "layout" : "TABLE_24COL"
         },
         "allowEmpty" : true,
-        "showCaption" : true
-      } ],
-      "getPSLayout" : {
-        "columnCount" : 24,
-        "layout" : "TABLE_24COL"
-      },
-      "getPSLayoutPos" : {
-        "colMD" : 24,
-        "layout" : "TABLE_24COL"
-      },
-      "infoGroupMode" : false,
-      "showCaption" : true
-    } ],
-    "getPSLayout" : {
-      "columnCount" : 24,
-      "layout" : "TABLE_24COL"
-    },
-    "infoGroupMode" : false
-  }, {
-    "caption" : "其它",
-    "codeName" : "formpage2",
-    "detailStyle" : "DEFAULT",
-    "detailType" : "FORMPAGE",
-    "name" : "formpage2",
-    "getPSDEFormDetails" : [ {
-      "actionGroupExtractMode" : "ITEM",
-      "caption" : "操作信息",
-      "codeName" : "group2",
-      "detailStyle" : "DEFAULT",
-      "detailType" : "GROUPPANEL",
-      "name" : "group2",
-      "getPSDEFormDetails" : [ {
-        "caption" : "建立人",
-        "codeName" : "createman",
-        "dataType" : 25,
-        "detailStyle" : "DEFAULT",
-        "detailType" : "FORMITEM",
-        "enableCond" : 3,
-        "ignoreInput" : 3,
-        "labelPos" : "LEFT",
-        "labelWidth" : 130,
-        "name" : "createman",
-        "noPrivDisplayMode" : 1,
-        "getPSAppDEField" : {
-          "name" : "CREATEMAN",
-          "codeName" : "CreateMan"
-        },
-        "getPSEditor" : {
-          "editorType" : "SPAN",
-          "name" : "createman",
-          "getPSAppCodeList" : {
-            "modelref" : true,
-            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
-          },
-          "enableLinkView" : false
-        },
-        "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
-        },
-        "allowEmpty" : true,
-        "convertToCodeItemText" : true,
+        "hidden" : true,
         "showCaption" : true
       }, {
-        "caption" : "建立时间",
-        "codeName" : "createdate",
-        "dataType" : 5,
+        "caption" : "报销单明细标识",
+        "codeName" : "bxdmxid",
+        "dataType" : 25,
         "detailStyle" : "DEFAULT",
         "detailType" : "FORMITEM",
         "enableCond" : 3,
-        "ignoreInput" : 3,
+        "ignoreInput" : 0,
         "labelPos" : "LEFT",
         "labelWidth" : 130,
-        "name" : "createdate",
+        "name" : "bxdmxid",
         "noPrivDisplayMode" : 1,
         "getPSAppDEField" : {
-          "name" : "CREATEDATE",
-          "codeName" : "CreateDate"
+          "name" : "BXDMXID",
+          "codeName" : "BXDMXId"
         },
         "getPSEditor" : {
-          "editorType" : "SPAN",
-          "name" : "createdate",
-          "enableLinkView" : false
+          "editorType" : "HIDDEN",
+          "name" : "bxdmxid"
         },
         "getPSLayoutPos" : {
           "colMD" : 24,
           "layout" : "TABLE_24COL"
         },
-        "valueFormat" : "YYYY-MM-DD HH:mm:ss",
         "allowEmpty" : true,
+        "hidden" : true,
         "showCaption" : true
       }, {
-        "caption" : "更新人",
-        "codeName" : "updateman",
+        "caption" : "报销单名称",
+        "codeName" : "bxdname",
         "dataType" : 25,
         "detailStyle" : "DEFAULT",
         "detailType" : "FORMITEM",
         "enableCond" : 3,
-        "ignoreInput" : 3,
+        "ignoreInput" : 0,
         "labelPos" : "LEFT",
         "labelWidth" : 130,
-        "name" : "updateman",
+        "name" : "bxdname",
         "noPrivDisplayMode" : 1,
         "getPSAppDEField" : {
-          "name" : "UPDATEMAN",
-          "codeName" : "UpdateMan"
+          "name" : "BXDNAME",
+          "codeName" : "BXDName"
         },
         "getPSEditor" : {
-          "editorType" : "SPAN",
-          "name" : "updateman",
-          "getPSAppCodeList" : {
+          "editorParams" : {
+            "AC" : "TRUE",
+            "PICKUPVIEW" : "TRUE"
+          },
+          "editorType" : "PICKER",
+          "handlerType" : "PickupText",
+          "itemParamJO" : {
+            "temprs" : true
+          },
+          "name" : "bxdname",
+          "getPSAppDEACMode" : {
+            "modelref" : true,
+            "id" : "Default"
+          },
+          "getPSAppDEDataSet" : {
+            "modelref" : true,
+            "id" : "FetchDefault"
+          },
+          "getPSAppDataEntity" : {
             "modelref" : true,
-            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
           },
-          "enableLinkView" : false
+          "getPickupPSAppView" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXDPickupView.json",
+            "viewType" : "DEPICKUPVIEW"
+          },
+          "valueItemName" : "bxdid",
+          "enableAC" : true,
+          "enablePickupView" : true,
+          "forceSelection" : true,
+          "showTrigger" : true,
+          "singleSelect" : true
         },
         "getPSLayoutPos" : {
           "colMD" : 24,
           "layout" : "TABLE_24COL"
         },
+        "valueItemName" : "bxdid",
         "allowEmpty" : true,
-        "convertToCodeItemText" : true,
         "showCaption" : true
       }, {
-        "caption" : "更新时间",
-        "codeName" : "updatedate",
-        "dataType" : 5,
+        "caption" : "报销单明细名称",
+        "codeName" : "bxdmxname",
+        "dataType" : 25,
         "detailStyle" : "DEFAULT",
         "detailType" : "FORMITEM",
         "enableCond" : 3,
-        "ignoreInput" : 3,
+        "ignoreInput" : 0,
         "labelPos" : "LEFT",
         "labelWidth" : 130,
-        "name" : "updatedate",
+        "name" : "bxdmxname",
         "noPrivDisplayMode" : 1,
         "getPSAppDEField" : {
-          "name" : "UPDATEDATE",
-          "codeName" : "UpdateDate"
+          "name" : "BXDMXNAME",
+          "codeName" : "BXDMXName"
         },
         "getPSEditor" : {
-          "editorType" : "SPAN",
-          "name" : "updatedate",
-          "enableLinkView" : false
+          "editorType" : "TEXTBOX",
+          "maxLength" : 200,
+          "name" : "bxdmxname"
         },
         "getPSLayoutPos" : {
           "colMD" : 24,
           "layout" : "TABLE_24COL"
         },
-        "valueFormat" : "YYYY-MM-DD HH:mm:ss",
         "allowEmpty" : true,
         "showCaption" : true
       } ],
@@ -322,7 +271,7 @@
         "layout" : "TABLE_24COL"
       },
       "infoGroupMode" : false,
-      "showCaption" : true
+      "showCaption" : false
     } ],
     "getPSLayout" : {
       "columnCount" : 24,
@@ -343,7 +292,7 @@
     "modelref" : true,
     "id" : "update"
   },
-  "noTabHeader" : false,
+  "noTabHeader" : true,
   "modelid" : "998f310b6b5e8def1b8a02172d417a1e",
   "modeltype" : "PSDEFORM_EDITFORM"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX/PSGRIDS/Main.json

@@ -28,39 +28,35 @@
   "getPSDEGridColumns" : [ {
     "align" : "LEFT",
     "cLConvertMode" : "NONE",
-    "caption" : "报销单明细名称",
-    "codeName" : "bxdmxname",
+    "caption" : "报销单标识",
+    "codeName" : "bxdid",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "bxdmxname",
-    "excelCaption" : "报销单明细名称",
-    "name" : "bxdmxname",
+    "dataItemName" : "bxdid",
+    "excelCaption" : "报销单标识",
+    "name" : "bxdid",
     "noPrivDisplayMode" : 1,
     "getPSAppDEField" : {
-      "name" : "BXDMXNAME",
-      "codeName" : "BXDMXName"
+      "name" : "BXDID",
+      "codeName" : "BXDId"
     },
-    "width" : 150,
+    "width" : 100,
     "widthUnit" : "PX",
     "enableSort" : true
   }, {
     "align" : "LEFT",
-    "cLConvertMode" : "FRONT",
-    "caption" : "更新人",
-    "codeName" : "updateman",
+    "cLConvertMode" : "NONE",
+    "caption" : "报销单明细标识",
+    "codeName" : "bxdmxid",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "updateman",
-    "excelCaption" : "更新人",
-    "name" : "updateman",
+    "dataItemName" : "bxdmxid",
+    "excelCaption" : "报销单明细标识",
+    "name" : "bxdmxid",
     "noPrivDisplayMode" : 1,
-    "getPSAppCodeList" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
-    },
     "getPSAppDEField" : {
-      "name" : "UPDATEMAN",
-      "codeName" : "UpdateMan"
+      "name" : "BXDMXID",
+      "codeName" : "BXDMXId"
     },
-    "width" : 150,
+    "width" : 100,
     "widthUnit" : "PX",
     "enableSort" : true
   }, {
@@ -78,23 +74,44 @@
       "codeName" : "UpdateDate"
     },
     "valueFormat" : "YYYY-MM-DD HH:mm:ss",
-    "width" : 150,
+    "width" : 100,
+    "widthUnit" : "PX",
+    "enableSort" : true
+  }, {
+    "align" : "LEFT",
+    "cLConvertMode" : "FRONT",
+    "caption" : "更新人",
+    "codeName" : "updateman",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "updateman",
+    "excelCaption" : "更新人",
+    "name" : "updateman",
+    "noPrivDisplayMode" : 1,
+    "getPSAppCodeList" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+    },
+    "getPSAppDEField" : {
+      "name" : "UPDATEMAN",
+      "codeName" : "UpdateMan"
+    },
+    "width" : 100,
     "widthUnit" : "PX",
     "enableSort" : true
   } ],
   "getPSDEGridDataItems" : [ {
     "dataType" : 25,
-    "name" : "bxdmxname",
+    "name" : "bxdid",
     "getPSAppDEField" : {
-      "name" : "BXDMXNAME",
-      "codeName" : "BXDMXName"
+      "name" : "BXDID",
+      "codeName" : "BXDId"
     }
   }, {
     "dataType" : 25,
-    "name" : "updateman",
+    "name" : "bxdmxid",
     "getPSAppDEField" : {
-      "name" : "UPDATEMAN",
-      "codeName" : "UpdateMan"
+      "name" : "BXDMXID",
+      "codeName" : "BXDMXId"
     }
   }, {
     "format" : "YYYY-MM-DD HH:mm:ss",
@@ -104,6 +121,13 @@
       "name" : "UPDATEDATE",
       "codeName" : "UpdateDate"
     }
+  }, {
+    "dataType" : 25,
+    "name" : "updateman",
+    "getPSAppDEField" : {
+      "name" : "UPDATEMAN",
+      "codeName" : "UpdateMan"
+    }
   }, {
     "dataType" : 25,
     "name" : "srfkey",
@@ -119,13 +143,6 @@
       "codeName" : "BXDMXId"
     },
     "dataAccessAction" : true
-  }, {
-    "dataType" : 25,
-    "name" : "bxdid",
-    "getPSAppDEField" : {
-      "name" : "BXDID",
-      "codeName" : "BXDId"
-    }
   }, {
     "dataType" : 25,
     "name" : "srfmajortext",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/BXDMXEditView.json

@@ -1065,47 +1065,34 @@
       "hidden" : true,
       "dataType" : 25
     }, {
-      "id" : "bxdmxname",
+      "id" : "bxdid",
+      "hidden" : true,
       "dataType" : 25,
       "getPSAppDEField" : {
-        "name" : "BXDMXNAME",
-        "codeName" : "BXDMXName"
+        "name" : "BXDID",
+        "codeName" : "BXDId"
       }
     }, {
-      "id" : "createman",
+      "id" : "bxdmxid",
+      "hidden" : true,
       "dataType" : 25,
       "getPSAppDEField" : {
-        "name" : "CREATEMAN",
-        "codeName" : "CreateMan"
-      }
-    }, {
-      "id" : "createdate",
-      "dataType" : 5,
-      "getPSAppDEField" : {
-        "name" : "CREATEDATE",
-        "codeName" : "CreateDate"
+        "name" : "BXDMXID",
+        "codeName" : "BXDMXId"
       }
     }, {
-      "id" : "updateman",
+      "id" : "bxdname",
       "dataType" : 25,
       "getPSAppDEField" : {
-        "name" : "UPDATEMAN",
-        "codeName" : "UpdateMan"
+        "name" : "BXDNAME",
+        "codeName" : "BXDName"
       }
     }, {
-      "id" : "updatedate",
-      "dataType" : 5,
-      "getPSAppDEField" : {
-        "name" : "UPDATEDATE",
-        "codeName" : "UpdateDate"
-      }
-    }, {
-      "id" : "bxdmxid",
-      "hidden" : true,
+      "id" : "bxdmxname",
       "dataType" : 25,
       "getPSAppDEField" : {
-        "name" : "BXDMXID",
-        "codeName" : "BXDMXId"
+        "name" : "BXDMXNAME",
+        "codeName" : "BXDMXName"
       }
     } ],
     "getPSDEFormPages" : [ {
@@ -1122,8 +1109,8 @@
         "detailType" : "GROUPPANEL",
         "name" : "group1",
         "getPSDEFormDetails" : [ {
-          "caption" : "报销单明细名称",
-          "codeName" : "bxdmxname",
+          "caption" : "报销单标识",
+          "codeName" : "bxdid",
           "dataType" : 25,
           "detailStyle" : "DEFAULT",
           "detailType" : "FORMITEM",
@@ -1131,171 +1118,133 @@
           "ignoreInput" : 0,
           "labelPos" : "LEFT",
           "labelWidth" : 130,
-          "name" : "bxdmxname",
+          "name" : "bxdid",
           "noPrivDisplayMode" : 1,
           "getPSAppDEField" : {
-            "name" : "BXDMXNAME",
-            "codeName" : "BXDMXName"
+            "name" : "BXDID",
+            "codeName" : "BXDId"
           },
           "getPSEditor" : {
-            "editorType" : "TEXTBOX",
-            "maxLength" : 200,
-            "name" : "bxdmxname"
+            "editorType" : "HIDDEN",
+            "name" : "bxdid"
           },
           "getPSLayoutPos" : {
             "colMD" : 24,
             "layout" : "TABLE_24COL"
           },
           "allowEmpty" : true,
-          "showCaption" : true
-        } ],
-        "getPSLayout" : {
-          "columnCount" : 24,
-          "layout" : "TABLE_24COL"
-        },
-        "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
-        },
-        "infoGroupMode" : false,
-        "showCaption" : true
-      } ],
-      "getPSLayout" : {
-        "columnCount" : 24,
-        "layout" : "TABLE_24COL"
-      },
-      "infoGroupMode" : false
-    }, {
-      "caption" : "其它",
-      "codeName" : "formpage2",
-      "detailStyle" : "DEFAULT",
-      "detailType" : "FORMPAGE",
-      "name" : "formpage2",
-      "getPSDEFormDetails" : [ {
-        "actionGroupExtractMode" : "ITEM",
-        "caption" : "操作信息",
-        "codeName" : "group2",
-        "detailStyle" : "DEFAULT",
-        "detailType" : "GROUPPANEL",
-        "name" : "group2",
-        "getPSDEFormDetails" : [ {
-          "caption" : "建立人",
-          "codeName" : "createman",
-          "dataType" : 25,
-          "detailStyle" : "DEFAULT",
-          "detailType" : "FORMITEM",
-          "enableCond" : 3,
-          "ignoreInput" : 3,
-          "labelPos" : "LEFT",
-          "labelWidth" : 130,
-          "name" : "createman",
-          "noPrivDisplayMode" : 1,
-          "getPSAppDEField" : {
-            "name" : "CREATEMAN",
-            "codeName" : "CreateMan"
-          },
-          "getPSEditor" : {
-            "editorType" : "SPAN",
-            "name" : "createman",
-            "getPSAppCodeList" : {
-              "modelref" : true,
-              "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
-            },
-            "enableLinkView" : false
-          },
-          "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
-          },
-          "allowEmpty" : true,
-          "convertToCodeItemText" : true,
+          "hidden" : true,
           "showCaption" : true
         }, {
-          "caption" : "建立时间",
-          "codeName" : "createdate",
-          "dataType" : 5,
+          "caption" : "报销单明细标识",
+          "codeName" : "bxdmxid",
+          "dataType" : 25,
           "detailStyle" : "DEFAULT",
           "detailType" : "FORMITEM",
           "enableCond" : 3,
-          "ignoreInput" : 3,
+          "ignoreInput" : 0,
           "labelPos" : "LEFT",
           "labelWidth" : 130,
-          "name" : "createdate",
+          "name" : "bxdmxid",
           "noPrivDisplayMode" : 1,
           "getPSAppDEField" : {
-            "name" : "CREATEDATE",
-            "codeName" : "CreateDate"
+            "name" : "BXDMXID",
+            "codeName" : "BXDMXId"
           },
           "getPSEditor" : {
-            "editorType" : "SPAN",
-            "name" : "createdate",
-            "enableLinkView" : false
+            "editorType" : "HIDDEN",
+            "name" : "bxdmxid"
           },
           "getPSLayoutPos" : {
             "colMD" : 24,
             "layout" : "TABLE_24COL"
           },
-          "valueFormat" : "YYYY-MM-DD HH:mm:ss",
           "allowEmpty" : true,
+          "hidden" : true,
           "showCaption" : true
         }, {
-          "caption" : "更新人",
-          "codeName" : "updateman",
+          "caption" : "报销单名称",
+          "codeName" : "bxdname",
           "dataType" : 25,
           "detailStyle" : "DEFAULT",
           "detailType" : "FORMITEM",
           "enableCond" : 3,
-          "ignoreInput" : 3,
+          "ignoreInput" : 0,
           "labelPos" : "LEFT",
           "labelWidth" : 130,
-          "name" : "updateman",
+          "name" : "bxdname",
           "noPrivDisplayMode" : 1,
           "getPSAppDEField" : {
-            "name" : "UPDATEMAN",
-            "codeName" : "UpdateMan"
+            "name" : "BXDNAME",
+            "codeName" : "BXDName"
           },
           "getPSEditor" : {
-            "editorType" : "SPAN",
-            "name" : "updateman",
-            "getPSAppCodeList" : {
+            "editorParams" : {
+              "AC" : "TRUE",
+              "PICKUPVIEW" : "TRUE"
+            },
+            "editorType" : "PICKER",
+            "handlerType" : "PickupText",
+            "itemParamJO" : {
+              "temprs" : true
+            },
+            "name" : "bxdname",
+            "getPSAppDEACMode" : {
+              "modelref" : true,
+              "id" : "Default"
+            },
+            "getPSAppDEDataSet" : {
+              "modelref" : true,
+              "id" : "FetchDefault"
+            },
+            "getPSAppDataEntity" : {
               "modelref" : true,
-              "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
             },
-            "enableLinkView" : false
+            "getPickupPSAppView" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXDPickupView.json",
+              "viewType" : "DEPICKUPVIEW"
+            },
+            "valueItemName" : "bxdid",
+            "enableAC" : true,
+            "enablePickupView" : true,
+            "forceSelection" : true,
+            "showTrigger" : true,
+            "singleSelect" : true
           },
           "getPSLayoutPos" : {
             "colMD" : 24,
             "layout" : "TABLE_24COL"
           },
+          "valueItemName" : "bxdid",
           "allowEmpty" : true,
-          "convertToCodeItemText" : true,
           "showCaption" : true
         }, {
-          "caption" : "更新时间",
-          "codeName" : "updatedate",
-          "dataType" : 5,
+          "caption" : "报销单明细名称",
+          "codeName" : "bxdmxname",
+          "dataType" : 25,
           "detailStyle" : "DEFAULT",
           "detailType" : "FORMITEM",
           "enableCond" : 3,
-          "ignoreInput" : 3,
+          "ignoreInput" : 0,
           "labelPos" : "LEFT",
           "labelWidth" : 130,
-          "name" : "updatedate",
+          "name" : "bxdmxname",
           "noPrivDisplayMode" : 1,
           "getPSAppDEField" : {
-            "name" : "UPDATEDATE",
-            "codeName" : "UpdateDate"
+            "name" : "BXDMXNAME",
+            "codeName" : "BXDMXName"
           },
           "getPSEditor" : {
-            "editorType" : "SPAN",
-            "name" : "updatedate",
-            "enableLinkView" : false
+            "editorType" : "TEXTBOX",
+            "maxLength" : 200,
+            "name" : "bxdmxname"
           },
           "getPSLayoutPos" : {
             "colMD" : 24,
             "layout" : "TABLE_24COL"
           },
-          "valueFormat" : "YYYY-MM-DD HH:mm:ss",
           "allowEmpty" : true,
           "showCaption" : true
         } ],
@@ -1308,7 +1257,7 @@
           "layout" : "TABLE_24COL"
         },
         "infoGroupMode" : false,
-        "showCaption" : true
+        "showCaption" : false
       } ],
       "getPSLayout" : {
         "columnCount" : 24,
@@ -1329,7 +1278,7 @@
       "modelref" : true,
       "id" : "update"
     },
-    "noTabHeader" : false,
+    "noTabHeader" : true,
     "name" : "form",
     "modelid" : "998f310b6b5e8def1b8a02172d417a1e",
     "modeltype" : "PSDEFORM_EDITFORM"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/BXDMXGridView.json

@@ -458,39 +458,35 @@
     "getPSDEGridColumns" : [ {
       "align" : "LEFT",
       "cLConvertMode" : "NONE",
-      "caption" : "报销单明细名称",
-      "codeName" : "bxdmxname",
+      "caption" : "报销单标识",
+      "codeName" : "bxdid",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "bxdmxname",
-      "excelCaption" : "报销单明细名称",
-      "name" : "bxdmxname",
+      "dataItemName" : "bxdid",
+      "excelCaption" : "报销单标识",
+      "name" : "bxdid",
       "noPrivDisplayMode" : 1,
       "getPSAppDEField" : {
-        "name" : "BXDMXNAME",
-        "codeName" : "BXDMXName"
+        "name" : "BXDID",
+        "codeName" : "BXDId"
       },
-      "width" : 150,
+      "width" : 100,
       "widthUnit" : "PX",
       "enableSort" : true
     }, {
       "align" : "LEFT",
-      "cLConvertMode" : "FRONT",
-      "caption" : "更新人",
-      "codeName" : "updateman",
+      "cLConvertMode" : "NONE",
+      "caption" : "报销单明细标识",
+      "codeName" : "bxdmxid",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "updateman",
-      "excelCaption" : "更新人",
-      "name" : "updateman",
+      "dataItemName" : "bxdmxid",
+      "excelCaption" : "报销单明细标识",
+      "name" : "bxdmxid",
       "noPrivDisplayMode" : 1,
-      "getPSAppCodeList" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
-      },
       "getPSAppDEField" : {
-        "name" : "UPDATEMAN",
-        "codeName" : "UpdateMan"
+        "name" : "BXDMXID",
+        "codeName" : "BXDMXId"
       },
-      "width" : 150,
+      "width" : 100,
       "widthUnit" : "PX",
       "enableSort" : true
     }, {
@@ -508,23 +504,44 @@
         "codeName" : "UpdateDate"
       },
       "valueFormat" : "YYYY-MM-DD HH:mm:ss",
-      "width" : 150,
+      "width" : 100,
+      "widthUnit" : "PX",
+      "enableSort" : true
+    }, {
+      "align" : "LEFT",
+      "cLConvertMode" : "FRONT",
+      "caption" : "更新人",
+      "codeName" : "updateman",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "updateman",
+      "excelCaption" : "更新人",
+      "name" : "updateman",
+      "noPrivDisplayMode" : 1,
+      "getPSAppCodeList" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+      },
+      "getPSAppDEField" : {
+        "name" : "UPDATEMAN",
+        "codeName" : "UpdateMan"
+      },
+      "width" : 100,
       "widthUnit" : "PX",
       "enableSort" : true
     } ],
     "getPSDEGridDataItems" : [ {
       "dataType" : 25,
-      "name" : "bxdmxname",
+      "name" : "bxdid",
       "getPSAppDEField" : {
-        "name" : "BXDMXNAME",
-        "codeName" : "BXDMXName"
+        "name" : "BXDID",
+        "codeName" : "BXDId"
       }
     }, {
       "dataType" : 25,
-      "name" : "updateman",
+      "name" : "bxdmxid",
       "getPSAppDEField" : {
-        "name" : "UPDATEMAN",
-        "codeName" : "UpdateMan"
+        "name" : "BXDMXID",
+        "codeName" : "BXDMXId"
       }
     }, {
       "format" : "YYYY-MM-DD HH:mm:ss",
@@ -534,6 +551,13 @@
         "name" : "UPDATEDATE",
         "codeName" : "UpdateDate"
       }
+    }, {
+      "dataType" : 25,
+      "name" : "updateman",
+      "getPSAppDEField" : {
+        "name" : "UPDATEMAN",
+        "codeName" : "UpdateMan"
+      }
     }, {
       "dataType" : 25,
       "name" : "srfkey",
@@ -549,13 +573,6 @@
         "codeName" : "BXDMXId"
       },
       "dataAccessAction" : true
-    }, {
-      "dataType" : 25,
-      "name" : "bxdid",
-      "getPSAppDEField" : {
-        "name" : "BXDID",
-        "codeName" : "BXDId"
-      }
     }, {
       "dataType" : 25,
       "name" : "srfmajortext",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json

@@ -739,12 +739,30 @@
     "viewType" : "DEEDITVIEW3",
     "resource" : "Book",
     "view" : "EditView3"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXDMXGridView9.json",
+    "viewType" : "DEGRIDVIEW9",
+    "resource" : "BXDMX",
+    "view" : "GridView9"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXDEditView.json",
     "viewType" : "DEEDITVIEW",
     "resource" : "BXD",
     "view" : "EditView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXDPickupView.json",
+    "viewType" : "DEPICKUPVIEW",
+    "resource" : "BXD",
+    "view" : "PickupView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXDPickupGridView.json",
+    "viewType" : "DEPICKUPGRIDVIEW",
+    "resource" : "BXD",
+    "view" : "PickupGridView"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/RawMaterialEditView.json",
@@ -8045,39 +8063,35 @@
         "getPSDEGridColumns" : [ {
           "align" : "LEFT",
           "cLConvertMode" : "NONE",
-          "caption" : "报销单明细名称",
-          "codeName" : "bxdmxname",
+          "caption" : "报销单标识",
+          "codeName" : "bxdid",
           "columnType" : "DEFGRIDCOLUMN",
-          "dataItemName" : "bxdmxname",
-          "excelCaption" : "报销单明细名称",
-          "name" : "bxdmxname",
+          "dataItemName" : "bxdid",
+          "excelCaption" : "报销单标识",
+          "name" : "bxdid",
           "noPrivDisplayMode" : 1,
           "getPSAppDEField" : {
-            "name" : "BXDMXNAME",
-            "codeName" : "BXDMXName"
+            "name" : "BXDID",
+            "codeName" : "BXDId"
           },
-          "width" : 150,
+          "width" : 100,
           "widthUnit" : "PX",
           "enableSort" : true
         }, {
           "align" : "LEFT",
-          "cLConvertMode" : "FRONT",
-          "caption" : "更新人",
-          "codeName" : "updateman",
+          "cLConvertMode" : "NONE",
+          "caption" : "报销单明细标识",
+          "codeName" : "bxdmxid",
           "columnType" : "DEFGRIDCOLUMN",
-          "dataItemName" : "updateman",
-          "excelCaption" : "更新人",
-          "name" : "updateman",
+          "dataItemName" : "bxdmxid",
+          "excelCaption" : "报销单明细标识",
+          "name" : "bxdmxid",
           "noPrivDisplayMode" : 1,
-          "getPSAppCodeList" : {
-            "modelref" : true,
-            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
-          },
           "getPSAppDEField" : {
-            "name" : "UPDATEMAN",
-            "codeName" : "UpdateMan"
+            "name" : "BXDMXID",
+            "codeName" : "BXDMXId"
           },
-          "width" : 150,
+          "width" : 100,
           "widthUnit" : "PX",
           "enableSort" : true
         }, {
@@ -8095,23 +8109,44 @@
             "codeName" : "UpdateDate"
           },
           "valueFormat" : "YYYY-MM-DD HH:mm:ss",
-          "width" : 150,
+          "width" : 100,
+          "widthUnit" : "PX",
+          "enableSort" : true
+        }, {
+          "align" : "LEFT",
+          "cLConvertMode" : "FRONT",
+          "caption" : "更新人",
+          "codeName" : "updateman",
+          "columnType" : "DEFGRIDCOLUMN",
+          "dataItemName" : "updateman",
+          "excelCaption" : "更新人",
+          "name" : "updateman",
+          "noPrivDisplayMode" : 1,
+          "getPSAppCodeList" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+          },
+          "getPSAppDEField" : {
+            "name" : "UPDATEMAN",
+            "codeName" : "UpdateMan"
+          },
+          "width" : 100,
           "widthUnit" : "PX",
           "enableSort" : true
         } ],
         "getPSDEGridDataItems" : [ {
           "dataType" : 25,
-          "name" : "bxdmxname",
+          "name" : "bxdid",
           "getPSAppDEField" : {
-            "name" : "BXDMXNAME",
-            "codeName" : "BXDMXName"
+            "name" : "BXDID",
+            "codeName" : "BXDId"
           }
         }, {
           "dataType" : 25,
-          "name" : "updateman",
+          "name" : "bxdmxid",
           "getPSAppDEField" : {
-            "name" : "UPDATEMAN",
-            "codeName" : "UpdateMan"
+            "name" : "BXDMXID",
+            "codeName" : "BXDMXId"
           }
         }, {
           "format" : "YYYY-MM-DD HH:mm:ss",
@@ -8121,6 +8156,13 @@
             "name" : "UPDATEDATE",
             "codeName" : "UpdateDate"
           }
+        }, {
+          "dataType" : 25,
+          "name" : "updateman",
+          "getPSAppDEField" : {
+            "name" : "UPDATEMAN",
+            "codeName" : "UpdateMan"
+          }
         }, {
           "dataType" : 25,
           "name" : "srfkey",
@@ -8136,13 +8178,6 @@
             "codeName" : "BXDMXId"
           },
           "dataAccessAction" : true
-        }, {
-          "dataType" : 25,
-          "name" : "bxdid",
-          "getPSAppDEField" : {
-            "name" : "BXDID",
-            "codeName" : "BXDId"
-          }
         }, {
           "dataType" : 25,
           "name" : "srfmajortext",