chitanda 发布系统代码 [TrainSys，网页端]

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Phone/PSFORMS/LinkTest.json

@@ -83,14 +83,34 @@
       "name" : "CREATEMAN",
       "codeName" : "CreateMan"
     }
+  }, {
+    "id" : "money",
+    "dataType" : 6,
+    "getPSAppDEField" : {
+      "name" : "MONEY",
+      "codeName" : "Money"
+    }
   }, {
     "id" : "phoneid",
-    "hidden" : true,
     "dataType" : 25,
     "getPSAppDEField" : {
       "name" : "PHONEID",
       "codeName" : "PhoneId"
     }
+  }, {
+    "id" : "orgid",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "ORGID",
+      "codeName" : "OrgId"
+    }
+  }, {
+    "id" : "end",
+    "dataType" : 5,
+    "getPSAppDEField" : {
+      "name" : "END",
+      "codeName" : "End"
+    }
   } ],
   "getPSDEFormPages" : [ {
     "codeName" : "formpage1",
@@ -185,6 +205,129 @@
       "rTMOSFilePath" : "psdeformdetail_grouppanels/grouppanel1",
       "infoGroupMode" : false,
       "showCaption" : true
+    }, {
+      "caption" : "金额",
+      "codeName" : "money",
+      "dataType" : 6,
+      "detailStyle" : "DEFAULT",
+      "detailType" : "FORMITEM",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "labelPos" : "LEFT",
+      "labelWidth" : 130,
+      "mOSFilePath" : "psdeformdetail_formitems/money",
+      "name" : "money",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "MONEY",
+        "codeName" : "Money"
+      },
+      "getPSEditor" : {
+        "editorType" : "TEXTBOX",
+        "name" : "money"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "rTMOSFilePath" : "psdeformdetail_formitems/money",
+      "unitName" : "元",
+      "allowEmpty" : true,
+      "enableUnitName" : true,
+      "showCaption" : true
+    }, {
+      "caption" : "手机标识",
+      "codeName" : "phoneid",
+      "dataType" : 25,
+      "detailStyle" : "DEFAULT",
+      "detailType" : "FORMITEM",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "labelPos" : "LEFT",
+      "labelWidth" : 130,
+      "mOSFilePath" : "psdeformdetail_formitems/phoneid",
+      "name" : "phoneid",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "PHONEID",
+        "codeName" : "PhoneId"
+      },
+      "getPSEditor" : {
+        "editorType" : "SPAN",
+        "name" : "phoneid",
+        "enableLinkView" : false
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "rTMOSFilePath" : "psdeformdetail_formitems/phoneid",
+      "allowEmpty" : true,
+      "showCaption" : true
+    }, {
+      "caption" : "组织机构标识",
+      "codeName" : "orgid",
+      "dataType" : 25,
+      "detailStyle" : "DEFAULT",
+      "detailType" : "FORMITEM",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "labelPos" : "LEFT",
+      "labelWidth" : 130,
+      "mOSFilePath" : "psdeformdetail_formitems/orgid",
+      "name" : "orgid",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "ORGID",
+        "codeName" : "OrgId"
+      },
+      "getPSEditor" : {
+        "editorType" : "TEXTBOX",
+        "maxLength" : 60,
+        "name" : "orgid"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "rTMOSFilePath" : "psdeformdetail_formitems/orgid",
+      "allowEmpty" : true,
+      "showCaption" : true
+    }, {
+      "caption" : "结束时间",
+      "codeName" : "end",
+      "dataType" : 5,
+      "detailStyle" : "DEFAULT",
+      "detailType" : "FORMITEM",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "itemWidth" : 290.0,
+      "labelPos" : "LEFT",
+      "labelWidth" : 130,
+      "mOSFilePath" : "psdeformdetail_formitems/end",
+      "name" : "end",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "END",
+        "codeName" : "End"
+      },
+      "getPSEditor" : {
+        "dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
+        "editorParams" : {
+          "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
+        },
+        "editorType" : "DATEPICKER",
+        "editorWidth" : 160.0,
+        "name" : "end"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "rTMOSFilePath" : "psdeformdetail_formitems/end",
+      "valueFormat" : "YYYY-MM-DD HH:mm:ss",
+      "allowEmpty" : false,
+      "showCaption" : true
     } ],
     "getPSLayout" : {
       "childColLG" : -1,

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

@@ -516,14 +516,34 @@
             "name" : "CREATEMAN",
             "codeName" : "CreateMan"
           }
