tony001 发布系统代码 [后台服务，演示应用]

app_Web/src/locale/lang/en-US.ts

@@ -651,6 +651,7 @@ function getLocaleResource(){
         'MENUITEM.CAPTION.*.EXPORTSRF': 'Export Data Model',
         'TBB.TEXT.*.EXPORT': 'Export',
         'MENUITEM.CAPTION.ENTITYKANBANVIEW': 'Entity Kanban View',
+        'CONTROL.ORDERNAME': 'Order Name',
         'MENUITEM.CAPTION.APPLICATIONFUNCTION': 'Application Function',
         'OTHER.IBIZSAMPLE0003STABEXPVIEW.TABVIEWPANEL': 'UniProduct',
         'TBB.TOOLTIP.*.STARTWF': 'Start workflow',

app_Web/src/locale/lang/zh-CN.ts

@@ -644,6 +644,7 @@ function getLocaleResource(){
         'PAGE.TITLE.WEB.APPPORTALVIEW2': '查看文本',
         'OTHER.BUTTONTSET': '测试多语言按钮',
         'MENUITEM.CAPTION.WORKBENCH': '工作台--',
+        'CONTROL.ORDERNAME': '订单名称',
         'PAGE.TITLE.WEB.PORTAL': '无内容',
         'CL.ITEM.LNAME.KIND2': '类型2',
         'CL.ITEM.LNAME.KIND1': '类型1',

app_Web/src/widgets/ibizbook/default-searchform/default-searchform-base.vue

@@ -712,7 +712,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCustomView_layout' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -748,7 +748,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public async loadDraft(opt: any = {},mode?:string): Promise<any> {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCustomView_layout' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_Web/src/widgets/ibizbook/guide-borrow-form-form/guide-borrow-form-form-base.vue

@@ -1378,7 +1378,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
      */
     public async load(opt: any = {}): Promise<any> {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1429,7 +1429,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
      */
     public async loadDraft(opt: any = {}): Promise<any> {
         if (!this.loaddraftAction) {
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1499,7 +1499,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
         const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
         if(!action){
             let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1607,7 +1607,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
             const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
             if(!action){
                 let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg, { viewparams: this.viewparams });
@@ -1815,7 +1815,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
     public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
             if(!this.removeAction){
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
                 return;
             }
             const arg: any = opt[0];

app_Web/src/widgets/ibizbook/usr4-dataview/usr4-dataview-base.vue

@@ -718,7 +718,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
      */
     public async load(opt: any = {}, isReset: boolean = false): Promise<any> {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }      
         const arg: any = {...opt};
@@ -812,7 +812,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -928,7 +928,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -936,7 +936,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizbook){

app_Web/src/widgets/ibizbook/usr4-dataview/usr4-dataview-model.ts

@@ -70,6 +70,11 @@ export default class Usr4Model {
         prop: 'n_ibizbookname_like',
         dataType: 'QUERYPARAM'
       },
+      {
+        name: 'n_price_gtandeq',
+        prop: 'n_price_gtandeq',
+        dataType: 'QUERYPARAM'
+      },
 
 
       {

app_Web/src/widgets/ibizorder/main3-form/main3-form-base.vue

@@ -6,7 +6,7 @@
     <app-form-group :uiService="appUIService" :data="transformData(data)" :manageContainerStatus="detailsModel.group1.manageContainerStatus"  :isManageContainer="detailsModel.group1.isManageContainer" @managecontainerclick="manageContainerClick('group1')" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('CONTROL.DEFORM.IBIZORDER.MAIN.GROUPPANEL.GROUP1', '订单基本信息')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
     <row>
         <i-col v-show="detailsModel.orderuid.visible" :style="{}"  :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
-    <app-form-item name='orderuid' :itemRules="this.rules().orderuid" class='' :caption="$t('DEF.LNAME.ORDERUID', '订单编号')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.orderuid.error" :isEmptyCaption="false" labelPos="LEFT">
+    <app-form-item name='orderuid' :itemRules="this.rules().orderuid" class='' :caption="$t('CONTROL.ORDERNAME', '订单编号')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.orderuid.error" :isEmptyCaption="false" labelPos="LEFT">
     <input-box 
     v-model="data.orderuid"  
     @enter="onEnter($event)"  

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZOrder/PSFORMS/Main3.json

@@ -22,7 +22,7 @@
   "hookEventNames" : [ "LOAD", "SAVE", "REMOVE" ],
   "logicName" : "表单项输入提示",
   "mOSFilePath" : "psmodules/Sample/psdataentities/IBIZORDER/psdeform_editforms/Main3",
-  "memo" : "表单项输入提示",
+  "memo" : "<p>表单项输入提示</p>",
   "getPSAppDataEntity" : {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZOrder.json"
@@ -183,12 +183,10 @@
       "name" : "group1",
       "getPSDEFormDetails" : [ {
         "getCapPSLanguageRes" : {
-          "defaultContent" : "订单编号",
-          "lanResTag" : "DEF.LNAME.ORDERUID",
-          "lanResType" : "DEF.LNAME",
-          "mOSFilePath" : "pslanguageres/Auto526",
-          "name" : "属性逻辑名称（DEF.LNAME.*）[ORDERUID]",
-          "rTMOSFilePath" : "pslanguageres/Auto526",
+          "defaultContent" : "订单名称",
+          "lanResTag" : "CONTROL.ORDERNAME",
+          "lanResType" : "CONTROL",
+          "name" : "订单名称",
           "refFlag" : true
         },
         "caption" : "订单编号",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderSF2EditView.json

@@ -88,7 +88,7 @@
     "hookEventNames" : [ "LOAD", "SAVE", "REMOVE" ],
     "logicName" : "表单项输入提示",
     "mOSFilePath" : "psmodules/Sample/psdataentities/IBIZORDER/psdeform_editforms/Main3",
-    "memo" : "表单项输入提示",
+    "memo" : "<p>表单项输入提示</p>",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZOrder.json"
@@ -357,12 +357,10 @@
         "name" : "group1",
         "getPSDEFormDetails" : [ {
           "getCapPSLanguageRes" : {
-            "defaultContent" : "订单编号",
-            "lanResTag" : "DEF.LNAME.ORDERUID",
-            "lanResType" : "DEF.LNAME",
-            "mOSFilePath" : "pslanguageres/Auto526",
-            "name" : "属性逻辑名称（DEF.LNAME.*）[ORDERUID]",
-            "rTMOSFilePath" : "pslanguageres/Auto526",
+            "defaultContent" : "订单名称",
+            "lanResTag" : "CONTROL.ORDERNAME",
+            "lanResType" : "CONTROL",
+            "name" : "订单名称",
             "refFlag" : true
           },
           "caption" : "订单编号",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPLANS/EN.json

@@ -29,6 +29,9 @@
   }, {
     "content" : "Entity Kanban View",
     "lanResTag" : "MENUITEM.CAPTION.ENTITYKANBANVIEW"
+  }, {
+    "content" : "Order Name",
+    "lanResTag" : "CONTROL.ORDERNAME"
   }, {
     "content" : "Application Function",
     "lanResTag" : "MENUITEM.CAPTION.APPLICATIONFUNCTION"

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPLANS/ZH_CN.json

@@ -8,6 +8,9 @@
   }, {
     "content" : "工作台--",
     "lanResTag" : "MENUITEM.CAPTION.WORKBENCH"
+  }, {
+    "content" : "订单名称",
+    "lanResTag" : "CONTROL.ORDERNAME"
   }, {
     "content" : "无内容",
     "lanResTag" : "PAGE.TITLE.WEB.PORTAL"

demo-boot/src/main/resources/static/remotemodel/PSSYSI18NS/DEFAULT.json

@@ -38,6 +38,12 @@
     "lanResType" : "CL.ITEM.LNAME",
     "name" : "类型3",
     "refFlag" : true
+  }, {
+    "defaultContent" : "订单名称",
+    "lanResTag" : "CONTROL.ORDERNAME",
+    "lanResType" : "CONTROL",
+    "name" : "订单名称",
+    "refFlag" : true
   }, {
     "defaultContent" : "商品库存明细",
     "lanResTag" : "DE.LNAME.IBIZSAMPLE0010",

demo-boot/src/main/resources/static/remotemodel/PSSYSLANS/EN.json

@@ -86,6 +86,9 @@
   }, {
     "content" : "Group",
     "lanResTag" : "PAGE.COMMON.CUSTOMSPDESIGNER.LOGICGROUP"
+  }, {
+    "content" : "Order Name",
+    "lanResTag" : "CONTROL.ORDERNAME"
   }, {
     "content" : "Search",
     "lanResTag" : "CONTROL.SPEX.SEARCH.TEXT"

demo-boot/src/main/resources/static/remotemodel/PSSYSLANS/ZH_CN.json

@@ -14,6 +14,9 @@
   }, {
     "content" : "上传文件视图",
     "lanResTag" : "PAGE.HEADER.UPLOADVIEW"
+  }, {
+    "content" : "订单名称",
+    "lanResTag" : "CONTROL.ORDERNAME"
   }, {
     "content" : "无内容",
     "lanResTag" : "PAGE.TITLE.WEB.PORTAL"

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

@@ -344,7 +344,7 @@
 
 
     <!--输出实体[IBIZORDER]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-960-14">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-964-14">
         <createTable tableName="T_IBIZORDER">
                 <column name="TP" remarks="" type="TEXT(1048576)">
                 </column>

demo-core/src/main/resources/liquibase/view.xml

@@ -37,7 +37,7 @@
          </createView>
      </changeSet>
         <!--输出实体[IBIZORDER]视图结构信息 runOnChange="true"  当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
-     <changeSet author="a_LAB01_df847bdfd" id="view-ibizorder-960-8" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizorder-964-8" runOnChange="true">
          <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZORDER">
                <![CDATA[ SELECT t1.[AMOUNT], t1.[CREATEDATE], t1.[CREATEMAN], t1.[DETAILNUM], t1.[IBIZCUSTOMERID], t11.[IBIZCUSTOMERNAME], t1.[IBIZORDERID], t1.[IBIZORDERNAME], t1.[MEMO], t1.[ORDERSTATE], t1.[ORDERTIME], t1.[ORDERTYPE], t1.[ORDERUID], t1.[UPDATEDATE], t1.[UPDATEMAN], t1.[WFINSTANCEID], t1.[WFSTATE], t1.[WFSTEP] FROM [T_IBIZORDER] t1  LEFT JOIN T_IBIZCUSTOMER t11 ON t1.IBIZCUSTOMERID = t11.IBIZCUSTOMERID  ]]>
          </createView>