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

app_Web/src/engine/view/md-view-engine.ts

@@ -404,19 +404,9 @@ export default class MDViewEngine extends ViewEngine {
         if (this.getSearchForm()) {
             Object.assign(arg, this.getSearchForm().getData());
         }
-        if (this.view && this.view.$refs.searchbar) {
-            Object.assign(arg, this.view.$refs.searchbar.getData());
-        }
-        if (this.view) {
-            //  开启自定义面板时忽略是否展开搜索表单
-            if (this.view.layoutModelDetails) {
-                const quickSearchBar = Object.values(this.view.layoutModelDetails).find((item: any) => item.name.toLowerCase() === 'quicksearchbar');
-                if (quickSearchBar) {
-                    Object.assign(arg, { query: this.view.query });
-                }
-            } else if (!this.view.isExpandSearchForm) {
-                Object.assign(arg, { query: this.view.query });
-            }
+        // 快速搜索
+        if (this.view && this.view.query) {
+            Object.assign(arg, { query: this.view.query });
         }
         // 快速分组和快速搜索栏
         let otherQueryParam:any = {};
@@ -426,6 +416,10 @@ export default class MDViewEngine extends ViewEngine {
         if(this.view && this.view.quickFormData){
             Object.assign(otherQueryParam,this.view.quickFormData);
         }
+        // 搜索栏值
+        if (this.view && this.view.$refs.searchbar) {
+            Object.assign(otherQueryParam, this.view.$refs.searchbar.getData());
+        }
         Object.assign(arg,{viewparams:otherQueryParam});
     }
 

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: 'IBIZBOOKUsr4ListView_layout' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr5DataView' + (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: 'IBIZBOOKUsr4ListView_layout' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr5DataView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_Web/src/widgets/ibizorder/searchbar-searchbar/searchbar-searchbar-base.vue

@@ -4,13 +4,12 @@
             <template slot-scope="{ data }">
                 <template v-if="Object.is(data.editor, 'filter')">
                     <input-box 
-  v-model="data.filter"  
-  @enter="onEnter($event)"  
-  
-  :disabled="detailsModel.filter.disabled" 
-  type='number' 
-   
-  style="">
+    v-model="data.filter"  
+    @enter="onEnter($event)"  
+      
+    :disabled="detailsModel.filter.disabled" 
+    type='text' 
+    style="">
 </input-box>
 
                 </template>

app_Web/src/widgets/ibizsample0001/main-form/main-form-base.vue

@@ -370,7 +370,7 @@
 </i-col>
 <i-col v-show="detailsModel.formitem1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='formitem1' :itemRules="this.rules().formitem1" class='' :caption="$t('entities.ibizsample0001.main_form.details.formitem1')" uiStyle="DEFAULT" :labelWidth="150" :isShowCaption="true" :error="detailsModel.formitem1.error" :isEmptyCaption="false" labelPos="LEFT">
-    <date-picker type="date" :transfer="true" format="yyyy-MM-dd"  :value="data.formitem1" :disabled="detailsModel.formitem1.disabled" style="min-width: 150px;width:160px;  " @on-change="(val1, val2) => { this.data.formitem1 = val1 }"></date-picker>
+    <date-picker type="date" :transfer="true" format="yyyy-MM-dd"  :value="data.formitem1" :disabled="detailsModel.formitem1.disabled" style="min-width: 150px;width:160px;  " @on-change="(val1, val2) => { data.formitem1 = val1 }"></date-picker>
 
 </app-form-item>
 
@@ -406,7 +406,7 @@
 </i-col>
 <i-col v-show="detailsModel.formitem4.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='formitem4' :itemRules="this.rules().formitem4" class='' :caption="$t('entities.ibizsample0001.main_form.details.formitem4')" uiStyle="DEFAULT" :labelWidth="150" :isShowCaption="true" :error="detailsModel.formitem4.error" :isEmptyCaption="false" labelPos="LEFT">
-    <date-picker type="date" :transfer="true" format="yyyy-MM-dd"  :value="data.formitem4" :disabled="detailsModel.formitem4.disabled" style="min-width: 150px;width:160px;  " @on-change="(val1, val2) => { this.data.formitem4 = val1 }"></date-picker>
+    <date-picker type="date" :transfer="true" format="yyyy-MM-dd"  :value="data.formitem4" :disabled="detailsModel.formitem4.disabled" style="min-width: 150px;width:160px;  " @on-change="(val1, val2) => { data.formitem4 = val1 }"></date-picker>
 
 </app-form-item>
 

app_Web/src/widgets/ibizsample0001/main4-form/main4-form-base.vue

@@ -286,7 +286,7 @@
     <row>
         <i-col v-show="detailsModel.f16.visible" :style="{}"  :sm="{ span: 8, offset: 0 }" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
     <app-form-item name='f16' :itemRules="this.rules().f16" class='' :caption="$t('entities.ibizsample0001.main4_form.details.f16')" uiStyle="DEFAULT" :labelWidth="200" :isShowCaption="true" :error="detailsModel.f16.error" :isEmptyCaption="false" labelPos="LEFT">
-    <date-picker type="date" :transfer="true" format="yyyy-MM-dd" placeholder="占位提示-时间选择控件" :value="data.f16" :disabled="detailsModel.f16.disabled" style="min-width: 150px;width:160px;  " @on-change="(val1, val2) => { this.data.f16 = val1 }"></date-picker>
+    <date-picker type="date" :transfer="true" format="yyyy-MM-dd" placeholder="占位提示-时间选择控件" :value="data.f16" :disabled="detailsModel.f16.disabled" style="min-width: 150px;width:160px;  " @on-change="(val1, val2) => { data.f16 = val1 }"></date-picker>
 
 </app-form-item>
 

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSGANTTS/Usr.json

@@ -12,6 +12,30 @@
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
   },
   "getPSDETreeColumns" : [ {
+    "caption" : "归还日期",
+    "codeName" : "returntime",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "returntime",
+    "mOSFilePath" : "psdetreecols/returntime",
+    "name" : "returntime",
+    "rTMOSFilePath" : "psdetreecols/returntime",
+    "width" : 200,
+    "widthUnit" : "px",
+    "enableExpand" : false,
+    "enableSort" : false
+  }, {
+    "caption" : "出版社",
+    "codeName" : "press",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "press",
+    "mOSFilePath" : "psdetreecols/press",
+    "name" : "press",
+    "rTMOSFilePath" : "psdetreecols/press",
+    "width" : 200,
+    "widthUnit" : "px",
+    "enableExpand" : false,
+    "enableSort" : false
+  }, {
     "caption" : "借出日期",
     "codeName" : "lendouttime",
     "columnType" : "DEFGRIDCOLUMN",
@@ -47,30 +71,6 @@
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
-  }, {
-    "caption" : "归还日期",
-    "codeName" : "returntime",
-    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "returntime",
-    "mOSFilePath" : "psdetreecols/returntime",
-    "name" : "returntime",
-    "rTMOSFilePath" : "psdetreecols/returntime",
-    "width" : 200,
-    "widthUnit" : "px",
-    "enableExpand" : false,
-    "enableSort" : false
-  }, {
-    "caption" : "出版社",
-    "codeName" : "press",
-    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "press",
-    "mOSFilePath" : "psdetreecols/press",
-    "name" : "press",
-    "rTMOSFilePath" : "psdetreecols/press",
-    "width" : 200,
-    "widthUnit" : "px",
-    "enableExpand" : false,
-    "enableSort" : false
   } ],
   "getPSDETreeNodeRSs" : [ {
     "getChildPSDETreeNode" : {

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZOrder/PSSEARCHBARS/searchbar.json

@@ -19,7 +19,7 @@
       "codeName" : "OrderUID"
     },
     "getPSEditor" : {
-      "editorType" : "NUMBER",
+      "editorType" : "TEXTBOX",
       "name" : "filter"
     },
     "addSeparator" : true,

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

@@ -42,6 +42,30 @@
       "id" : "GANTT"
     },
     "getPSDETreeColumns" : [ {
+      "caption" : "归还日期",
+      "codeName" : "returntime",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "returntime",
+      "mOSFilePath" : "psdetreecols/returntime",
+      "name" : "returntime",
+      "rTMOSFilePath" : "psdetreecols/returntime",
+      "width" : 200,
+      "widthUnit" : "px",
+      "enableExpand" : false,
+      "enableSort" : false
+    }, {
+      "caption" : "出版社",
+      "codeName" : "press",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "press",
+      "mOSFilePath" : "psdetreecols/press",
+      "name" : "press",
+      "rTMOSFilePath" : "psdetreecols/press",
+      "width" : 200,
+      "widthUnit" : "px",
+      "enableExpand" : false,
+      "enableSort" : false
+    }, {
       "caption" : "借出日期",
       "codeName" : "lendouttime",
       "columnType" : "DEFGRIDCOLUMN",
@@ -77,30 +101,6 @@
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
-    }, {
-      "caption" : "归还日期",
-      "codeName" : "returntime",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "returntime",
-      "mOSFilePath" : "psdetreecols/returntime",
-      "name" : "returntime",
-      "rTMOSFilePath" : "psdetreecols/returntime",
-      "width" : 200,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
-    }, {
-      "caption" : "出版社",
-      "codeName" : "press",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "press",
-      "mOSFilePath" : "psdetreecols/press",
-      "name" : "press",
-      "rTMOSFilePath" : "psdetreecols/press",
-      "width" : 200,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
     } ],
     "getPSDETreeNodeRSs" : [ {
       "getChildPSDETreeNode" : {

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

@@ -483,7 +483,7 @@
         "codeName" : "OrderUID"
       },
       "getPSEditor" : {
-        "editorType" : "NUMBER",
+        "editorType" : "TEXTBOX",
         "name" : "filter"
       },
       "addSeparator" : true,