+        }, {
+          "id" : "money",
+          "dataType" : 6,
+          "getPSAppDEField" : {
+            "name" : "MONEY",
+            "codeName" : "Money"
+          }
         }, {
           "id" : "phoneid",
-          "hidden" : true,
           "dataType" : 25,
           "getPSAppDEField" : {
             "name" : "PHONEID",
             "codeName" : "PhoneId"
           }
+        }, {
+          "id" : "orgid",
+          "dataType" : 25,
+          "getPSAppDEField" : {
+            "name" : "ORGID",
+            "codeName" : "OrgId"
+          }
+        }, {
+          "id" : "end",
+          "dataType" : 5,
+          "getPSAppDEField" : {
+            "name" : "END",
+            "codeName" : "End"
+          }
         } ],
         "getPSDEFormPages" : [ {
           "codeName" : "formpage1",
@@ -618,6 +638,129 @@
             "rTMOSFilePath" : "psdeformdetail_grouppanels/grouppanel1",
             "infoGroupMode" : false,
             "showCaption" : true
+          }, {
+            "caption" : "金额",
+            "codeName" : "money",
+            "dataType" : 6,
+            "detailStyle" : "DEFAULT",
+            "detailType" : "FORMITEM",
+            "enableCond" : 3,
+            "ignoreInput" : 0,
+            "labelPos" : "LEFT",
+            "labelWidth" : 130,
+            "mOSFilePath" : "psdeformdetail_formitems/money",
+            "name" : "money",
+            "noPrivDisplayMode" : 1,
+            "getPSAppDEField" : {
+              "name" : "MONEY",
+              "codeName" : "Money"
+            },
+            "getPSEditor" : {
+              "editorType" : "TEXTBOX",
+              "name" : "money"
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "rTMOSFilePath" : "psdeformdetail_formitems/money",
+            "unitName" : "元",
+            "allowEmpty" : true,
+            "enableUnitName" : true,
+            "showCaption" : true
+          }, {
+            "caption" : "手机标识",
+            "codeName" : "phoneid",
+            "dataType" : 25,
+            "detailStyle" : "DEFAULT",
+            "detailType" : "FORMITEM",
+            "enableCond" : 3,
+            "ignoreInput" : 0,
+            "labelPos" : "LEFT",
+            "labelWidth" : 130,
+            "mOSFilePath" : "psdeformdetail_formitems/phoneid",
+            "name" : "phoneid",
+            "noPrivDisplayMode" : 1,
+            "getPSAppDEField" : {
+              "name" : "PHONEID",
+              "codeName" : "PhoneId"
+            },
+            "getPSEditor" : {
+              "editorType" : "SPAN",
+              "name" : "phoneid",
+              "enableLinkView" : false
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "rTMOSFilePath" : "psdeformdetail_formitems/phoneid",
+            "allowEmpty" : true,
+            "showCaption" : true
+          }, {
+            "caption" : "组织机构标识",
+            "codeName" : "orgid",
+            "dataType" : 25,
+            "detailStyle" : "DEFAULT",
+            "detailType" : "FORMITEM",
+            "enableCond" : 3,
+            "ignoreInput" : 0,
+            "labelPos" : "LEFT",
+            "labelWidth" : 130,
+            "mOSFilePath" : "psdeformdetail_formitems/orgid",
+            "name" : "orgid",
+            "noPrivDisplayMode" : 1,
+            "getPSAppDEField" : {
+              "name" : "ORGID",
+              "codeName" : "OrgId"
+            },
+            "getPSEditor" : {
+              "editorType" : "TEXTBOX",
+              "maxLength" : 60,
+              "name" : "orgid"
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "rTMOSFilePath" : "psdeformdetail_formitems/orgid",
+            "allowEmpty" : true,
+            "showCaption" : true
+          }, {
+            "caption" : "结束时间",
+            "codeName" : "end",
+            "dataType" : 5,
+            "detailStyle" : "DEFAULT",
+            "detailType" : "FORMITEM",
+            "enableCond" : 3,
+            "ignoreInput" : 0,
+            "itemWidth" : 290.0,
+            "labelPos" : "LEFT",
+            "labelWidth" : 130,
+            "mOSFilePath" : "psdeformdetail_formitems/end",
+            "name" : "end",
+            "noPrivDisplayMode" : 1,
+            "getPSAppDEField" : {
+              "name" : "END",
+              "codeName" : "End"
+            },
+            "getPSEditor" : {
+              "dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
+              "editorParams" : {
+                "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
+              },
+              "editorType" : "DATEPICKER",
+              "editorWidth" : 160.0,
+              "name" : "end"
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "rTMOSFilePath" : "psdeformdetail_formitems/end",
+            "valueFormat" : "YYYY-MM-DD HH:mm:ss",
+            "allowEmpty" : false,
+            "showCaption" : true
           } ],
           "getPSLayout" : {
             "childColLG" : -1,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/phoneEditView.json

@@ -1937,14 +1937,34 @@
                 "name" : "CREATEMAN",
                 "codeName" : "CreateMan"
               }
+            }, {
+              "id" : "money",
+              "dataType" : 6,
+              "getPSAppDEField" : {
+                "name" : "MONEY",
+                "codeName" : "Money"
+              }
             }, {
               "id" : "phoneid",
-              "hidden" : true,
               "dataType" : 25,
               "getPSAppDEField" : {
                 "name" : "PHONEID",
                 "codeName" : "PhoneId"
               }
+            }, {
+              "id" : "orgid",
+              "dataType" : 25,
+              "getPSAppDEField" : {
+                "name" : "ORGID",
+                "codeName" : "OrgId"
+              }
+            }, {
+              "id" : "end",
+              "dataType" : 5,
+              "getPSAppDEField" : {
+                "name" : "END",
+                "codeName" : "End"
+              }
             } ],
             "getPSDEFormPages" : [ {
               "codeName" : "formpage1",
@@ -2039,6 +2059,129 @@
                 "rTMOSFilePath" : "psdeformdetail_grouppanels/grouppanel1",
                 "infoGroupMode" : false,
                 "showCaption" : true
+              }, {
+                "caption" : "金额",
+                "codeName" : "money",
+                "dataType" : 6,
+                "detailStyle" : "DEFAULT",
+                "detailType" : "FORMITEM",
+                "enableCond" : 3,
+                "ignoreInput" : 0,
+                "labelPos" : "LEFT",
+                "labelWidth" : 130,
+                "mOSFilePath" : "psdeformdetail_formitems/money",
+                "name" : "money",
+                "noPrivDisplayMode" : 1,
+                "getPSAppDEField" : {
+                  "name" : "MONEY",
+                  "codeName" : "Money"
+                },
+                "getPSEditor" : {
+                  "editorType" : "TEXTBOX",
+                  "name" : "money"
+                },
+                "getPSLayoutPos" : {
+                  "colMD" : 24,
+                  "layout" : "TABLE_24COL"
+                },
+                "rTMOSFilePath" : "psdeformdetail_formitems/money",
+                "unitName" : "元",
+                "allowEmpty" : true,
+                "enableUnitName" : true,
+                "showCaption" : true
+              }, {
+                "caption" : "手机标识",
+                "codeName" : "phoneid",
+                "dataType" : 25,
+                "detailStyle" : "DEFAULT",
+                "detailType" : "FORMITEM",
+                "enableCond" : 3,
+                "ignoreInput" : 0,
+                "labelPos" : "LEFT",
+                "labelWidth" : 130,
+                "mOSFilePath" : "psdeformdetail_formitems/phoneid",
+                "name" : "phoneid",
+                "noPrivDisplayMode" : 1,
+                "getPSAppDEField" : {
+                  "name" : "PHONEID",
+                  "codeName" : "PhoneId"
+                },
+                "getPSEditor" : {
+                  "editorType" : "SPAN",
+                  "name" : "phoneid",
+                  "enableLinkView" : false
+                },
+                "getPSLayoutPos" : {
+                  "colMD" : 24,
+                  "layout" : "TABLE_24COL"
+                },
+                "rTMOSFilePath" : "psdeformdetail_formitems/phoneid",
+                "allowEmpty" : true,
+                "showCaption" : true
+              }, {
+                "caption" : "组织机构标识",
+                "codeName" : "orgid",
+                "dataType" : 25,
+                "detailStyle" : "DEFAULT",
+                "detailType" : "FORMITEM",
+                "enableCond" : 3,
+                "ignoreInput" : 0,
+                "labelPos" : "LEFT",
+                "labelWidth" : 130,
+                "mOSFilePath" : "psdeformdetail_formitems/orgid",
+                "name" : "orgid",
+                "noPrivDisplayMode" : 1,
+                "getPSAppDEField" : {
+                  "name" : "ORGID",
+                  "codeName" : "OrgId"
+                },
+                "getPSEditor" : {
+                  "editorType" : "TEXTBOX",
+                  "maxLength" : 60,
+                  "name" : "orgid"
+                },
+                "getPSLayoutPos" : {
+                  "colMD" : 24,
+                  "layout" : "TABLE_24COL"
+                },
+                "rTMOSFilePath" : "psdeformdetail_formitems/orgid",
+                "allowEmpty" : true,
+                "showCaption" : true
+              }, {
+                "caption" : "结束时间",
+                "codeName" : "end",
+                "dataType" : 5,
+                "detailStyle" : "DEFAULT",
+                "detailType" : "FORMITEM",
+                "enableCond" : 3,
+                "ignoreInput" : 0,
+                "itemWidth" : 290.0,
+                "labelPos" : "LEFT",
+                "labelWidth" : 130,
+                "mOSFilePath" : "psdeformdetail_formitems/end",
+                "name" : "end",
+                "noPrivDisplayMode" : 1,
+                "getPSAppDEField" : {
+                  "name" : "END",
+                  "codeName" : "End"
+                },
+                "getPSEditor" : {
+                  "dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
+                  "editorParams" : {
+                    "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
+                  },
+                  "editorType" : "DATEPICKER",
+                  "editorWidth" : 160.0,
+                  "name" : "end"
+                },
+                "getPSLayoutPos" : {
+                  "colMD" : 24,
+                  "layout" : "TABLE_24COL"
+                },
+                "rTMOSFilePath" : "psdeformdetail_formitems/end",
+                "valueFormat" : "YYYY-MM-DD HH:mm:ss",
+                "allowEmpty" : false,
+                "showCaption" : true
               } ],
               "getPSLayout" : {
                 "childColLG" : -1,
@@ -2746,14 +2889,34 @@
                 "name" : "CREATEMAN",
                 "codeName" : "CreateMan"
               }
+            }, {
+              "id" : "money",
+              "dataType" : 6,
+              "getPSAppDEField" : {
+                "name" : "MONEY",
+                "codeName" : "Money"
+              }
             }, {
               "id" : "phoneid",
-              "hidden" : true,
               "dataType" : 25,
               "getPSAppDEField" : {
                 "name" : "PHONEID",
                 "codeName" : "PhoneId"
               }
+            }, {
+              "id" : "orgid",
+              "dataType" : 25,
+              "getPSAppDEField" : {
+                "name" : "ORGID",
+                "codeName" : "OrgId"
+              }
+            }, {
+              "id" : "end",
+              "dataType" : 5,
+              "getPSAppDEField" : {
+                "name" : "END",
+                "codeName" : "End"
+              }
             } ],
             "getPSDEFormPages" : [ {
               "codeName" : "formpage1",
@@ -2848,6 +3011,129 @@
                 "rTMOSFilePath" : "psdeformdetail_grouppanels/grouppanel1",
                 "infoGroupMode" : false,
                 "showCaption" : true
+              }, {
+                "caption" : "金额",
+                "codeName" : "money",
+                "dataType" : 6,
+                "detailStyle" : "DEFAULT",
+                "detailType" : "FORMITEM",
+                "enableCond" : 3,
+                "ignoreInput" : 0,
+                "labelPos" : "LEFT",
+                "labelWidth" : 130,
+                "mOSFilePath" : "psdeformdetail_formitems/money",
+                "name" : "money",
+                "noPrivDisplayMode" : 1,
+                "getPSAppDEField" : {
+                  "name" : "MONEY",
+                  "codeName" : "Money"
+                },
+                "getPSEditor" : {
+                  "editorType" : "TEXTBOX",
+                  "name" : "money"
+                },
+                "getPSLayoutPos" : {
+                  "colMD" : 24,
+                  "layout" : "TABLE_24COL"
+                },
+                "rTMOSFilePath" : "psdeformdetail_formitems/money",
+                "unitName" : "元",
+                "allowEmpty" : true,
+                "enableUnitName" : true,
+                "showCaption" : true
+              }, {
+                "caption" : "手机标识",
+                "codeName" : "phoneid",
+                "dataType" : 25,
+                "detailStyle" : "DEFAULT",
+                "detailType" : "FORMITEM",
+                "enableCond" : 3,
+                "ignoreInput" : 0,
+                "labelPos" : "LEFT",
+                "labelWidth" : 130,
+                "mOSFilePath" : "psdeformdetail_formitems/phoneid",
+                "name" : "phoneid",
+                "noPrivDisplayMode" : 1,
+                "getPSAppDEField" : {
+                  "name" : "PHONEID",
+                  "codeName" : "PhoneId"
+                },
+                "getPSEditor" : {
+                  "editorType" : "SPAN",
+                  "name" : "phoneid",
+                  "enableLinkView" : false
+                },
+                "getPSLayoutPos" : {
+                  "colMD" : 24,
+                  "layout" : "TABLE_24COL"
+                },
+                "rTMOSFilePath" : "psdeformdetail_formitems/phoneid",
+                "allowEmpty" : true,
+                "showCaption" : true
+              }, {
+                "caption" : "组织机构标识",
+                "codeName" : "orgid",
+                "dataType" : 25,
+                "detailStyle" : "DEFAULT",
+                "detailType" : "FORMITEM",
+                "enableCond" : 3,
+                "ignoreInput" : 0,
+                "labelPos" : "LEFT",
+                "labelWidth" : 130,
+                "mOSFilePath" : "psdeformdetail_formitems/orgid",
+                "name" : "orgid",
+                "noPrivDisplayMode" : 1,
+                "getPSAppDEField" : {
+                  "name" : "ORGID",
+                  "codeName" : "OrgId"
+                },
+                "getPSEditor" : {
+                  "editorType" : "TEXTBOX",
+                  "maxLength" : 60,
+                  "name" : "orgid"
+                },
+                "getPSLayoutPos" : {
+                  "colMD" : 24,
+                  "layout" : "TABLE_24COL"
+                },
+                "rTMOSFilePath" : "psdeformdetail_formitems/orgid",
+                "allowEmpty" : true,
+                "showCaption" : true
+              }, {
+                "caption" : "结束时间",
+                "codeName" : "end",
+                "dataType" : 5,
+                "detailStyle" : "DEFAULT",
+                "detailType" : "FORMITEM",
+                "enableCond" : 3,
+                "ignoreInput" : 0,
+                "itemWidth" : 290.0,
+                "labelPos" : "LEFT",
+                "labelWidth" : 130,
+                "mOSFilePath" : "psdeformdetail_formitems/end",
+                "name" : "end",
+                "noPrivDisplayMode" : 1,
+                "getPSAppDEField" : {
+                  "name" : "END",
+                  "codeName" : "End"
+                },
+                "getPSEditor" : {
+                  "dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
+                  "editorParams" : {
+                    "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
+                  },
+                  "editorType" : "DATEPICKER",
+                  "editorWidth" : 160.0,
+                  "name" : "end"
+                },
+                "getPSLayoutPos" : {
+                  "colMD" : 24,
+                  "layout" : "TABLE_24COL"
+                },
+                "rTMOSFilePath" : "psdeformdetail_formitems/end",
+                "valueFormat" : "YYYY-MM-DD HH:mm:ss",
+                "allowEmpty" : false,
+                "showCaption" : true
               } ],
               "getPSLayout" : {
                 "childColLG" : -1,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/phoneIndexView.json

@@ -615,14 +615,34 @@
               "name" : "CREATEMAN",
               "codeName" : "CreateMan"
             }
