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

ca982baf · ibizdev · af10f3ec · ca982baf · ca982baf · ca982baf
--- a/app_Web/packages/ibiz-vue/src/components/layout/app-default-layout/app-default-indexview-layout/app-default-indexview-layout.tsx
+++ b/app_Web/packages/ibiz-vue/src/components/layout/app-default-layout/app-default-indexview-layout/app-default-indexview-layout.tsx
@@ -203,8 +203,8 @@ export class AppDefaultIndexViewLayout extends AppDefaultViewLayout {
                        </div>
                        <div class="header-right" style="display: flex;align-items: center;justify-content: space-between;">
                            <app-header-menus />
-                            <app-lang title={this.model.srfTitle || this.model.srfCaption} style='font-size: 15px;padding: 0 10px;' />
+                            { this.Environment.showLang && <app-lang title={this.model.srfTitle || this.model.srfCaption} style='font-size: 15px;padding: 0 10px;' /> }
-                            <app-orgsector />
+                            { this.Environment.showOrg && <app-orgsector /> }
                            <app-user viewStyle={this.viewInstance.viewStyle} />
                            <app-message-popover />
                        </div>
@@ -250,8 +250,8 @@ export class AppDefaultIndexViewLayout extends AppDefaultViewLayout {
                    </div>
                    <div class="header-right" style="display: flex;align-items: center;justify-content: space-between;">
                        <app-header-menus />
-                        <app-lang title={this.model.srfTitle || this.model.srfCaption} style='font-size: 15px;padding: 0 10px;' />
+                        { this.Environment.showLang && <app-lang title={this.model.srfTitle || this.model.srfCaption} style='font-size: 15px;padding: 0 10px;' />}
-                        <app-orgsector />
+                        { this.Environment.showOrg && <app-orgsector /> }
                        <app-user viewStyle={this.viewInstance.viewStyle} />
                        <app-message-popover />
                    </div>
@@ -294,8 +294,8 @@ export class AppDefaultIndexViewLayout extends AppDefaultViewLayout {
                    </div>
                    <div class="header-right" style="display: flex;align-items: center;justify-content: space-between;">
                        <app-header-menus />
-                        <app-lang title={this.model.srfTitle || this.model.srfCaption} style='font-size: 15px;padding: 0 10px;'></app-lang>
+                        {this.Environment.showLang && <app-lang title={this.model.srfTitle || this.model.srfCaption} style='font-size: 15px;padding: 0 10px;'></app-lang>}
-                        <app-orgsector></app-orgsector>
+                        { this.Environment.showOrg && <app-orgsector /> }
                        <app-user viewStyle={this.viewInstance.viewStyle}></app-user>
                        <app-message-popover></app-message-popover>
                    </div>

--- a/app_Web/packages/ibiz-vue/src/widgets/expbar-control-base.tsx
+++ b/app_Web/packages/ibiz-vue/src/widgets/expbar-control-base.tsx
@@ -478,11 +478,17 @@ export class ExpBarControlBase extends MainControlBase implements ExpBarControlI
        if (!quickGroupSearch && !this.controlInstance.showTitleBar && !this.controlInstance.enableSearch && !(this.toolbarModels && this.toolbarModels.length)) {
            return null;
        }
+        const image = this.controlInstance.M.getPSSysImage;
        return (
            <div class="expbarcontrol-header">
                {this.controlInstance.showTitleBar ?
                    <div class="caption">
-                        <icon type="ios-home-outline" />
+                        {
+                            image ? 
+                            image.imagePath ? <img src={image.imagePath}/> : 
+                            image.cssClass ? <i class={image.cssClass}></i> : null :
+                            <icon type="ios-home-outline" />
+                        }
                        <span class="text">{this.$tl(this.controlInstance.getTitlePSLanguageRes()?.lanResTag, this.controlInstance.title)}</span>
                    </div> : null}
                {quickGroupSearch ? quickGroupSearch : null}

--- a/app_Web/src/environments/environment.ts
+++ b/app_Web/src/environments/environment.ts
@@ -100,7 +100,11 @@ export const Environment = {
    // 是否提示所有的字段的错误信息
    noticeAllFieldsError: Boolean(process.env.VUE_APP_NOTICEALLFIELDSERROR === "true"),
    // 系统默认的最大导出个数
-    exportMaxRowCount:Number(process.env.VUE_APP_EXPORTMAXROWCOUNT)
+    exportMaxRowCount:Number(process.env.VUE_APP_EXPORTMAXROWCOUNT),
+    // 应用是否显示多语言
+    showLang: true,
+    // 应用是否显示组织
+    showOrg: true,
 };
 // 挂载外部配置文件
 if ((window as any).Environment) {

--- a/app_Web/src/styles/default.less
+++ b/app_Web/src/styles/default.less
@@ -483,7 +483,7 @@ html, body{
    padding-left: 16px;
    >.view-container.view-default.viewcontainer2 {
      margin: 0;
-      height: 100%;
+      height: 100% !important;
      width: 100%;
    }
  }
@@ -508,7 +508,7 @@ html, body{
  //  导航部件头部
  .expbarcontrol-header {
    display: flex;
-    min-height: 41px;
+    min-height: 43px;
    padding-bottom: 4px;
    border-bottom: 1px solid #E4E4E4;
    align-items: center;
@@ -545,7 +545,7 @@ html, body{
  }
  .expbarcontrol-header + .expbarcontrol-xdata-ctrl {
    padding-top: 8px;
-    max-height: calc(100% - 41px);
+    max-height: calc(100% - 43px);
  }
 }

--- a/trainsys-core/src/main/resources/liquibase/h2_table.xml
+++ b/trainsys-core/src/main/resources/liquibase/h2_table.xml
@@ -2,7 +2,7 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
    <!--输出实体[BXD]数据结构 -->
-    <changeSet author="root" id="tab-bxd-26-1">
+    <changeSet author="root" id="tab-bxd-27-1">
        <createTable tableName="T_BXD">
                <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                </column>
@@ -50,7 +50,7 @@
    </changeSet>
    <!--输出实体[BOOK]数据结构 -->
-    <changeSet author="root" id="tab-book-214-3">
+    <changeSet author="root" id="tab-book-215-3">
        <createTable tableName="T_BOOK">
                <column name="BOOKNAME" remarks="" type="VARCHAR(200)">
                </column>

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/EditorTest.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/EditorTest.json
@@ -726,7 +726,7 @@
          },
          "getPSAppDataEntity" : {
            "modelref" : true,
-            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/RawMaterial.json"
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
          },
          "getPickupPSAppView" : {
            "modelref" : true,
@@ -920,12 +920,12 @@
          },
          "getPSAppDataEntity" : {
            "modelref" : true,
-            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/RawMaterial.json"
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
          },
          "getPickupPSAppView" : {
            "modelref" : true,
-            "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BookTypeGridView.json",
+            "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXDMPickupView.json",
-            "viewType" : "DEGRIDVIEW"
+            "viewType" : "DEMPICKUPVIEW"
          },
          "valueItemName" : "field16",
          "enableAC" : false,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/BXDMPickupView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/BXDMPickupView.json
+{
+  "accUserMode" : 2,
+  "caption" : "报销单",
+  "codeName" : "BXDMPickupView",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXDMPickupView.json",
+  "funcViewMode" : "MPICKUPVIEW",
+  "name" : "BXDMPickupView",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
+  },
+  "getPSAppViewEngines" : [ {
+    "engineCat" : "VIEW",
+    "engineType" : "MPickupView",
+    "name" : "engine",
+    "getPSUIEngineParams" : [ {
+      "ctrlName" : "pickupviewpanel",
+      "name" : "PICKUPVIEWPANEL",
+      "paramType" : "CTRL"
+    } ]
+  } ],
+  "getPSControls" : [ {
+    "codeName" : "MPickupViewpickupviewpanel",
+    "controlType" : "PICKUPVIEWPANEL",
+    "getEmbeddedPSAppDEView" : {
+      "accUserMode" : 2,
+      "caption" : "报销单",
+      "codeName" : "BXDPickupGridView",
+      "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXDPickupGridView.json",
+      "gridRowActiveMode" : 2,
+      "name" : "BXDPickupGridView",
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
+      },
+      "getPSAppViewEngines" : [ {
+        "engineCat" : "VIEW",
+        "engineType" : "PickupGridView",
+        "name" : "engine",
+        "getPSUIEngineParams" : [ {
+          "ctrlName" : "grid",
+          "name" : "GRID",
+          "paramType" : "CTRL"
+        }, {
+          "ctrlName" : "searchform",
+          "name" : "SEARCHFORM",
+          "paramType" : "CTRL"
+        } ]
+      } ],
+      "getPSControls" : [ {
+        "aggMode" : "NONE",
+        "codeName" : "Main",
+        "columnEnableLink" : 2,
+        "controlType" : "GRID",
+        "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD/PSGRIDS/Main.json",
+        "getFetchPSControlAction" : {
+          "modelref" : true,
+          "id" : "fetch"
+        },
+        "groupMode" : "NONE",
+        "hookEventNames" : [ "ROWDBLCLICK", "SELECTIONCHANGE", "LOAD", "BEFORELOAD" ],
+        "logicName" : "主表格",
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
+        },
+        "getPSControlHandler" : {
+          "getPSHandlerActions" : [ {
+            "actionName" : "Get",
+            "actionType" : "DEACTION",
+            "dataAccessAction" : "READ",
+            "name" : "load",
+            "getPSAppDEMethod" : {
+              "modelref" : true,
+              "id" : "Get"
+            },
+            "getPSAppDataEntity" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
+            }
+          }, {
+            "actionName" : "Create",
+            "actionType" : "DEACTION",
+            "dataAccessAction" : "CREATE",
+            "name" : "create",
+            "getPSAppDEMethod" : {
+              "modelref" : true,
+              "id" : "Create"
+            },
+            "getPSAppDataEntity" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
+            }
+          }, {
+            "actionName" : "Update",
+            "actionType" : "DEACTION",
+            "dataAccessAction" : "UPDATE",
+            "name" : "update",
+            "getPSAppDEMethod" : {
+              "modelref" : true,
+              "id" : "Update"
+            },
+            "getPSAppDataEntity" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
+            }
+          }, {
+            "actionName" : "Remove",
+            "actionType" : "DEACTION",
+            "dataAccessAction" : "DELETE",
+            "name" : "remove",
+            "getPSAppDEMethod" : {
+              "modelref" : true,
+              "id" : "Remove"
+            },
+            "getPSAppDataEntity" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
+            }
+          }, {
+            "actionName" : "GetDraft",
+            "actionType" : "DEACTION",
+            "dataAccessAction" : "CREATE",
+            "name" : "loaddraft",
+            "getPSAppDEMethod" : {
+              "modelref" : true,
+              "id" : "GetDraft"
+            },
+            "getPSAppDataEntity" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
+            }
+          }, {
+            "actionType" : "DEDATASET",
+            "name" : "fetch",
+            "getPSAppDEMethod" : {
+              "modelref" : true,
+              "id" : "FetchDefault"
+            },
+            "getPSAppDataEntity" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
+            }
+          } ],
+          "userDRAction" : "READ",
+          "enableDEFieldPrivilege" : false,
+          "id" : "数据表格处理器"
+        },
+        "getPSControlLogics" : [ {
+          "eventNames" : "ROWDBLCLICK;SELECTIONCHANGE;LOAD;BEFORELOAD",
+          "logicTag" : "grid",
+          "logicType" : "APPVIEWENGINE",
+          "name" : "engine_grid",
+          "getPSAppViewEngine" : {
+            "modelref" : true,
+            "id" : "engine"
+          }
+        } ],
+        "getPSControlParam" : {
+          "autoLoad" : true,
+          "showBusyIndicator" : true,
+          "id" : "GRID"
+        },
+        "getPSDEGridColumns" : [ {
+          "align" : "LEFT",
+          "cLConvertMode" : "NONE",
+          "caption" : "报销单名称",
+          "codeName" : "bxdname",
+          "columnType" : "DEFGRIDCOLUMN",
+          "dataItemName" : "bxdname",
+          "excelCaption" : "报销单名称",
+          "name" : "bxdname",
+          "noPrivDisplayMode" : 1,
+          "getPSAppDEField" : {
+            "name" : "BXDNAME",
+            "codeName" : "BXDName"
+          },
+          "width" : 150,
+          "widthUnit" : "PX",
+          "enableSort" : true
+        }, {
+          "align" : "LEFT",
+          "cLConvertMode" : "FRONT",
+          "caption" : "更新人",
+          "codeName" : "updateman",
+          "columnType" : "DEFGRIDCOLUMN",
+          "dataItemName" : "updateman",
+          "excelCaption" : "更新人",
+          "name" : "updateman",
+          "noPrivDisplayMode" : 1,
+          "getPSAppCodeList" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+          },
+          "getPSAppDEField" : {
+            "name" : "UPDATEMAN",
+            "codeName" : "UpdateMan"
+          },
+          "width" : 150,
+          "widthUnit" : "PX",
+          "enableSort" : true
+        }, {
+          "align" : "LEFT",
+          "cLConvertMode" : "NONE",
+          "caption" : "更新时间",
+          "codeName" : "updatedate",
+          "columnType" : "DEFGRIDCOLUMN",
+          "dataItemName" : "updatedate",
+          "excelCaption" : "更新时间",
+          "name" : "updatedate",
+          "noPrivDisplayMode" : 1,
+          "getPSAppDEField" : {
+            "name" : "UPDATEDATE",
+            "codeName" : "UpdateDate"
+          },
+          "valueFormat" : "YYYY-MM-DD HH:mm:ss",
+          "width" : 150,
+          "widthUnit" : "PX",
+          "enableSort" : true
+        } ],
+        "getPSDEGridDataItems" : [ {
+          "dataType" : 25,
+          "name" : "bxdname",
+          "getPSAppDEField" : {
+            "name" : "BXDNAME",
+            "codeName" : "BXDName"
+          }
+        }, {
+          "dataType" : 25,
+          "name" : "updateman",
+          "getPSAppDEField" : {
+            "name" : "UPDATEMAN",
+            "codeName" : "UpdateMan"
+          }
+        }, {
+          "format" : "YYYY-MM-DD HH:mm:ss",
+          "dataType" : 5,
+          "name" : "updatedate",
+          "getPSAppDEField" : {
+            "name" : "UPDATEDATE",
+            "codeName" : "UpdateDate"
+          }
+        }, {
+          "dataType" : 25,
+          "name" : "srfkey",
+          "getPSAppDEField" : {
+            "name" : "BXDID",
+            "codeName" : "BXDId"
+          }
+        }, {
+          "dataType" : 25,
+          "name" : "srfdataaccaction",
+          "getPSAppDEField" : {
+            "name" : "BXDID",
+            "codeName" : "BXDId"
+          },
+          "dataAccessAction" : true
+        }, {
+          "dataType" : 25,
+          "name" : "srfmajortext",
+          "getPSAppDEField" : {
+            "name" : "BXDNAME",
+            "codeName" : "BXDName"
+          }
+        } ],
+        "getPSDEGridEditItems" : [ {
+          "caption" : "报销单标识",
+          "codeName" : "srfkey",
+          "enableCond" : 3,
+          "ignoreInput" : 0,
+          "name" : "srfkey",
+          "getPSAppDEField" : {
+            "name" : "BXDID",
+            "codeName" : "BXDId"
+          },
+          "getPSEditor" : {
+            "editorType" : "HIDDEN",
+            "name" : "srfkey"
+          },
+          "allowEmpty" : true
+        } ],
+        "pagingSize" : 20,
+        "getRemovePSControlAction" : {
+          "actionName" : "Remove",
+          "actionType" : "DEACTION",
+          "dataAccessAction" : "DELETE",
+          "name" : "remove",
+          "getPSAppDEMethod" : {
+            "modelref" : true,
+            "id" : "Remove"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
+          }
+        },
+        "sortMode" : "REMOTE",
+        "hasWFDataItems" : false,
+        "enableColFilter" : false,
+        "enableCustomized" : true,
+        "enableGroup" : false,
+        "enablePagingBar" : true,
+        "enableRowEdit" : false,
+        "enableRowEditOrder" : false,
+        "enableRowNew" : false,
+        "forceFit" : false,
+        "hideHeader" : false,
+        "noSort" : false,
+        "singleSelect" : false,
+        "name" : "grid",
+        "modelid" : "98ba679ad55e0158cfe05ceeaba42795",
+        "modeltype" : "PSDEGRID"
+      }, {
+        "codeName" : "Default",
+        "controlType" : "SEARCHFORM",
+        "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD/PSSEARCHFORMS/Default.json",
+        "hookEventNames" : [ "SEARCH", "LOAD", "SAVE" ],
+        "logicName" : "默认搜索表单",
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
+        },
+        "getPSControlHandler" : {
+          "getPSHandlerActions" : [ {
+            "actionType" : "FILTERACTION",
+            "name" : "load",
+            "getPSAppDEMethod" : {
+              "modelref" : true,
+              "id" : "FilterGet"
+            },
+            "getPSAppDataEntity" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
+            }
+          }, {
+            "actionType" : "FILTERACTION",
+            "name" : "loaddraft",
+            "getPSAppDEMethod" : {
+              "modelref" : true,
+              "id" : "FilterGetDraft"
+            },
+            "getPSAppDataEntity" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
+            }
+          }, {
+            "actionType" : "FILTERACTION",
+            "name" : "search",
+            "getPSAppDEMethod" : {
+              "modelref" : true,
+              "id" : "FilterSearch"
+            },
+            "getPSAppDataEntity" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
+            }
+          } ],
+          "enableDEFieldPrivilege" : false,
+          "id" : "搜索表单处理器"
+        },
+        "getPSControlLogics" : [ {
+          "eventNames" : "SEARCH;LOAD;SAVE",
+          "logicTag" : "searchform",
+          "logicType" : "APPVIEWENGINE",
+          "name" : "engine_searchform",
+          "getPSAppViewEngine" : {
+            "modelref" : true,
+            "id" : "engine"
+          }
+        } ],
+        "getPSControlParam" : {
+          "autoLoad" : true,
+          "showBusyIndicator" : true,
+          "id" : "SEARCHFORM"
+        },
+        "getPSDEFormPages" : [ {
+          "caption" : "常规条件",
+          "codeName" : "formpage1",
+          "detailStyle" : "DEFAULT",
+          "detailType" : "FORMPAGE",
+          "name" : "formpage1",
+          "getPSLayout" : {
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "infoGroupMode" : false
+        } ],
+        "getPSLayout" : {
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "searchButtonStyle" : "DEFAULT",
+        "tabHeaderPos" : "TOP",
+        "enableAdvanceSearch" : false,
+        "enableAutoSearch" : false,
+        "enableFilterSave" : false,
+        "noTabHeader" : true,
+        "name" : "searchform",
+        "modelid" : "ce5e99e6323e7c001cb008d92c4873c9",
+        "modeltype" : "PSDEFORM_SEARCHFORM"
+      } ],
+      "getPSDEViewCodeName" : "PickupGridView",
+      "getPSDEViewId" : "e8137dfa56caab22167d5a2632fd0a3c",
+      "getPSViewLayoutPanel" : {
+        "codeName" : "Layoutpanel",
+        "controlStyle" : "APPDEPICKUPGRIDVIEW",
+        "controlType" : "VIEWLAYOUTPANEL",
+        "name" : "layoutpanel",
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
+        },
+        "getPSControlParam" : { },
+        "layoutBodyOnly" : true,
+        "layoutPanel" : true,
+        "useDefaultLayout" : true
+      },
+      "title" : "报销单选择表格视图",
+      "viewStyle" : "DEFAULT",
+      "viewType" : "DEPICKUPGRIDVIEW",
+      "xDataControlName" : "grid",
+      "enableDP" : true,
+      "enableExport" : true,
+      "enableFilter" : true,
+      "enableImport" : true,
+      "enableRowEdit" : false,
+      "enableSearch" : true,
+      "expandSearchForm" : true,
+      "pickupMode" : true,
+      "rowEditDefault" : false,
+      "modelid" : "4b5dfb2f75749b6eb2f6fed5ed29948e",
+      "modeltype" : "PSAPPDEVIEW"
+    },
+    "hookEventNames" : [ "SELECTIONCHANGE", "LOAD", "ACTIVATED" ],
+    "name" : "pickupviewpanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
+    },
+    "getPSControlLogics" : [ {
+      "eventNames" : "SELECTIONCHANGE;LOAD;ACTIVATED",
+      "logicTag" : "pickupviewpanel",
+      "logicType" : "APPVIEWENGINE",
+      "name" : "engine_pickupviewpanel",
+      "getPSAppViewEngine" : {
+        "modelref" : true,
+        "id" : "engine"
+      }
+    } ],
+    "getPSControlParam" : {
+      "id" : "PICKUPVIEWPANEL"
+    }
+  } ],
+  "getPSDEViewCodeName" : "MPickupView",
+  "getPSDEViewId" : "e10c53cd8de4d16cd35048bceaa7627b",
+  "getPSViewLayoutPanel" : {
+    "codeName" : "Layoutpanel",
+    "controlStyle" : "APPDEMPICKUPVIEW",
+    "controlType" : "VIEWLAYOUTPANEL",
+    "name" : "layoutpanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
+    },
+    "getPSControlParam" : { },
+    "layoutBodyOnly" : true,
+    "layoutPanel" : true,
+    "useDefaultLayout" : true
+  },
+  "title" : "报销单数据多项选择视图",
+  "viewStyle" : "DEFAULT",
+  "viewType" : "DEMPICKUPVIEW",
+  "enableDP" : true,
+  "showCaptionBar" : false,
+  "modelid" : "64565fb55783cef412f850fd955252ee",
+  "modeltype" : "PSAPPDEVIEW"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookEditViewEditorTest.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookEditViewEditorTest.json
@@ -847,7 +847,7 @@
            },
            "getPSAppDataEntity" : {
              "modelref" : true,
-              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/RawMaterial.json"
+              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
            },
            "getPickupPSAppView" : {
              "modelref" : true,
@@ -1041,12 +1041,12 @@
            },
            "getPSAppDataEntity" : {
              "modelref" : true,
-              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/RawMaterial.json"
+              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
            },
            "getPickupPSAppView" : {
              "modelref" : true,
-              "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BookTypeGridView.json",
+              "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXDMPickupView.json",
-              "viewType" : "DEGRIDVIEW"
+              "viewType" : "DEMPICKUPVIEW"
            },
            "valueItemName" : "field16",
            "enableAC" : false,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
@@ -1070,6 +1070,12 @@
    "viewType" : "DEDATAVIEWEXPVIEW",
    "resource" : "Book",
    "view" : "Usr0815395468DataViewExpView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXDMPickupView.json",
+    "viewType" : "DEMPICKUPVIEW",
+    "resource" : "BXD",
+    "view" : "MPickupView"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentStudentGridView.json",
@@ -4812,7 +4818,7 @@
                },
                "getPSAppDataEntity" : {
                  "modelref" : true,
-                  "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/RawMaterial.json"
+                  "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
                },
                "getPickupPSAppView" : {
                  "modelref" : true,
@@ -5006,12 +5012,12 @@
                },
                "getPSAppDataEntity" : {
                  "modelref" : true,
-                  "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/RawMaterial.json"
+                  "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
                },
                "getPickupPSAppView" : {
                  "modelref" : true,
-                  "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BookTypeGridView.json",
+                  "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXDMPickupView.json",
-                  "viewType" : "DEGRIDVIEW"
+                  "viewType" : "DEMPICKUPVIEW"
                },
                "valueItemName" : "field16",
                "enableAC" : false,