+          }, {
+            "id" : "money",
+            "dataType" : 6,
+            "getPSAppDEField" : {
+              "name" : "MONEY",
+              "codeName" : "Money"
+            }
           }, {
             "id" : "phoneid",
-            "hidden" : true,
             "dataType" : 25,
             "getPSAppDEField" : {
               "name" : "PHONEID",
               "codeName" : "PhoneId"
             }
+          }, {
+            "id" : "orgid",
+            "dataType" : 25,
+            "getPSAppDEField" : {
+              "name" : "ORGID",
+              "codeName" : "OrgId"
+            }
+          }, {
+            "id" : "end",
+            "dataType" : 5,
+            "getPSAppDEField" : {
+              "name" : "END",
+              "codeName" : "End"
+            }
           } ],
           "getPSDEFormPages" : [ {
             "codeName" : "formpage1",
@@ -717,6 +737,129 @@
               "rTMOSFilePath" : "psdeformdetail_grouppanels/grouppanel1",
               "infoGroupMode" : false,
               "showCaption" : true
+            }, {
+              "caption" : "金额",
+              "codeName" : "money",
+              "dataType" : 6,
+              "detailStyle" : "DEFAULT",
+              "detailType" : "FORMITEM",
+              "enableCond" : 3,
+              "ignoreInput" : 0,
+              "labelPos" : "LEFT",
+              "labelWidth" : 130,
+              "mOSFilePath" : "psdeformdetail_formitems/money",
+              "name" : "money",
+              "noPrivDisplayMode" : 1,
+              "getPSAppDEField" : {
+                "name" : "MONEY",
+                "codeName" : "Money"
+              },
+              "getPSEditor" : {
+                "editorType" : "TEXTBOX",
+                "name" : "money"
+              },
+              "getPSLayoutPos" : {
+                "colMD" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "rTMOSFilePath" : "psdeformdetail_formitems/money",
+              "unitName" : "元",
+              "allowEmpty" : true,
+              "enableUnitName" : true,
+              "showCaption" : true
+            }, {
+              "caption" : "手机标识",
+              "codeName" : "phoneid",
+              "dataType" : 25,
+              "detailStyle" : "DEFAULT",
+              "detailType" : "FORMITEM",
+              "enableCond" : 3,
+              "ignoreInput" : 0,
+              "labelPos" : "LEFT",
+              "labelWidth" : 130,
+              "mOSFilePath" : "psdeformdetail_formitems/phoneid",
+              "name" : "phoneid",
+              "noPrivDisplayMode" : 1,
+              "getPSAppDEField" : {
+                "name" : "PHONEID",
+                "codeName" : "PhoneId"
+              },
+              "getPSEditor" : {
+                "editorType" : "SPAN",
+                "name" : "phoneid",
+                "enableLinkView" : false
+              },
+              "getPSLayoutPos" : {
+                "colMD" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "rTMOSFilePath" : "psdeformdetail_formitems/phoneid",
+              "allowEmpty" : true,
+              "showCaption" : true
+            }, {
+              "caption" : "组织机构标识",
+              "codeName" : "orgid",
+              "dataType" : 25,
+              "detailStyle" : "DEFAULT",
+              "detailType" : "FORMITEM",
+              "enableCond" : 3,
+              "ignoreInput" : 0,
+              "labelPos" : "LEFT",
+              "labelWidth" : 130,
+              "mOSFilePath" : "psdeformdetail_formitems/orgid",
+              "name" : "orgid",
+              "noPrivDisplayMode" : 1,
+              "getPSAppDEField" : {
+                "name" : "ORGID",
+                "codeName" : "OrgId"
+              },
+              "getPSEditor" : {
+                "editorType" : "TEXTBOX",
+                "maxLength" : 60,
+                "name" : "orgid"
+              },
+              "getPSLayoutPos" : {
+                "colMD" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "rTMOSFilePath" : "psdeformdetail_formitems/orgid",
+              "allowEmpty" : true,
+              "showCaption" : true
+            }, {
+              "caption" : "结束时间",
+              "codeName" : "end",
+              "dataType" : 5,
+              "detailStyle" : "DEFAULT",
+              "detailType" : "FORMITEM",
+              "enableCond" : 3,
+              "ignoreInput" : 0,
+              "itemWidth" : 290.0,
+              "labelPos" : "LEFT",
+              "labelWidth" : 130,
+              "mOSFilePath" : "psdeformdetail_formitems/end",
+              "name" : "end",
+              "noPrivDisplayMode" : 1,
+              "getPSAppDEField" : {
+                "name" : "END",
+                "codeName" : "End"
+              },
+              "getPSEditor" : {
+                "dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
+                "editorParams" : {
+                  "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
+                },
+                "editorType" : "DATEPICKER",
+                "editorWidth" : 160.0,
+                "name" : "end"
+              },
+              "getPSLayoutPos" : {
+                "colMD" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "rTMOSFilePath" : "psdeformdetail_formitems/end",
+              "valueFormat" : "YYYY-MM-DD HH:mm:ss",
+              "allowEmpty" : false,
+              "showCaption" : true
             } ],
             "getPSLayout" : {
               "childColLG" : -1,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/phoneUsr2EditView.json

@@ -1711,14 +1711,34 @@
               "name" : "CREATEMAN",
               "codeName" : "CreateMan"
             }
+          }, {
+            "id" : "money",
+            "dataType" : 6,
+            "getPSAppDEField" : {
+              "name" : "MONEY",
+              "codeName" : "Money"
+            }
           }, {
             "id" : "phoneid",
-            "hidden" : true,
             "dataType" : 25,
             "getPSAppDEField" : {
               "name" : "PHONEID",
               "codeName" : "PhoneId"
             }
+          }, {
+            "id" : "orgid",
+            "dataType" : 25,
+            "getPSAppDEField" : {
+              "name" : "ORGID",
+              "codeName" : "OrgId"
+            }
+          }, {
+            "id" : "end",
+            "dataType" : 5,
+            "getPSAppDEField" : {
+              "name" : "END",
+              "codeName" : "End"
+            }
           } ],
           "getPSDEFormPages" : [ {
             "codeName" : "formpage1",
@@ -1813,6 +1833,129 @@
               "rTMOSFilePath" : "psdeformdetail_grouppanels/grouppanel1",
               "infoGroupMode" : false,
               "showCaption" : true
+            }, {
+              "caption" : "金额",
+              "codeName" : "money",
+              "dataType" : 6,
+              "detailStyle" : "DEFAULT",
+              "detailType" : "FORMITEM",
+              "enableCond" : 3,
+              "ignoreInput" : 0,
+              "labelPos" : "LEFT",
+              "labelWidth" : 130,
+              "mOSFilePath" : "psdeformdetail_formitems/money",
+              "name" : "money",
+              "noPrivDisplayMode" : 1,
+              "getPSAppDEField" : {
+                "name" : "MONEY",
+                "codeName" : "Money"
+              },
+              "getPSEditor" : {
+                "editorType" : "TEXTBOX",
+                "name" : "money"
+              },
+              "getPSLayoutPos" : {
+                "colMD" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "rTMOSFilePath" : "psdeformdetail_formitems/money",
+              "unitName" : "元",
+              "allowEmpty" : true,
+              "enableUnitName" : true,
+              "showCaption" : true
+            }, {
+              "caption" : "手机标识",
+              "codeName" : "phoneid",
+              "dataType" : 25,
+              "detailStyle" : "DEFAULT",
+              "detailType" : "FORMITEM",
+              "enableCond" : 3,
+              "ignoreInput" : 0,
+              "labelPos" : "LEFT",
+              "labelWidth" : 130,
+              "mOSFilePath" : "psdeformdetail_formitems/phoneid",
+              "name" : "phoneid",
+              "noPrivDisplayMode" : 1,
+              "getPSAppDEField" : {
+                "name" : "PHONEID",
+                "codeName" : "PhoneId"
+              },
+              "getPSEditor" : {
+                "editorType" : "SPAN",
+                "name" : "phoneid",
+                "enableLinkView" : false
+              },
+              "getPSLayoutPos" : {
+                "colMD" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "rTMOSFilePath" : "psdeformdetail_formitems/phoneid",
+              "allowEmpty" : true,
+              "showCaption" : true
+            }, {
+              "caption" : "组织机构标识",
+              "codeName" : "orgid",
+              "dataType" : 25,
+              "detailStyle" : "DEFAULT",
+              "detailType" : "FORMITEM",
+              "enableCond" : 3,
+              "ignoreInput" : 0,
+              "labelPos" : "LEFT",
+              "labelWidth" : 130,
+              "mOSFilePath" : "psdeformdetail_formitems/orgid",
+              "name" : "orgid",
+              "noPrivDisplayMode" : 1,
+              "getPSAppDEField" : {
+                "name" : "ORGID",
+                "codeName" : "OrgId"
+              },
+              "getPSEditor" : {
+                "editorType" : "TEXTBOX",
+                "maxLength" : 60,
+                "name" : "orgid"
+              },
+              "getPSLayoutPos" : {
+                "colMD" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "rTMOSFilePath" : "psdeformdetail_formitems/orgid",
+              "allowEmpty" : true,
+              "showCaption" : true
+            }, {
+              "caption" : "结束时间",
+              "codeName" : "end",
+              "dataType" : 5,
+              "detailStyle" : "DEFAULT",
+              "detailType" : "FORMITEM",
+              "enableCond" : 3,
+              "ignoreInput" : 0,
+              "itemWidth" : 290.0,
+              "labelPos" : "LEFT",
+              "labelWidth" : 130,
+              "mOSFilePath" : "psdeformdetail_formitems/end",
+              "name" : "end",
+              "noPrivDisplayMode" : 1,
+              "getPSAppDEField" : {
+                "name" : "END",
+                "codeName" : "End"
+              },
+              "getPSEditor" : {
+                "dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
+                "editorParams" : {
+                  "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
+                },
+                "editorType" : "DATEPICKER",
+                "editorWidth" : 160.0,
+                "name" : "end"
+              },
+              "getPSLayoutPos" : {
+                "colMD" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "rTMOSFilePath" : "psdeformdetail_formitems/end",
+              "valueFormat" : "YYYY-MM-DD HH:mm:ss",
+              "allowEmpty" : false,
+              "showCaption" : true
             } ],
             "getPSLayout" : {
               "childColLG" : -1,

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

@@ -83,14 +83,34 @@
       "name" : "CREATEMAN",
       "codeName" : "CreateMan"
     }
+  }, {
+    "id" : "money",
+    "dataType" : 6,
+    "getPSAppDEField" : {
+      "name" : "MONEY",
+      "codeName" : "Money"
+    }
   }, {
     "id" : "phoneid",
-    "hidden" : true,
     "dataType" : 25,
     "getPSAppDEField" : {
       "name" : "PHONEID",
       "codeName" : "PhoneId"
     }
+  }, {
+    "id" : "orgid",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "ORGID",
+      "codeName" : "OrgId"
+    }
+  }, {
+    "id" : "end",
+    "dataType" : 5,
+    "getPSAppDEField" : {
+      "name" : "END",
+      "codeName" : "End"
+    }
   } ],
   "getPSDEFormPages" : [ {
     "codeName" : "formpage1",
@@ -185,6 +205,129 @@
       "rTMOSFilePath" : "psdeformdetail_grouppanels/grouppanel1",
       "infoGroupMode" : false,
       "showCaption" : true
+    }, {
+      "caption" : "金额",
+      "codeName" : "money",
+      "dataType" : 6,
+      "detailStyle" : "DEFAULT",
+      "detailType" : "FORMITEM",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "labelPos" : "LEFT",
+      "labelWidth" : 130,
+      "mOSFilePath" : "psdeformdetail_formitems/money",
+      "name" : "money",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "MONEY",
+        "codeName" : "Money"
+      },
+      "getPSEditor" : {
+        "editorType" : "TEXTBOX",
+        "name" : "money"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "rTMOSFilePath" : "psdeformdetail_formitems/money",
+      "unitName" : "元",
+      "allowEmpty" : true,
+      "enableUnitName" : true,
+      "showCaption" : true
+    }, {
+      "caption" : "手机标识",
+      "codeName" : "phoneid",
+      "dataType" : 25,
+      "detailStyle" : "DEFAULT",
+      "detailType" : "FORMITEM",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "labelPos" : "LEFT",
+      "labelWidth" : 130,
+      "mOSFilePath" : "psdeformdetail_formitems/phoneid",
+      "name" : "phoneid",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "PHONEID",
+        "codeName" : "PhoneId"
+      },
+      "getPSEditor" : {
+        "editorType" : "SPAN",
+        "name" : "phoneid",
+        "enableLinkView" : false
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "rTMOSFilePath" : "psdeformdetail_formitems/phoneid",
+      "allowEmpty" : true,
+      "showCaption" : true
+    }, {
+      "caption" : "组织机构标识",
+      "codeName" : "orgid",
+      "dataType" : 25,
+      "detailStyle" : "DEFAULT",
+      "detailType" : "FORMITEM",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "labelPos" : "LEFT",
+      "labelWidth" : 130,
+      "mOSFilePath" : "psdeformdetail_formitems/orgid",
+      "name" : "orgid",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "ORGID",
+        "codeName" : "OrgId"
+      },
+      "getPSEditor" : {
+        "editorType" : "TEXTBOX",
+        "maxLength" : 60,
+        "name" : "orgid"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "rTMOSFilePath" : "psdeformdetail_formitems/orgid",
+      "allowEmpty" : true,
+      "showCaption" : true
+    }, {
+      "caption" : "结束时间",
+      "codeName" : "end",
+      "dataType" : 5,
+      "detailStyle" : "DEFAULT",
+      "detailType" : "FORMITEM",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "itemWidth" : 290.0,
+      "labelPos" : "LEFT",
+      "labelWidth" : 130,
+      "mOSFilePath" : "psdeformdetail_formitems/end",
+      "name" : "end",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "END",
+        "codeName" : "End"
+      },
+      "getPSEditor" : {
+        "dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
+        "editorParams" : {
+          "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
+        },
+        "editorType" : "DATEPICKER",
+        "editorWidth" : 160.0,
+        "name" : "end"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "rTMOSFilePath" : "psdeformdetail_formitems/end",
+      "valueFormat" : "YYYY-MM-DD HH:mm:ss",
+      "allowEmpty" : false,
+      "showCaption" : true
     } ],
     "getPSLayout" : {
       "childColLG" : -1,

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

@@ -528,14 +528,34 @@
             "name" : "CREATEMAN",
             "codeName" : "CreateMan"
           }
+        }, {
+          "id" : "money",
+          "dataType" : 6,
+          "getPSAppDEField" : {
+            "name" : "MONEY",
+            "codeName" : "Money"
+          }
         }, {
           "id" : "phoneid",
-          "hidden" : true,
           "dataType" : 25,
           "getPSAppDEField" : {
             "name" : "PHONEID",
             "codeName" : "PhoneId"
           }
+        }, {
+          "id" : "orgid",
+          "dataType" : 25,
+          "getPSAppDEField" : {
+            "name" : "ORGID",
+            "codeName" : "OrgId"
+          }
+        }, {
+          "id" : "end",
+          "dataType" : 5,
+          "getPSAppDEField" : {
+            "name" : "END",
+            "codeName" : "End"
+          }
         } ],
         "getPSDEFormPages" : [ {
           "codeName" : "formpage1",
@@ -630,6 +650,129 @@
             "rTMOSFilePath" : "psdeformdetail_grouppanels/grouppanel1",
             "infoGroupMode" : false,
             "showCaption" : true
+          }, {
+            "caption" : "金额",
+            "codeName" : "money",
+            "dataType" : 6,
+            "detailStyle" : "DEFAULT",
+            "detailType" : "FORMITEM",
+            "enableCond" : 3,
+            "ignoreInput" : 0,
+            "labelPos" : "LEFT",
+            "labelWidth" : 130,
+            "mOSFilePath" : "psdeformdetail_formitems/money",
+            "name" : "money",
+            "noPrivDisplayMode" : 1,
+            "getPSAppDEField" : {
+              "name" : "MONEY",
+              "codeName" : "Money"
+            },
+            "getPSEditor" : {
+              "editorType" : "TEXTBOX",
+              "name" : "money"
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "rTMOSFilePath" : "psdeformdetail_formitems/money",
+            "unitName" : "元",
+            "allowEmpty" : true,
+            "enableUnitName" : true,
+            "showCaption" : true
+          }, {
+            "caption" : "手机标识",
+            "codeName" : "phoneid",
+            "dataType" : 25,
+            "detailStyle" : "DEFAULT",
+            "detailType" : "FORMITEM",
+            "enableCond" : 3,
+            "ignoreInput" : 0,
+            "labelPos" : "LEFT",
+            "labelWidth" : 130,
+            "mOSFilePath" : "psdeformdetail_formitems/phoneid",
+            "name" : "phoneid",
+            "noPrivDisplayMode" : 1,
+            "getPSAppDEField" : {
+              "name" : "PHONEID",
+              "codeName" : "PhoneId"
+            },
+            "getPSEditor" : {
+              "editorType" : "SPAN",
+              "name" : "phoneid",
+              "enableLinkView" : false
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "rTMOSFilePath" : "psdeformdetail_formitems/phoneid",
+            "allowEmpty" : true,
+            "showCaption" : true
+          }, {
+            "caption" : "组织机构标识",
+            "codeName" : "orgid",
+            "dataType" : 25,
+            "detailStyle" : "DEFAULT",
+            "detailType" : "FORMITEM",
+            "enableCond" : 3,
+            "ignoreInput" : 0,
+            "labelPos" : "LEFT",
+            "labelWidth" : 130,
+            "mOSFilePath" : "psdeformdetail_formitems/orgid",
+            "name" : "orgid",
+            "noPrivDisplayMode" : 1,
+            "getPSAppDEField" : {
+              "name" : "ORGID",
+              "codeName" : "OrgId"
+            },
+            "getPSEditor" : {
+              "editorType" : "TEXTBOX",
+              "maxLength" : 60,
+              "name" : "orgid"
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "rTMOSFilePath" : "psdeformdetail_formitems/orgid",
+            "allowEmpty" : true,
+            "showCaption" : true
+          }, {
+            "caption" : "结束时间",
+            "codeName" : "end",
+            "dataType" : 5,
+            "detailStyle" : "DEFAULT",
+            "detailType" : "FORMITEM",
+            "enableCond" : 3,
+            "ignoreInput" : 0,
+            "itemWidth" : 290.0,
+            "labelPos" : "LEFT",
+            "labelWidth" : 130,
+            "mOSFilePath" : "psdeformdetail_formitems/end",
+            "name" : "end",
+            "noPrivDisplayMode" : 1,
+            "getPSAppDEField" : {
+              "name" : "END",
+              "codeName" : "End"
+            },
+            "getPSEditor" : {
+              "dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
+              "editorParams" : {
+                "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
+              },
+              "editorType" : "DATEPICKER",
+              "editorWidth" : 160.0,
+              "name" : "end"
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "rTMOSFilePath" : "psdeformdetail_formitems/end",
+            "valueFormat" : "YYYY-MM-DD HH:mm:ss",
+            "allowEmpty" : false,
+            "showCaption" : true
           } ],
           "getPSLayout" : {
             "childColLG" : -1,

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

@@ -37,94 +37,6 @@
     }
   } ],
   "getPSDEFormItemVRs" : [ {
-    "checkMode" : 3,
-    "name" : "表单项值规则",
-    "getPSDEFValueRule" : {
-      "codeName" : "ValueRule7",
-      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
-      "name" : "field6值规则",
-      "getPSDEFVRGroupCondition" : {
-        "condOp" : "AND",
-        "condType" : "GROUP",
-        "name" : "默认组",
-        "getPSDEFVRConditions" : [ {
-          "condOp" : "AND",
-          "condType" : "GROUP",
-          "name" : "[条件组]AND",
-          "getPSDEFVRConditions" : [ {
-            "condOp" : "NOTEQ",
-            "condType" : "SIMPLE",
-            "dEFName" : "FIELD6",
-            "name" : "[常规条件] 不等于(<>) (20)",
-            "paramValue" : "20"
-          }, {
-            "condOp" : "GT",
-            "condType" : "SIMPLE",
-            "dEFName" : "FIELD6",
-            "name" : "[常规条件] 大于(>) (5)",
-            "paramValue" : "5"
-          } ],
-          "ruleInfo" : ">5并且不等于20"
-        } ],
-        "ruleInfo" : ">5并且不等于20"
-      },
-      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
-      "ruleInfo" : ">5并且不等于20",
-      "checkDefault" : false,
-      "defaultMode" : false,
-      "enableBackend" : true,
-      "enableFront" : true
-    },
-    "getPSDEFormItemName" : "field6",
-    "valueRuleType" : "DEFVALUERULE"
-  }, {
-    "checkMode" : 3,
-    "name" : "表单项值规则",
-    "getPSDEFValueRule" : {
-      "codeName" : "ValueRule8",
-      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD7/psdefvaluerules/ValueRule8",
-      "name" : "field7值规则",
-      "getPSDEFVRGroupCondition" : {
-        "condOp" : "AND",
-        "condType" : "GROUP",
-        "name" : "默认组",
-        "getPSDEFVRConditions" : [ {
-          "condOp" : "OR",
-          "condType" : "GROUP",
-          "name" : "[条件组]OR",
-          "getPSDEFVRConditions" : [ {
-            "condType" : "VALUERANGE2",
-            "dEFName" : "FIELD7",
-            "maxValue" : 20.0,
-            "minValue" : 10.0,
-            "name" : "[数值范围] 大于等于 10.0 且  小于等于 20.0",
-            "ruleInfo" : "数值必须大于等于[10.0]且小于等于[20.0]",
-            "includeMaxValue" : true,
-            "includeMinValue" : true
-          }, {
-            "condType" : "VALUERANGE2",
-            "dEFName" : "FIELD7",
-            "maxValue" : 40.0,
-            "minValue" : 30.0,
-            "name" : "[数值范围] 大于等于 30.0 且  小于等于 40.0",
-            "ruleInfo" : "数值必须大于等于[30.0]且小于等于[40.0]",
-            "includeMaxValue" : true,
-            "includeMinValue" : true
-          } ],
-          "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])"
-        } ],
-        "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])"
-      },
-      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD7/psdefvaluerules/ValueRule8",
-      "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])",
-      "checkDefault" : false,
-      "defaultMode" : false,
-      "enableBackend" : true,
-      "enableFront" : true
-    },
-    "getPSDEFormItemName" : "field7",
-    "valueRuleType" : "DEFVALUERULE"
-  }, {
     "checkMode" : 3,
     "name" : "表单项值规则",
     "getPSDEFValueRule" : {
@@ -391,6 +303,94 @@
     },
     "getPSDEFormItemName" : "field8",
     "valueRuleType" : "DEFVALUERULE"
+  }, {
+    "checkMode" : 3,
+    "name" : "表单项值规则",
+    "getPSDEFValueRule" : {
+      "codeName" : "ValueRule7",
+      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
+      "name" : "field6值规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condOp" : "AND",
+          "condType" : "GROUP",
+          "name" : "[条件组]AND",
+          "getPSDEFVRConditions" : [ {
+            "condOp" : "NOTEQ",
+            "condType" : "SIMPLE",
+            "dEFName" : "FIELD6",
+            "name" : "[常规条件] 不等于(<>) (20)",
+            "paramValue" : "20"
+          }, {
+            "condOp" : "GT",
+            "condType" : "SIMPLE",
+            "dEFName" : "FIELD6",
+            "name" : "[常规条件] 大于(>) (5)",
+            "paramValue" : "5"
+          } ],
+          "ruleInfo" : ">5并且不等于20"
+        } ],
+        "ruleInfo" : ">5并且不等于20"
+      },
+      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
+      "ruleInfo" : ">5并且不等于20",
+      "checkDefault" : false,
+      "defaultMode" : false,
+      "enableBackend" : true,
+      "enableFront" : true
+    },
+    "getPSDEFormItemName" : "field6",
+    "valueRuleType" : "DEFVALUERULE"
+  }, {
+    "checkMode" : 3,
+    "name" : "表单项值规则",
+    "getPSDEFValueRule" : {
+      "codeName" : "ValueRule8",
+      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD7/psdefvaluerules/ValueRule8",
+      "name" : "field7值规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condOp" : "OR",
+          "condType" : "GROUP",
+          "name" : "[条件组]OR",
+          "getPSDEFVRConditions" : [ {
+            "condType" : "VALUERANGE2",
+            "dEFName" : "FIELD7",
+            "maxValue" : 20.0,
+            "minValue" : 10.0,
+            "name" : "[数值范围] 大于等于 10.0 且  小于等于 20.0",
+            "ruleInfo" : "数值必须大于等于[10.0]且小于等于[20.0]",
+            "includeMaxValue" : true,
+            "includeMinValue" : true
+          }, {
+            "condType" : "VALUERANGE2",
+            "dEFName" : "FIELD7",
+            "maxValue" : 40.0,
+            "minValue" : 30.0,
+            "name" : "[数值范围] 大于等于 30.0 且  小于等于 40.0",
+            "ruleInfo" : "数值必须大于等于[30.0]且小于等于[40.0]",
+            "includeMaxValue" : true,
+            "includeMinValue" : true
+          } ],
+          "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])"
+        } ],
+        "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])"
+      },
+      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD7/psdefvaluerules/ValueRule8",
+      "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])",
+      "checkDefault" : false,
+      "defaultMode" : false,
+      "enableBackend" : true,
+      "enableFront" : true
+    },
+    "getPSDEFormItemName" : "field7",
+    "valueRuleType" : "DEFVALUERULE"
   } ],
   "getPSDEFormItems" : [ {
     "id" : "srfupdatedate",

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

@@ -166,94 +166,6 @@
       "id" : "FORM"
     },
     "getPSDEFormItemVRs" : [ {
-      "checkMode" : 3,
-      "name" : "表单项值规则",
-      "getPSDEFValueRule" : {
-        "codeName" : "ValueRule7",
-        "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
-        "name" : "field6值规则",
-        "getPSDEFVRGroupCondition" : {
-          "condOp" : "AND",
-          "condType" : "GROUP",
-          "name" : "默认组",
-          "getPSDEFVRConditions" : [ {
-            "condOp" : "AND",
-            "condType" : "GROUP",
-            "name" : "[条件组]AND",
-            "getPSDEFVRConditions" : [ {
-              "condOp" : "NOTEQ",
-              "condType" : "SIMPLE",
-              "dEFName" : "FIELD6",
-              "name" : "[常规条件] 不等于(<>) (20)",
-              "paramValue" : "20"
-            }, {
-              "condOp" : "GT",
-              "condType" : "SIMPLE",
-              "dEFName" : "FIELD6",
-              "name" : "[常规条件] 大于(>) (5)",
-              "paramValue" : "5"
-            } ],
-            "ruleInfo" : ">5并且不等于20"
-          } ],
-          "ruleInfo" : ">5并且不等于20"
-        },
-        "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
-        "ruleInfo" : ">5并且不等于20",
-        "checkDefault" : false,
-        "defaultMode" : false,
-        "enableBackend" : true,
-        "enableFront" : true
-      },
-      "getPSDEFormItemName" : "field6",
-      "valueRuleType" : "DEFVALUERULE"
-    }, {
-      "checkMode" : 3,
-      "name" : "表单项值规则",
-      "getPSDEFValueRule" : {
-        "codeName" : "ValueRule8",
-        "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD7/psdefvaluerules/ValueRule8",
-        "name" : "field7值规则",
-        "getPSDEFVRGroupCondition" : {
-          "condOp" : "AND",
-          "condType" : "GROUP",
-          "name" : "默认组",
-          "getPSDEFVRConditions" : [ {
-            "condOp" : "OR",
-            "condType" : "GROUP",
-            "name" : "[条件组]OR",
-            "getPSDEFVRConditions" : [ {
-              "condType" : "VALUERANGE2",
-              "dEFName" : "FIELD7",
-              "maxValue" : 20.0,
-              "minValue" : 10.0,
-              "name" : "[数值范围] 大于等于 10.0 且  小于等于 20.0",
-              "ruleInfo" : "数值必须大于等于[10.0]且小于等于[20.0]",
-              "includeMaxValue" : true,
-              "includeMinValue" : true
-            }, {
-              "condType" : "VALUERANGE2",
-              "dEFName" : "FIELD7",
-              "maxValue" : 40.0,
-              "minValue" : 30.0,
-              "name" : "[数值范围] 大于等于 30.0 且  小于等于 40.0",
-              "ruleInfo" : "数值必须大于等于[30.0]且小于等于[40.0]",
-              "includeMaxValue" : true,
-              "includeMinValue" : true
-            } ],
-            "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])"
-          } ],
-          "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])"
-        },
-        "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD7/psdefvaluerules/ValueRule8",
-        "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])",
-        "checkDefault" : false,
-        "defaultMode" : false,
-        "enableBackend" : true,
-        "enableFront" : true
-      },
-      "getPSDEFormItemName" : "field7",
-      "valueRuleType" : "DEFVALUERULE"
-    }, {
       "checkMode" : 3,
       "name" : "表单项值规则",
       "getPSDEFValueRule" : {
@@ -520,6 +432,94 @@
       },
       "getPSDEFormItemName" : "field8",
       "valueRuleType" : "DEFVALUERULE"
+    }, {
+      "checkMode" : 3,
+      "name" : "表单项值规则",
+      "getPSDEFValueRule" : {
+        "codeName" : "ValueRule7",
+        "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
+        "name" : "field6值规则",
+        "getPSDEFVRGroupCondition" : {
+          "condOp" : "AND",
+          "condType" : "GROUP",
+          "name" : "默认组",
+          "getPSDEFVRConditions" : [ {
+            "condOp" : "AND",
+            "condType" : "GROUP",
+            "name" : "[条件组]AND",
+            "getPSDEFVRConditions" : [ {
+              "condOp" : "NOTEQ",
+              "condType" : "SIMPLE",
+              "dEFName" : "FIELD6",
+              "name" : "[常规条件] 不等于(<>) (20)",
+              "paramValue" : "20"
+            }, {
+              "condOp" : "GT",
+              "condType" : "SIMPLE",
+              "dEFName" : "FIELD6",
+              "name" : "[常规条件] 大于(>) (5)",
+              "paramValue" : "5"
+            } ],
+            "ruleInfo" : ">5并且不等于20"
+          } ],
+          "ruleInfo" : ">5并且不等于20"
+        },
+        "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
+        "ruleInfo" : ">5并且不等于20",
+        "checkDefault" : false,
+        "defaultMode" : false,
+        "enableBackend" : true,
+        "enableFront" : true
+      },
+      "getPSDEFormItemName" : "field6",
+      "valueRuleType" : "DEFVALUERULE"
+    }, {
+      "checkMode" : 3,
+      "name" : "表单项值规则",
+      "getPSDEFValueRule" : {
+        "codeName" : "ValueRule8",
+        "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD7/psdefvaluerules/ValueRule8",
+        "name" : "field7值规则",
+        "getPSDEFVRGroupCondition" : {
+          "condOp" : "AND",
+          "condType" : "GROUP",
+          "name" : "默认组",
+          "getPSDEFVRConditions" : [ {
+            "condOp" : "OR",
+            "condType" : "GROUP",
+            "name" : "[条件组]OR",
+            "getPSDEFVRConditions" : [ {
+              "condType" : "VALUERANGE2",
+              "dEFName" : "FIELD7",
+              "maxValue" : 20.0,
+              "minValue" : 10.0,
+              "name" : "[数值范围] 大于等于 10.0 且  小于等于 20.0",
+              "ruleInfo" : "数值必须大于等于[10.0]且小于等于[20.0]",
+              "includeMaxValue" : true,
+              "includeMinValue" : true
+            }, {
+              "condType" : "VALUERANGE2",
+              "dEFName" : "FIELD7",
+              "maxValue" : 40.0,
+              "minValue" : 30.0,
+              "name" : "[数值范围] 大于等于 30.0 且  小于等于 40.0",
+              "ruleInfo" : "数值必须大于等于[30.0]且小于等于[40.0]",
+              "includeMaxValue" : true,
+              "includeMinValue" : true
+            } ],
+            "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])"
+          } ],
+          "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])"
+        },
+        "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD7/psdefvaluerules/ValueRule8",
+        "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])",
+        "checkDefault" : false,
+        "defaultMode" : false,
+        "enableBackend" : true,
+        "enableFront" : true
+      },
+      "getPSDEFormItemName" : "field7",
+      "valueRuleType" : "DEFVALUERULE"
     } ],
     "getPSDEFormItems" : [ {
       "id" : "srfupdatedate",

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

@@ -1936,14 +1936,34 @@
                 "name" : "CREATEMAN",
                 "codeName" : "CreateMan"
               }
+            }, {
+              "id" : "money",
+              "dataType" : 6,
+              "getPSAppDEField" : {
+                "name" : "MONEY",
+                "codeName" : "Money"
+              }
             }, {
               "id" : "phoneid",
-              "hidden" : true,
               "dataType" : 25,
               "getPSAppDEField" : {
                 "name" : "PHONEID",
                 "codeName" : "PhoneId"
               }
+            }, {
+              "id" : "orgid",
+              "dataType" : 25,
+              "getPSAppDEField" : {
+                "name" : "ORGID",
+                "codeName" : "OrgId"
+              }
+            }, {
+              "id" : "end",
+              "dataType" : 5,
+              "getPSAppDEField" : {
+                "name" : "END",
+                "codeName" : "End"
+              }
             } ],
             "getPSDEFormPages" : [ {
               "codeName" : "formpage1",
@@ -2038,6 +2058,129 @@
                 "rTMOSFilePath" : "psdeformdetail_grouppanels/grouppanel1",
                 "infoGroupMode" : false,
                 "showCaption" : true
+              }, {
+                "caption" : "金额",
+                "codeName" : "money",
+                "dataType" : 6,
+                "detailStyle" : "DEFAULT",
+                "detailType" : "FORMITEM",
+                "enableCond" : 3,
+                "ignoreInput" : 0,
+                "labelPos" : "LEFT",
+                "labelWidth" : 130,
+                "mOSFilePath" : "psdeformdetail_formitems/money",
+                "name" : "money",
+                "noPrivDisplayMode" : 1,
+                "getPSAppDEField" : {
+                  "name" : "MONEY",
+                  "codeName" : "Money"
+                },
+                "getPSEditor" : {
+                  "editorType" : "TEXTBOX",
+                  "name" : "money"
+                },
+                "getPSLayoutPos" : {
+                  "colMD" : 24,
+                  "layout" : "TABLE_24COL"
+                },
+                "rTMOSFilePath" : "psdeformdetail_formitems/money",
+                "unitName" : "元",
+                "allowEmpty" : true,
+                "enableUnitName" : true,
+                "showCaption" : true
+              }, {
+                "caption" : "手机标识",
+                "codeName" : "phoneid",
+                "dataType" : 25,
+                "detailStyle" : "DEFAULT",
+                "detailType" : "FORMITEM",
+                "enableCond" : 3,
+                "ignoreInput" : 0,
+                "labelPos" : "LEFT",
+                "labelWidth" : 130,
+                "mOSFilePath" : "psdeformdetail_formitems/phoneid",
+                "name" : "phoneid",
+                "noPrivDisplayMode" : 1,
+                "getPSAppDEField" : {
+                  "name" : "PHONEID",
+                  "codeName" : "PhoneId"
+                },
+                "getPSEditor" : {
+                  "editorType" : "SPAN",
+                  "name" : "phoneid",
+                  "enableLinkView" : false
+                },
+                "getPSLayoutPos" : {
+                  "colMD" : 24,
+                  "layout" : "TABLE_24COL"
+                },
+                "rTMOSFilePath" : "psdeformdetail_formitems/phoneid",
+                "allowEmpty" : true,
+                "showCaption" : true
+              }, {
+                "caption" : "组织机构标识",
+                "codeName" : "orgid",
+                "dataType" : 25,
+                "detailStyle" : "DEFAULT",
+                "detailType" : "FORMITEM",
+                "enableCond" : 3,
+                "ignoreInput" : 0,
+                "labelPos" : "LEFT",
+                "labelWidth" : 130,
+                "mOSFilePath" : "psdeformdetail_formitems/orgid",
+                "name" : "orgid",
+                "noPrivDisplayMode" : 1,
+                "getPSAppDEField" : {
+                  "name" : "ORGID",
+                  "codeName" : "OrgId"
+                },
+                "getPSEditor" : {
+                  "editorType" : "TEXTBOX",
+                  "maxLength" : 60,
+                  "name" : "orgid"
+                },
+                "getPSLayoutPos" : {
+                  "colMD" : 24,
+                  "layout" : "TABLE_24COL"
+                },
+                "rTMOSFilePath" : "psdeformdetail_formitems/orgid",
+                "allowEmpty" : true,
+                "showCaption" : true
+              }, {
+                "caption" : "结束时间",
+                "codeName" : "end",
+                "dataType" : 5,
+                "detailStyle" : "DEFAULT",
+                "detailType" : "FORMITEM",
+                "enableCond" : 3,
+                "ignoreInput" : 0,
+                "itemWidth" : 290.0,
+                "labelPos" : "LEFT",
+                "labelWidth" : 130,
+                "mOSFilePath" : "psdeformdetail_formitems/end",
+                "name" : "end",
+                "noPrivDisplayMode" : 1,
+                "getPSAppDEField" : {
+                  "name" : "END",
+                  "codeName" : "End"
+                },
+                "getPSEditor" : {
+                  "dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
+                  "editorParams" : {
+                    "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
+                  },
+                  "editorType" : "DATEPICKER",
+                  "editorWidth" : 160.0,
+                  "name" : "end"
+                },
+                "getPSLayoutPos" : {
+                  "colMD" : 24,
+                  "layout" : "TABLE_24COL"
+                },
+                "rTMOSFilePath" : "psdeformdetail_formitems/end",
+                "valueFormat" : "YYYY-MM-DD HH:mm:ss",
+                "allowEmpty" : false,
+                "showCaption" : true
               } ],
               "getPSLayout" : {
                 "childColLG" : -1,
@@ -2745,14 +2888,34 @@
                 "name" : "CREATEMAN",
                 "codeName" : "CreateMan"
               }
+            }, {
+              "id" : "money",
+              "dataType" : 6,
+              "getPSAppDEField" : {
+                "name" : "MONEY",
+                "codeName" : "Money"
+              }
             }, {
               "id" : "phoneid",
-              "hidden" : true,
               "dataType" : 25,
               "getPSAppDEField" : {
                 "name" : "PHONEID",
                 "codeName" : "PhoneId"
               }
+            }, {
+              "id" : "orgid",
+              "dataType" : 25,
+              "getPSAppDEField" : {
+                "name" : "ORGID",
+                "codeName" : "OrgId"
+              }
+            }, {
+              "id" : "end",
+              "dataType" : 5,
+              "getPSAppDEField" : {
+                "name" : "END",
+                "codeName" : "End"
+              }
             } ],
             "getPSDEFormPages" : [ {
               "codeName" : "formpage1",
@@ -2847,6 +3010,129 @@
                 "rTMOSFilePath" : "psdeformdetail_grouppanels/grouppanel1",
                 "infoGroupMode" : false,
                 "showCaption" : true
+              }, {
+                "caption" : "金额",
+                "codeName" : "money",
+                "dataType" : 6,
+                "detailStyle" : "DEFAULT",
+                "detailType" : "FORMITEM",
+                "enableCond" : 3,
+                "ignoreInput" : 0,
+                "labelPos" : "LEFT",
+                "labelWidth" : 130,
+                "mOSFilePath" : "psdeformdetail_formitems/money",
+                "name" : "money",
+                "noPrivDisplayMode" : 1,
+                "getPSAppDEField" : {
+                  "name" : "MONEY",
+                  "codeName" : "Money"
+                },
+                "getPSEditor" : {
+                  "editorType" : "TEXTBOX",
+                  "name" : "money"
+                },
+                "getPSLayoutPos" : {
+                  "colMD" : 24,
+                  "layout" : "TABLE_24COL"
+                },
+                "rTMOSFilePath" : "psdeformdetail_formitems/money",
+                "unitName" : "元",
+                "allowEmpty" : true,
+                "enableUnitName" : true,
+                "showCaption" : true
+              }, {
+                "caption" : "手机标识",
+                "codeName" : "phoneid",
+                "dataType" : 25,
+                "detailStyle" : "DEFAULT",
+                "detailType" : "FORMITEM",
+                "enableCond" : 3,
+                "ignoreInput" : 0,
+                "labelPos" : "LEFT",
+                "labelWidth" : 130,
+                "mOSFilePath" : "psdeformdetail_formitems/phoneid",
+                "name" : "phoneid",
+                "noPrivDisplayMode" : 1,
+                "getPSAppDEField" : {
+                  "name" : "PHONEID",
+                  "codeName" : "PhoneId"
+                },
+                "getPSEditor" : {
+                  "editorType" : "SPAN",
+                  "name" : "phoneid",
+                  "enableLinkView" : false
+                },
+                "getPSLayoutPos" : {
+                  "colMD" : 24,
+                  "layout" : "TABLE_24COL"
+                },
+                "rTMOSFilePath" : "psdeformdetail_formitems/phoneid",
+                "allowEmpty" : true,
+                "showCaption" : true
+              }, {
+                "caption" : "组织机构标识",
+                "codeName" : "orgid",
+                "dataType" : 25,
+                "detailStyle" : "DEFAULT",
+                "detailType" : "FORMITEM",
+                "enableCond" : 3,
+                "ignoreInput" : 0,
+                "labelPos" : "LEFT",
+                "labelWidth" : 130,
+                "mOSFilePath" : "psdeformdetail_formitems/orgid",
+                "name" : "orgid",
+                "noPrivDisplayMode" : 1,
+                "getPSAppDEField" : {
+                  "name" : "ORGID",
+                  "codeName" : "OrgId"
+                },
+                "getPSEditor" : {
+                  "editorType" : "TEXTBOX",
+                  "maxLength" : 60,
+                  "name" : "orgid"
+                },
+                "getPSLayoutPos" : {
+                  "colMD" : 24,
+                  "layout" : "TABLE_24COL"
+                },
+                "rTMOSFilePath" : "psdeformdetail_formitems/orgid",
+                "allowEmpty" : true,
+                "showCaption" : true
+              }, {
+                "caption" : "结束时间",
+                "codeName" : "end",
+                "dataType" : 5,
+                "detailStyle" : "DEFAULT",
+                "detailType" : "FORMITEM",
+                "enableCond" : 3,
+                "ignoreInput" : 0,
+                "itemWidth" : 290.0,
+                "labelPos" : "LEFT",
+                "labelWidth" : 130,
+                "mOSFilePath" : "psdeformdetail_formitems/end",
+                "name" : "end",
+                "noPrivDisplayMode" : 1,
+                "getPSAppDEField" : {
+                  "name" : "END",
+                  "codeName" : "End"
+                },
+                "getPSEditor" : {
+                  "dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
+                  "editorParams" : {
+                    "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
+                  },
+                  "editorType" : "DATEPICKER",
+                  "editorWidth" : 160.0,
+                  "name" : "end"
+                },
+                "getPSLayoutPos" : {
+                  "colMD" : 24,
+                  "layout" : "TABLE_24COL"
+                },
+                "rTMOSFilePath" : "psdeformdetail_formitems/end",
+                "valueFormat" : "YYYY-MM-DD HH:mm:ss",
+                "allowEmpty" : false,
+                "showCaption" : true
               } ],
               "getPSLayout" : {
                 "childColLG" : -1,

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

@@ -641,14 +641,34 @@
               "name" : "CREATEMAN",
               "codeName" : "CreateMan"
             }
+          }, {
+            "id" : "money",
+            "dataType" : 6,
+            "getPSAppDEField" : {
+              "name" : "MONEY",
+              "codeName" : "Money"
+            }
           }, {
             "id" : "phoneid",
-            "hidden" : true,
             "dataType" : 25,
             "getPSAppDEField" : {
               "name" : "PHONEID",
               "codeName" : "PhoneId"
             }
+          }, {
+            "id" : "orgid",
+            "dataType" : 25,
+            "getPSAppDEField" : {
+              "name" : "ORGID",
+              "codeName" : "OrgId"
+            }
+          }, {
+            "id" : "end",
+            "dataType" : 5,
+            "getPSAppDEField" : {
+              "name" : "END",
+              "codeName" : "End"
+            }
           } ],
           "getPSDEFormPages" : [ {
             "codeName" : "formpage1",
@@ -743,6 +763,129 @@
               "rTMOSFilePath" : "psdeformdetail_grouppanels/grouppanel1",
               "infoGroupMode" : false,
               "showCaption" : true
+            }, {
+              "caption" : "金额",
+              "codeName" : "money",
+              "dataType" : 6,
+              "detailStyle" : "DEFAULT",
+              "detailType" : "FORMITEM",
+              "enableCond" : 3,
+              "ignoreInput" : 0,
+              "labelPos" : "LEFT",
+              "labelWidth" : 130,
+              "mOSFilePath" : "psdeformdetail_formitems/money",
+              "name" : "money",
+              "noPrivDisplayMode" : 1,
+              "getPSAppDEField" : {
+                "name" : "MONEY",
+                "codeName" : "Money"
+              },
+              "getPSEditor" : {
+                "editorType" : "TEXTBOX",
+                "name" : "money"
+              },
+              "getPSLayoutPos" : {
+                "colMD" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "rTMOSFilePath" : "psdeformdetail_formitems/money",
+              "unitName" : "元",
+              "allowEmpty" : true,
+              "enableUnitName" : true,
+              "showCaption" : true
+            }, {
+              "caption" : "手机标识",
+              "codeName" : "phoneid",
+              "dataType" : 25,
+              "detailStyle" : "DEFAULT",
+              "detailType" : "FORMITEM",
+              "enableCond" : 3,
+              "ignoreInput" : 0,
+              "labelPos" : "LEFT",
+              "labelWidth" : 130,
+              "mOSFilePath" : "psdeformdetail_formitems/phoneid",
+              "name" : "phoneid",
+              "noPrivDisplayMode" : 1,
+              "getPSAppDEField" : {
+                "name" : "PHONEID",
+                "codeName" : "PhoneId"
+              },
+              "getPSEditor" : {
+                "editorType" : "SPAN",
+                "name" : "phoneid",
+                "enableLinkView" : false
+              },
+              "getPSLayoutPos" : {
+                "colMD" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "rTMOSFilePath" : "psdeformdetail_formitems/phoneid",
+              "allowEmpty" : true,
+              "showCaption" : true
+            }, {
+              "caption" : "组织机构标识",
+              "codeName" : "orgid",
+              "dataType" : 25,
+              "detailStyle" : "DEFAULT",
+              "detailType" : "FORMITEM",
+              "enableCond" : 3,
+              "ignoreInput" : 0,
+              "labelPos" : "LEFT",
+              "labelWidth" : 130,
+              "mOSFilePath" : "psdeformdetail_formitems/orgid",
+              "name" : "orgid",
+              "noPrivDisplayMode" : 1,
+              "getPSAppDEField" : {
+                "name" : "ORGID",
+                "codeName" : "OrgId"
+              },
+              "getPSEditor" : {
+                "editorType" : "TEXTBOX",
+                "maxLength" : 60,
+                "name" : "orgid"
+              },
+              "getPSLayoutPos" : {
+                "colMD" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "rTMOSFilePath" : "psdeformdetail_formitems/orgid",
+              "allowEmpty" : true,
+              "showCaption" : true
+            }, {
+              "caption" : "结束时间",
+              "codeName" : "end",
+              "dataType" : 5,
+              "detailStyle" : "DEFAULT",
+              "detailType" : "FORMITEM",
+              "enableCond" : 3,
+              "ignoreInput" : 0,
+              "itemWidth" : 290.0,
+              "labelPos" : "LEFT",
+              "labelWidth" : 130,
+              "mOSFilePath" : "psdeformdetail_formitems/end",
+              "name" : "end",
+              "noPrivDisplayMode" : 1,
+              "getPSAppDEField" : {
+                "name" : "END",
+                "codeName" : "End"
+              },
+              "getPSEditor" : {
+                "dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
+                "editorParams" : {
+                  "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
+                },
+                "editorType" : "DATEPICKER",
+                "editorWidth" : 160.0,
+                "name" : "end"
+              },
+              "getPSLayoutPos" : {
+                "colMD" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "rTMOSFilePath" : "psdeformdetail_formitems/end",
+              "valueFormat" : "YYYY-MM-DD HH:mm:ss",
+              "allowEmpty" : false,
+              "showCaption" : true
             } ],
             "getPSLayout" : {
               "childColLG" : -1,

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

@@ -1710,14 +1710,34 @@
               "name" : "CREATEMAN",
               "codeName" : "CreateMan"
             }
+          }, {
+            "id" : "money",
+            "dataType" : 6,
+            "getPSAppDEField" : {
+              "name" : "MONEY",
+              "codeName" : "Money"
+            }
           }, {
             "id" : "phoneid",
-            "hidden" : true,
             "dataType" : 25,
             "getPSAppDEField" : {
               "name" : "PHONEID",
               "codeName" : "PhoneId"
             }
+          }, {
+            "id" : "orgid",
+            "dataType" : 25,
+            "getPSAppDEField" : {
+              "name" : "ORGID",
+              "codeName" : "OrgId"
+            }
+          }, {
+            "id" : "end",
+            "dataType" : 5,
+            "getPSAppDEField" : {
+              "name" : "END",
+              "codeName" : "End"
+            }
           } ],
           "getPSDEFormPages" : [ {
             "codeName" : "formpage1",
@@ -1812,6 +1832,129 @@
               "rTMOSFilePath" : "psdeformdetail_grouppanels/grouppanel1",
               "infoGroupMode" : false,
               "showCaption" : true
+            }, {
+              "caption" : "金额",
+              "codeName" : "money",
+              "dataType" : 6,
+              "detailStyle" : "DEFAULT",
+              "detailType" : "FORMITEM",
+              "enableCond" : 3,
+              "ignoreInput" : 0,
+              "labelPos" : "LEFT",
+              "labelWidth" : 130,
+              "mOSFilePath" : "psdeformdetail_formitems/money",
+              "name" : "money",
+              "noPrivDisplayMode" : 1,
+              "getPSAppDEField" : {
+                "name" : "MONEY",
+                "codeName" : "Money"
+              },
+              "getPSEditor" : {
+                "editorType" : "TEXTBOX",
+                "name" : "money"
+              },
+              "getPSLayoutPos" : {
+                "colMD" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "rTMOSFilePath" : "psdeformdetail_formitems/money",
+              "unitName" : "元",
+              "allowEmpty" : true,
+              "enableUnitName" : true,
+              "showCaption" : true
+            }, {
+              "caption" : "手机标识",
+              "codeName" : "phoneid",
+              "dataType" : 25,
+              "detailStyle" : "DEFAULT",
+              "detailType" : "FORMITEM",
+              "enableCond" : 3,
+              "ignoreInput" : 0,
+              "labelPos" : "LEFT",
+              "labelWidth" : 130,
+              "mOSFilePath" : "psdeformdetail_formitems/phoneid",
+              "name" : "phoneid",
+              "noPrivDisplayMode" : 1,
+              "getPSAppDEField" : {
+                "name" : "PHONEID",
+                "codeName" : "PhoneId"
+              },
+              "getPSEditor" : {
+                "editorType" : "SPAN",
+                "name" : "phoneid",
+                "enableLinkView" : false
+              },
+              "getPSLayoutPos" : {
+                "colMD" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "rTMOSFilePath" : "psdeformdetail_formitems/phoneid",
+              "allowEmpty" : true,
+              "showCaption" : true
+            }, {
+              "caption" : "组织机构标识",
+              "codeName" : "orgid",
+              "dataType" : 25,
+              "detailStyle" : "DEFAULT",
+              "detailType" : "FORMITEM",
+              "enableCond" : 3,
+              "ignoreInput" : 0,
+              "labelPos" : "LEFT",
+              "labelWidth" : 130,
+              "mOSFilePath" : "psdeformdetail_formitems/orgid",
+              "name" : "orgid",
+              "noPrivDisplayMode" : 1,
+              "getPSAppDEField" : {
+                "name" : "ORGID",
+                "codeName" : "OrgId"
+              },
+              "getPSEditor" : {
+                "editorType" : "TEXTBOX",
+                "maxLength" : 60,
+                "name" : "orgid"
+              },
+              "getPSLayoutPos" : {
+                "colMD" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "rTMOSFilePath" : "psdeformdetail_formitems/orgid",
+              "allowEmpty" : true,
+              "showCaption" : true
+            }, {
+              "caption" : "结束时间",
+              "codeName" : "end",
+              "dataType" : 5,
+              "detailStyle" : "DEFAULT",
+              "detailType" : "FORMITEM",
+              "enableCond" : 3,
+              "ignoreInput" : 0,
+              "itemWidth" : 290.0,
+              "labelPos" : "LEFT",
+              "labelWidth" : 130,
+              "mOSFilePath" : "psdeformdetail_formitems/end",
+              "name" : "end",
+              "noPrivDisplayMode" : 1,
+              "getPSAppDEField" : {
+                "name" : "END",
+                "codeName" : "End"
+              },
+              "getPSEditor" : {
+                "dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
+                "editorParams" : {
+                  "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
+                },
+                "editorType" : "DATEPICKER",
+                "editorWidth" : 160.0,
+                "name" : "end"
+              },
+              "getPSLayoutPos" : {
+                "colMD" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "rTMOSFilePath" : "psdeformdetail_formitems/end",
+              "valueFormat" : "YYYY-MM-DD HH:mm:ss",
+              "allowEmpty" : false,
+              "showCaption" : true
             } ],
             "getPSLayout" : {
               "childColLG" : -1,

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

@@ -3594,14 +3594,34 @@
                     "name" : "CREATEMAN",
                     "codeName" : "CreateMan"
                   }
+                }, {
+                  "id" : "money",
+                  "dataType" : 6,
+                  "getPSAppDEField" : {
+                    "name" : "MONEY",
+                    "codeName" : "Money"
+                  }
                 }, {
                   "id" : "phoneid",
-                  "hidden" : true,
                   "dataType" : 25,
                   "getPSAppDEField" : {
                     "name" : "PHONEID",
                     "codeName" : "PhoneId"
                   }
+                }, {
+                  "id" : "orgid",
+                  "dataType" : 25,
+                  "getPSAppDEField" : {
+                    "name" : "ORGID",
+                    "codeName" : "OrgId"
+                  }
+                }, {
+                  "id" : "end",
+                  "dataType" : 5,
+                  "getPSAppDEField" : {
+                    "name" : "END",
+                    "codeName" : "End"
+                  }
                 } ],
                 "getPSDEFormPages" : [ {
                   "codeName" : "formpage1",
@@ -3696,6 +3716,129 @@
                     "rTMOSFilePath" : "psdeformdetail_grouppanels/grouppanel1",
                     "infoGroupMode" : false,
                     "showCaption" : true
+                  }, {
+                    "caption" : "金额",
+                    "codeName" : "money",
+                    "dataType" : 6,
+                    "detailStyle" : "DEFAULT",
+                    "detailType" : "FORMITEM",
+                    "enableCond" : 3,
+                    "ignoreInput" : 0,
+                    "labelPos" : "LEFT",
+                    "labelWidth" : 130,
+                    "mOSFilePath" : "psdeformdetail_formitems/money",
+                    "name" : "money",
+                    "noPrivDisplayMode" : 1,
+                    "getPSAppDEField" : {
+                      "name" : "MONEY",
+                      "codeName" : "Money"
+                    },
+                    "getPSEditor" : {
+                      "editorType" : "TEXTBOX",
+                      "name" : "money"
+                    },
+                    "getPSLayoutPos" : {
+                      "colMD" : 24,
+                      "layout" : "TABLE_24COL"
+                    },
+                    "rTMOSFilePath" : "psdeformdetail_formitems/money",
+                    "unitName" : "元",
+                    "allowEmpty" : true,
+                    "enableUnitName" : true,
+                    "showCaption" : true
+                  }, {
+                    "caption" : "手机标识",
+                    "codeName" : "phoneid",
+                    "dataType" : 25,
+                    "detailStyle" : "DEFAULT",
+                    "detailType" : "FORMITEM",
+                    "enableCond" : 3,
+                    "ignoreInput" : 0,
+                    "labelPos" : "LEFT",
+                    "labelWidth" : 130,
+                    "mOSFilePath" : "psdeformdetail_formitems/phoneid",
+                    "name" : "phoneid",
+                    "noPrivDisplayMode" : 1,
+                    "getPSAppDEField" : {
+                      "name" : "PHONEID",
+                      "codeName" : "PhoneId"
+                    },
+                    "getPSEditor" : {
+                      "editorType" : "SPAN",
+                      "name" : "phoneid",
+                      "enableLinkView" : false
+                    },
+                    "getPSLayoutPos" : {
+                      "colMD" : 24,
+                      "layout" : "TABLE_24COL"
+                    },
+                    "rTMOSFilePath" : "psdeformdetail_formitems/phoneid",
+                    "allowEmpty" : true,
+                    "showCaption" : true
+                  }, {
+                    "caption" : "组织机构标识",
+                    "codeName" : "orgid",
+                    "dataType" : 25,
+                    "detailStyle" : "DEFAULT",
+                    "detailType" : "FORMITEM",
+                    "enableCond" : 3,
+                    "ignoreInput" : 0,
+                    "labelPos" : "LEFT",
+                    "labelWidth" : 130,
+                    "mOSFilePath" : "psdeformdetail_formitems/orgid",
+                    "name" : "orgid",
+                    "noPrivDisplayMode" : 1,
+                    "getPSAppDEField" : {
+                      "name" : "ORGID",
+                      "codeName" : "OrgId"
+                    },
+                    "getPSEditor" : {
+                      "editorType" : "TEXTBOX",
+                      "maxLength" : 60,
+                      "name" : "orgid"
+                    },
+                    "getPSLayoutPos" : {
+                      "colMD" : 24,
+                      "layout" : "TABLE_24COL"
+                    },
+                    "rTMOSFilePath" : "psdeformdetail_formitems/orgid",
+                    "allowEmpty" : true,
+                    "showCaption" : true
+                  }, {
+                    "caption" : "结束时间",
+                    "codeName" : "end",
+                    "dataType" : 5,
+                    "detailStyle" : "DEFAULT",
+                    "detailType" : "FORMITEM",
+                    "enableCond" : 3,
+                    "ignoreInput" : 0,
+                    "itemWidth" : 290.0,
+                    "labelPos" : "LEFT",
+                    "labelWidth" : 130,
+                    "mOSFilePath" : "psdeformdetail_formitems/end",
+                    "name" : "end",
+                    "noPrivDisplayMode" : 1,
+                    "getPSAppDEField" : {
+                      "name" : "END",
+                      "codeName" : "End"
+                    },
+                    "getPSEditor" : {
+                      "dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
+                      "editorParams" : {
+                        "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
+                      },
+                      "editorType" : "DATEPICKER",
+                      "editorWidth" : 160.0,
+                      "name" : "end"
+                    },
+                    "getPSLayoutPos" : {
+                      "colMD" : 24,
+                      "layout" : "TABLE_24COL"
+                    },
+                    "rTMOSFilePath" : "psdeformdetail_formitems/end",
+                    "valueFormat" : "YYYY-MM-DD HH:mm:ss",
+                    "allowEmpty" : false,
+                    "showCaption" : true
                   } ],
                   "getPSLayout" : {
                     "childColLG" : -1,

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

@@ -7531,14 +7531,34 @@
                         "name" : "CREATEMAN",
                         "codeName" : "CreateMan"
                       }
+                    }, {
+                      "id" : "money",
+                      "dataType" : 6,
+                      "getPSAppDEField" : {
+                        "name" : "MONEY",
+                        "codeName" : "Money"
+                      }
                     }, {
                       "id" : "phoneid",
-                      "hidden" : true,
                       "dataType" : 25,
                       "getPSAppDEField" : {
                         "name" : "PHONEID",
                         "codeName" : "PhoneId"
                       }
+                    }, {
+                      "id" : "orgid",
+                      "dataType" : 25,
+                      "getPSAppDEField" : {
+                        "name" : "ORGID",
+                        "codeName" : "OrgId"
+                      }
+                    }, {
+                      "id" : "end",
+                      "dataType" : 5,
+                      "getPSAppDEField" : {
+                        "name" : "END",
+                        "codeName" : "End"
+                      }
                     } ],
                     "getPSDEFormPages" : [ {
                       "codeName" : "formpage1",
@@ -7633,6 +7653,129 @@
                         "rTMOSFilePath" : "psdeformdetail_grouppanels/grouppanel1",
                         "infoGroupMode" : false,
                         "showCaption" : true
+                      }, {
+                        "caption" : "金额",
+                        "codeName" : "money",
+                        "dataType" : 6,
+                        "detailStyle" : "DEFAULT",
+                        "detailType" : "FORMITEM",
+                        "enableCond" : 3,
+                        "ignoreInput" : 0,
+                        "labelPos" : "LEFT",
+                        "labelWidth" : 130,
+                        "mOSFilePath" : "psdeformdetail_formitems/money",
+                        "name" : "money",
+                        "noPrivDisplayMode" : 1,
+                        "getPSAppDEField" : {
+                          "name" : "MONEY",
+                          "codeName" : "Money"
+                        },
+                        "getPSEditor" : {
+                          "editorType" : "TEXTBOX",
+                          "name" : "money"
+                        },
+                        "getPSLayoutPos" : {
+                          "colMD" : 24,
+                          "layout" : "TABLE_24COL"
+                        },
+                        "rTMOSFilePath" : "psdeformdetail_formitems/money",
+                        "unitName" : "元",
+                        "allowEmpty" : true,
+                        "enableUnitName" : true,
+                        "showCaption" : true
+                      }, {
+                        "caption" : "手机标识",
+                        "codeName" : "phoneid",
+                        "dataType" : 25,
+                        "detailStyle" : "DEFAULT",
+                        "detailType" : "FORMITEM",
+                        "enableCond" : 3,
+                        "ignoreInput" : 0,
+                        "labelPos" : "LEFT",
+                        "labelWidth" : 130,
+                        "mOSFilePath" : "psdeformdetail_formitems/phoneid",
+                        "name" : "phoneid",
+                        "noPrivDisplayMode" : 1,
+                        "getPSAppDEField" : {
+                          "name" : "PHONEID",
+                          "codeName" : "PhoneId"
+                        },
+                        "getPSEditor" : {
+                          "editorType" : "SPAN",
+                          "name" : "phoneid",
+                          "enableLinkView" : false
+                        },
+                        "getPSLayoutPos" : {
+                          "colMD" : 24,
+                          "layout" : "TABLE_24COL"
+                        },
+                        "rTMOSFilePath" : "psdeformdetail_formitems/phoneid",
+                        "allowEmpty" : true,
+                        "showCaption" : true
+                      }, {
+                        "caption" : "组织机构标识",
+                        "codeName" : "orgid",
+                        "dataType" : 25,
+                        "detailStyle" : "DEFAULT",
+                        "detailType" : "FORMITEM",
+                        "enableCond" : 3,
+                        "ignoreInput" : 0,
+                        "labelPos" : "LEFT",
+                        "labelWidth" : 130,
+                        "mOSFilePath" : "psdeformdetail_formitems/orgid",
+                        "name" : "orgid",
+                        "noPrivDisplayMode" : 1,
+                        "getPSAppDEField" : {
+                          "name" : "ORGID",
+                          "codeName" : "OrgId"
+                        },
+                        "getPSEditor" : {
+                          "editorType" : "TEXTBOX",
+                          "maxLength" : 60,
+                          "name" : "orgid"
+                        },
+                        "getPSLayoutPos" : {
+                          "colMD" : 24,
+                          "layout" : "TABLE_24COL"
+                        },
+                        "rTMOSFilePath" : "psdeformdetail_formitems/orgid",
+                        "allowEmpty" : true,
+                        "showCaption" : true
+                      }, {
+                        "caption" : "结束时间",
+                        "codeName" : "end",
+                        "dataType" : 5,
+                        "detailStyle" : "DEFAULT",
+                        "detailType" : "FORMITEM",
+                        "enableCond" : 3,
+                        "ignoreInput" : 0,
+                        "itemWidth" : 290.0,
+                        "labelPos" : "LEFT",
+                        "labelWidth" : 130,
+                        "mOSFilePath" : "psdeformdetail_formitems/end",
+                        "name" : "end",
+                        "noPrivDisplayMode" : 1,
+                        "getPSAppDEField" : {
+                          "name" : "END",
+                          "codeName" : "End"
+                        },
+                        "getPSEditor" : {
+                          "dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
+                          "editorParams" : {
+                            "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
+                          },
+                          "editorType" : "DATEPICKER",
+                          "editorWidth" : 160.0,
+                          "name" : "end"
+                        },
+                        "getPSLayoutPos" : {
+                          "colMD" : 24,
+                          "layout" : "TABLE_24COL"
+                        },
+                        "rTMOSFilePath" : "psdeformdetail_formitems/end",
+                        "valueFormat" : "YYYY-MM-DD HH:mm:ss",
+                        "allowEmpty" : false,
+                        "showCaption" : true
                       } ],
                       "getPSLayout" : {
                         "childColLG" : -1,
@@ -16450,94 +16593,6 @@
           "id" : "FORM"
         },
         "getPSDEFormItemVRs" : [ {
-          "checkMode" : 3,
-          "name" : "表单项值规则",
-          "getPSDEFValueRule" : {
-            "codeName" : "ValueRule7",
-            "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
-            "name" : "field6值规则",
-            "getPSDEFVRGroupCondition" : {
-              "condOp" : "AND",
-              "condType" : "GROUP",
-              "name" : "默认组",
-              "getPSDEFVRConditions" : [ {
-                "condOp" : "AND",
-                "condType" : "GROUP",
-                "name" : "[条件组]AND",
-                "getPSDEFVRConditions" : [ {
-                  "condOp" : "NOTEQ",
-                  "condType" : "SIMPLE",
-                  "dEFName" : "FIELD6",
-                  "name" : "[常规条件] 不等于(<>) (20)",
-                  "paramValue" : "20"
-                }, {
-                  "condOp" : "GT",
-                  "condType" : "SIMPLE",
-                  "dEFName" : "FIELD6",
-                  "name" : "[常规条件] 大于(>) (5)",
-                  "paramValue" : "5"
-                } ],
-                "ruleInfo" : ">5并且不等于20"
-              } ],
-              "ruleInfo" : ">5并且不等于20"
-            },
-            "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
-            "ruleInfo" : ">5并且不等于20",
-            "checkDefault" : false,
-            "defaultMode" : false,
-            "enableBackend" : true,
-            "enableFront" : true
-          },
-          "getPSDEFormItemName" : "field6",
-          "valueRuleType" : "DEFVALUERULE"
-        }, {
-          "checkMode" : 3,
-          "name" : "表单项值规则",
-          "getPSDEFValueRule" : {
-            "codeName" : "ValueRule8",
-            "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD7/psdefvaluerules/ValueRule8",
-            "name" : "field7值规则",
-            "getPSDEFVRGroupCondition" : {
-              "condOp" : "AND",
-              "condType" : "GROUP",
-              "name" : "默认组",
-              "getPSDEFVRConditions" : [ {
-                "condOp" : "OR",
-                "condType" : "GROUP",
-                "name" : "[条件组]OR",
-                "getPSDEFVRConditions" : [ {
-                  "condType" : "VALUERANGE2",
-                  "dEFName" : "FIELD7",
-                  "maxValue" : 20.0,
-                  "minValue" : 10.0,
-                  "name" : "[数值范围] 大于等于 10.0 且  小于等于 20.0",
-                  "ruleInfo" : "数值必须大于等于[10.0]且小于等于[20.0]",
-                  "includeMaxValue" : true,
-                  "includeMinValue" : true
-                }, {
-                  "condType" : "VALUERANGE2",
-                  "dEFName" : "FIELD7",
-                  "maxValue" : 40.0,
-                  "minValue" : 30.0,
-                  "name" : "[数值范围] 大于等于 30.0 且  小于等于 40.0",
-                  "ruleInfo" : "数值必须大于等于[30.0]且小于等于[40.0]",
-                  "includeMaxValue" : true,
-                  "includeMinValue" : true
-                } ],
-                "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])"
-              } ],
-              "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])"
-            },
-            "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD7/psdefvaluerules/ValueRule8",
-            "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])",
-            "checkDefault" : false,
-            "defaultMode" : false,
-            "enableBackend" : true,
-            "enableFront" : true
-          },
-          "getPSDEFormItemName" : "field7",
-          "valueRuleType" : "DEFVALUERULE"
-        }, {
           "checkMode" : 3,
           "name" : "表单项值规则",
           "getPSDEFValueRule" : {
@@ -16804,6 +16859,94 @@
           },
           "getPSDEFormItemName" : "field8",
           "valueRuleType" : "DEFVALUERULE"
+        }, {
+          "checkMode" : 3,
+          "name" : "表单项值规则",
+          "getPSDEFValueRule" : {
+            "codeName" : "ValueRule7",
+            "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
+            "name" : "field6值规则",
+            "getPSDEFVRGroupCondition" : {
+              "condOp" : "AND",
+              "condType" : "GROUP",
+              "name" : "默认组",
+              "getPSDEFVRConditions" : [ {
+                "condOp" : "AND",
+                "condType" : "GROUP",
+                "name" : "[条件组]AND",
+                "getPSDEFVRConditions" : [ {
+                  "condOp" : "NOTEQ",
+                  "condType" : "SIMPLE",
+                  "dEFName" : "FIELD6",
+                  "name" : "[常规条件] 不等于(<>) (20)",
+                  "paramValue" : "20"
+                }, {
+                  "condOp" : "GT",
+                  "condType" : "SIMPLE",
+                  "dEFName" : "FIELD6",
+                  "name" : "[常规条件] 大于(>) (5)",
+                  "paramValue" : "5"
+                } ],
+                "ruleInfo" : ">5并且不等于20"
+              } ],
+              "ruleInfo" : ">5并且不等于20"
+            },
+            "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
+            "ruleInfo" : ">5并且不等于20",
+            "checkDefault" : false,
+            "defaultMode" : false,
+            "enableBackend" : true,
+            "enableFront" : true
+          },
+          "getPSDEFormItemName" : "field6",
+          "valueRuleType" : "DEFVALUERULE"
+        }, {
+          "checkMode" : 3,
+          "name" : "表单项值规则",
+          "getPSDEFValueRule" : {
+            "codeName" : "ValueRule8",
+            "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD7/psdefvaluerules/ValueRule8",
+            "name" : "field7值规则",
+            "getPSDEFVRGroupCondition" : {
+              "condOp" : "AND",
+              "condType" : "GROUP",
+              "name" : "默认组",
+              "getPSDEFVRConditions" : [ {
+                "condOp" : "OR",
+                "condType" : "GROUP",
+                "name" : "[条件组]OR",
+                "getPSDEFVRConditions" : [ {
+                  "condType" : "VALUERANGE2",
+                  "dEFName" : "FIELD7",
+                  "maxValue" : 20.0,
+                  "minValue" : 10.0,
+                  "name" : "[数值范围] 大于等于 10.0 且  小于等于 20.0",
+                  "ruleInfo" : "数值必须大于等于[10.0]且小于等于[20.0]",
+                  "includeMaxValue" : true,
+                  "includeMinValue" : true
+                }, {
+                  "condType" : "VALUERANGE2",
+                  "dEFName" : "FIELD7",
+                  "maxValue" : 40.0,
+                  "minValue" : 30.0,
+                  "name" : "[数值范围] 大于等于 30.0 且  小于等于 40.0",
+                  "ruleInfo" : "数值必须大于等于[30.0]且小于等于[40.0]",
+                  "includeMaxValue" : true,
+                  "includeMinValue" : true
+                } ],
+                "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])"
+              } ],
+              "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])"
+            },
+            "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD7/psdefvaluerules/ValueRule8",
+            "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])",
+            "checkDefault" : false,
+            "defaultMode" : false,
+            "enableBackend" : true,
+            "enableFront" : true
+          },
+          "getPSDEFormItemName" : "field7",
+          "valueRuleType" : "DEFVALUERULE"
         } ],
         "getPSDEFormItems" : [ {
           "id" : "srfupdatedate",