提交 a310d6fd 编写于 作者: ibizdev's avatar ibizdev

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

上级 fac3168e
...@@ -10,16 +10,11 @@ ...@@ -10,16 +10,11 @@
margin: 16px 0; margin: 16px 0;
flex: auto; flex: auto;
height: calc(100% - 72px); height: calc(100% - 72px);
overflow: scroll;
background: var(--app-color-white); background: var(--app-color-white);
border: 1px solid var(--app-color-gray-200); border: 1px solid var(--app-color-gray-200);
} }
>.view-footer { >.view-footer {
flex: auto; flex: auto;
height: 40px; height: 40px;
>.ivu-row{
display: flex;
justify-content: end;
}
} }
} }
\ No newline at end of file
...@@ -10,16 +10,11 @@ ...@@ -10,16 +10,11 @@
margin: 16px 0; margin: 16px 0;
flex: auto; flex: auto;
height: calc(100% - 72px); height: calc(100% - 72px);
overflow: scroll;
background: var(--app-color-white); background: var(--app-color-white);
border: 1px solid var(--app-color-gray-200); border: 1px solid var(--app-color-gray-200);
} }
>.view-footer { >.view-footer {
flex: auto; flex: auto;
height: 40px; height: 40px;
>.ivu-row{
display: flex;
justify-content: end;
}
} }
} }
\ No newline at end of file
...@@ -2281,10 +2281,6 @@ function getLocaleResourceBase(){ ...@@ -2281,10 +2281,6 @@ function getLocaleResourceBase(){
caption: commonLogic.appcommonhandle("拷贝",null), caption: commonLogic.appcommonhandle("拷贝",null),
tip: commonLogic.appcommonhandle("拷贝",null), tip: commonLogic.appcommonhandle("拷贝",null),
}, },
deuiaction3: {
caption: commonLogic.appcommonhandle("过滤",null),
tip: commonLogic.appcommonhandle("过滤",null),
},
tbitem7: { tbitem7: {
caption: commonLogic.appcommonhandle("-",null), caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null), tip: commonLogic.appcommonhandle("",null),
......
...@@ -2281,10 +2281,6 @@ function getLocaleResourceBase(){ ...@@ -2281,10 +2281,6 @@ function getLocaleResourceBase(){
caption: commonLogic.appcommonhandle("Copy",null), caption: commonLogic.appcommonhandle("Copy",null),
tip: commonLogic.appcommonhandle("Copy {0}",null), tip: commonLogic.appcommonhandle("Copy {0}",null),
}, },
deuiaction3: {
caption: commonLogic.appcommonhandle("Filter",null),
tip: commonLogic.appcommonhandle("Filter",null),
},
tbitem7: { tbitem7: {
caption: commonLogic.appcommonhandle("-",null), caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null), tip: commonLogic.appcommonhandle("",null),
......
...@@ -2281,10 +2281,6 @@ function getLocaleResourceBase(){ ...@@ -2281,10 +2281,6 @@ function getLocaleResourceBase(){
caption: commonLogic.appcommonhandle("拷贝",null), caption: commonLogic.appcommonhandle("拷贝",null),
tip: commonLogic.appcommonhandle("拷贝",null), tip: commonLogic.appcommonhandle("拷贝",null),
}, },
deuiaction3: {
caption: commonLogic.appcommonhandle("过滤",null),
tip: commonLogic.appcommonhandle("过滤",null),
},
tbitem7: { tbitem7: {
caption: commonLogic.appcommonhandle("-",null), caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null), tip: commonLogic.appcommonhandle("",null),
......
...@@ -22,10 +22,9 @@ ...@@ -22,10 +22,9 @@
</template> </template>
<template #contentBottom> <template #contentBottom>
</template> </template>
<template #footer v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer"> <template #footer v-if="isShowButton" >
<row :style="{ textAlign: 'right' }"> <row :style="{ textAlign: 'right' }" class="footer">
<i-button type="primary" :disabled="viewSelections.length > 0 ? false : true" @click="onClickOk">{{containerModel.view_okbtn.text}}</i-button> <i-button type="primary" :disabled="viewSelections.length > 0 ? false : true" @click="onClickOk">{{containerModel.view_okbtn.text}}</i-button>
&nbsp;&nbsp;
<i-button @click="onClickCancel">{{containerModel.view_cancelbtn.text}}</i-button> <i-button @click="onClickCancel">{{containerModel.view_cancelbtn.text}}</i-button>
</row> </row>
</template> </template>
......
...@@ -5,14 +5,19 @@ ...@@ -5,14 +5,19 @@
.pickup-view { .depickupview {
>.pickupviewpanel { .pickupviewpanel {
flex-grow: 1; flex-grow: 1;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
height: calc(100% - 64px); height: 100%;
} }
>.footer { .footer {
height: 64px; display: flex;
justify-content: end;
>.ivu-btn {
margin-left: 10px;
}
} }
} }
...@@ -56,10 +56,9 @@ ...@@ -56,10 +56,9 @@
</template> </template>
<template #contentBottom> <template #contentBottom>
</template> </template>
<template #footer v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer"> <template #footer v-if="isShowButton">
<row :style="{ textAlign: 'right' }"> <row :style="{ textAlign: 'right' }" class="footer">
<i-button type="primary" :disabled="viewSelections.length > 0 ? false : true" @click="onClickOk">{{containerModel.view_okbtn.text}}</i-button> <i-button type="primary" :disabled="viewSelections.length > 0 ? false : true" @click="onClickOk">{{containerModel.view_okbtn.text}}</i-button>
&nbsp;&nbsp;
<i-button @click="onClickCancel">{{containerModel.view_cancelbtn.text}}</i-button> <i-button @click="onClickCancel">{{containerModel.view_cancelbtn.text}}</i-button>
</row> </row>
</template> </template>
......
...@@ -5,18 +5,18 @@ ...@@ -5,18 +5,18 @@
.pickup-view { .dempickupview{
>.translate-contant { .translate-contant {
overflow: auto; overflow: auto;
flex-grow: 1; flex-grow: 1;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
height: calc(100% - 64px); height: 100%;
.translate-buttons { .translate-buttons {
width: 80px;
display: flex; display: flex;
align-items: center; align-items: center;
text-align: center; text-align: center;
margin-right: 12px;
button { button {
margin-bottom: 5px; margin-bottom: 5px;
} }
...@@ -56,14 +56,16 @@ ...@@ -56,14 +56,16 @@
} }
} }
.center{ .center{
width: calc(100% - 380px); width: calc(100% - 410px);
.pickupviewpanel { .pickupviewpanel {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
} }
} }
>.footer { .footer{
height: 64px; display: flex;
justify-content: end;
} }
} }
...@@ -56,10 +56,9 @@ ...@@ -56,10 +56,9 @@
</template> </template>
<template #contentBottom> <template #contentBottom>
</template> </template>
<template #footer v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer"> <template #footer v-if="isShowButton">
<row :style="{ textAlign: 'right' }"> <row :style="{ textAlign: 'right' }" class="footer">
<i-button type="primary" :disabled="viewSelections.length > 0 ? false : true" @click="onClickOk">{{containerModel.view_okbtn.text}}</i-button> <i-button type="primary" :disabled="viewSelections.length > 0 ? false : true" @click="onClickOk">{{containerModel.view_okbtn.text}}</i-button>
&nbsp;&nbsp;
<i-button @click="onClickCancel">{{containerModel.view_cancelbtn.text}}</i-button> <i-button @click="onClickCancel">{{containerModel.view_cancelbtn.text}}</i-button>
</row> </row>
</template> </template>
......
...@@ -5,18 +5,18 @@ ...@@ -5,18 +5,18 @@
.pickup-view { .dempickupview{
>.translate-contant { .translate-contant {
overflow: auto; overflow: auto;
flex-grow: 1; flex-grow: 1;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
height: calc(100% - 64px); height: 100%;
.translate-buttons { .translate-buttons {
width: 80px;
display: flex; display: flex;
align-items: center; align-items: center;
text-align: center; text-align: center;
margin-right: 12px;
button { button {
margin-bottom: 5px; margin-bottom: 5px;
} }
...@@ -56,14 +56,16 @@ ...@@ -56,14 +56,16 @@
} }
} }
.center{ .center{
width: calc(100% - 380px); width: calc(100% - 410px);
.pickupviewpanel { .pickupviewpanel {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
} }
} }
>.footer { .footer{
height: 64px; display: flex;
justify-content: end;
} }
} }
...@@ -22,10 +22,9 @@ ...@@ -22,10 +22,9 @@
</template> </template>
<template #contentBottom> <template #contentBottom>
</template> </template>
<template #footer v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer"> <template #footer v-if="isShowButton" >
<row :style="{ textAlign: 'right' }"> <row :style="{ textAlign: 'right' }" class="footer">
<i-button type="primary" :disabled="viewSelections.length > 0 ? false : true" @click="onClickOk">{{containerModel.view_okbtn.text}}</i-button> <i-button type="primary" :disabled="viewSelections.length > 0 ? false : true" @click="onClickOk">{{containerModel.view_okbtn.text}}</i-button>
&nbsp;&nbsp;
<i-button @click="onClickCancel">{{containerModel.view_cancelbtn.text}}</i-button> <i-button @click="onClickCancel">{{containerModel.view_cancelbtn.text}}</i-button>
</row> </row>
</template> </template>
......
...@@ -5,14 +5,19 @@ ...@@ -5,14 +5,19 @@
.pickup-view { .depickupview {
>.pickupviewpanel { .pickupviewpanel {
flex-grow: 1; flex-grow: 1;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
height: calc(100% - 64px); height: 100%;
} }
>.footer { .footer {
height: 64px; display: flex;
justify-content: end;
>.ivu-btn {
margin-left: 10px;
}
} }
} }
...@@ -56,10 +56,9 @@ ...@@ -56,10 +56,9 @@
</template> </template>
<template #contentBottom> <template #contentBottom>
</template> </template>
<template #footer v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer"> <template #footer v-if="isShowButton">
<row :style="{ textAlign: 'right' }"> <row :style="{ textAlign: 'right' }" class="footer">
<i-button type="primary" :disabled="viewSelections.length > 0 ? false : true" @click="onClickOk">{{containerModel.view_okbtn.text}}</i-button> <i-button type="primary" :disabled="viewSelections.length > 0 ? false : true" @click="onClickOk">{{containerModel.view_okbtn.text}}</i-button>
&nbsp;&nbsp;
<i-button @click="onClickCancel">{{containerModel.view_cancelbtn.text}}</i-button> <i-button @click="onClickCancel">{{containerModel.view_cancelbtn.text}}</i-button>
</row> </row>
</template> </template>
......
...@@ -5,18 +5,18 @@ ...@@ -5,18 +5,18 @@
.pickup-view { .dempickupview{
>.translate-contant { .translate-contant {
overflow: auto; overflow: auto;
flex-grow: 1; flex-grow: 1;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
height: calc(100% - 64px); height: 100%;
.translate-buttons { .translate-buttons {
width: 80px;
display: flex; display: flex;
align-items: center; align-items: center;
text-align: center; text-align: center;
margin-right: 12px;
button { button {
margin-bottom: 5px; margin-bottom: 5px;
} }
...@@ -56,14 +56,16 @@ ...@@ -56,14 +56,16 @@
} }
} }
.center{ .center{
width: calc(100% - 380px); width: calc(100% - 410px);
.pickupviewpanel { .pickupviewpanel {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
} }
} }
>.footer { .footer{
height: 64px; display: flex;
justify-content: end;
} }
} }
...@@ -22,10 +22,9 @@ ...@@ -22,10 +22,9 @@
</template> </template>
<template #contentBottom> <template #contentBottom>
</template> </template>
<template #footer v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer"> <template #footer v-if="isShowButton" >
<row :style="{ textAlign: 'right' }"> <row :style="{ textAlign: 'right' }" class="footer">
<i-button type="primary" :disabled="viewSelections.length > 0 ? false : true" @click="onClickOk">{{containerModel.view_okbtn.text}}</i-button> <i-button type="primary" :disabled="viewSelections.length > 0 ? false : true" @click="onClickOk">{{containerModel.view_okbtn.text}}</i-button>
&nbsp;&nbsp;
<i-button @click="onClickCancel">{{containerModel.view_cancelbtn.text}}</i-button> <i-button @click="onClickCancel">{{containerModel.view_cancelbtn.text}}</i-button>
</row> </row>
</template> </template>
......
...@@ -5,14 +5,19 @@ ...@@ -5,14 +5,19 @@
.pickup-view { .depickupview {
>.pickupviewpanel { .pickupviewpanel {
flex-grow: 1; flex-grow: 1;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
height: calc(100% - 64px); height: 100%;
} }
>.footer { .footer {
height: 64px; display: flex;
justify-content: end;
>.ivu-btn {
margin-left: 10px;
}
} }
} }
...@@ -22,10 +22,9 @@ ...@@ -22,10 +22,9 @@
</template> </template>
<template #contentBottom> <template #contentBottom>
</template> </template>
<template #footer v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer"> <template #footer v-if="isShowButton" >
<row :style="{ textAlign: 'right' }"> <row :style="{ textAlign: 'right' }" class="footer">
<i-button type="primary" :disabled="viewSelections.length > 0 ? false : true" @click="onClickOk">{{containerModel.view_okbtn.text}}</i-button> <i-button type="primary" :disabled="viewSelections.length > 0 ? false : true" @click="onClickOk">{{containerModel.view_okbtn.text}}</i-button>
&nbsp;&nbsp;
<i-button @click="onClickCancel">{{containerModel.view_cancelbtn.text}}</i-button> <i-button @click="onClickCancel">{{containerModel.view_cancelbtn.text}}</i-button>
</row> </row>
</template> </template>
......
...@@ -5,14 +5,19 @@ ...@@ -5,14 +5,19 @@
.pickup-view { .depickupview {
>.pickupviewpanel { .pickupviewpanel {
flex-grow: 1; flex-grow: 1;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
height: calc(100% - 64px); height: 100%;
} }
>.footer { .footer {
height: 64px; display: flex;
justify-content: end;
>.ivu-btn {
margin-left: 10px;
}
} }
} }
...@@ -22,10 +22,9 @@ ...@@ -22,10 +22,9 @@
</template> </template>
<template #contentBottom> <template #contentBottom>
</template> </template>
<template #footer v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer"> <template #footer v-if="isShowButton" >
<row :style="{ textAlign: 'right' }"> <row :style="{ textAlign: 'right' }" class="footer">
<i-button type="primary" :disabled="viewSelections.length > 0 ? false : true" @click="onClickOk">{{containerModel.view_okbtn.text}}</i-button> <i-button type="primary" :disabled="viewSelections.length > 0 ? false : true" @click="onClickOk">{{containerModel.view_okbtn.text}}</i-button>
&nbsp;&nbsp;
<i-button @click="onClickCancel">{{containerModel.view_cancelbtn.text}}</i-button> <i-button @click="onClickCancel">{{containerModel.view_cancelbtn.text}}</i-button>
</row> </row>
</template> </template>
......
...@@ -5,14 +5,19 @@ ...@@ -5,14 +5,19 @@
.pickup-view { .depickupview {
>.pickupviewpanel { .pickupviewpanel {
flex-grow: 1; flex-grow: 1;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
height: calc(100% - 64px); height: 100%;
} }
>.footer { .footer {
height: 64px; display: flex;
justify-content: end;
>.ivu-btn {
margin-left: 10px;
}
} }
} }
...@@ -30,13 +30,6 @@ ...@@ -30,13 +30,6 @@
</i-button> </i-button>
<div slot='content'>{{$t('entities.ibizorder.sgridviewtoolbar_toolbar.tbitem6.tip')}}</div> <div slot='content'>{{$t('entities.ibizorder.sgridviewtoolbar_toolbar.tbitem6.tip')}}</div>
</tooltip> </tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.deuiaction3.visabled" :disabled="toolBarModels.deuiaction3.disabled" class=' srfactionlevel100' v-button-loading:i-button @click="toolbar_click({ tag: 'deuiaction3' }, $event)">
<i class='fa fa-filter'></i>
<span class='caption'>{{$t('entities.ibizorder.sgridviewtoolbar_toolbar.deuiaction3.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.ibizorder.sgridviewtoolbar_toolbar.deuiaction3.tip')}}</div>
</tooltip>
<span class='seperator'>|</span> <span class='seperator'>|</span>
<tooltip :transfer="true" :max-width="600"> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem8.visabled" :disabled="toolBarModels.tbitem8.disabled" class=' srfactionlevel100' v-button-loading:i-button @click="toolbar_click({ tag: 'tbitem8' }, $event)"> <i-button v-show="toolBarModels.tbitem8.visabled" :disabled="toolBarModels.tbitem8.disabled" class=' srfactionlevel100' v-button-loading:i-button @click="toolbar_click({ tag: 'tbitem8' }, $event)">
...@@ -105,32 +98,6 @@ ...@@ -105,32 +98,6 @@
<template #headerContent> <template #headerContent>
<app-quick-group :items="quickGroupModel" @valuechange="quickGroupValueChange"></app-quick-group> <app-quick-group :items="quickGroupModel" @valuechange="quickGroupValueChange"></app-quick-group>
<i-input v-model="query" class='quick-search-input' @on-enter="onSearch($event)" placeholder="订单名称" /> <i-input v-model="query" class='quick-search-input' @on-enter="onSearch($event)" placeholder="订单名称" />
<div class="search-form-toggle" @click="toggleSearchForm">
<i v-if="!isExpandSearchForm" class="el-icon-plus" />
<i v-else class="el-icon-minus" />
筛选条件
</div>
<view_searchform
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:pViewCtx="viewCtx"
:showBusyIndicator="true"
v-show="isExpandSearchForm"
loaddraftAction="FilterGetDraft"
loadAction="FilterGet"
name="searchform"
ref='searchform'
@search="searchform_search($event)"
@load="searchform_load($event)"
@save="searchform_save($event)"
@closeview="closeView($event)">
</view_searchform>
</template>
<template #headerBottom>
<i-button @click="onReset">重置</i-button>
<i-button type="primary" @click="onSearch">搜索</i-button>
</template> </template>
<template #default> <template #default>
<view_grid <view_grid
...@@ -346,7 +313,6 @@ export default class IBIZOrderSGridViewBase extends Vue { ...@@ -346,7 +313,6 @@ export default class IBIZOrderSGridViewBase extends Vue {
* @memberof IBIZOrderSGridViewBase * @memberof IBIZOrderSGridViewBase
*/ */
public containerModel: any = { public containerModel: any = {
view_searchform: { name: 'searchform', type: 'SEARCHFORM' },
view_toolbar: { name: 'toolbar', type: 'TOOLBAR' }, view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
view_grid: { name: 'grid', type: 'GRID' }, view_grid: { name: 'grid', type: 'GRID' },
wflinks: [], wflinks: [],
...@@ -412,8 +378,6 @@ export default class IBIZOrderSGridViewBase extends Vue { ...@@ -412,8 +378,6 @@ export default class IBIZOrderSGridViewBase extends Vue {
tbitem6: { name: 'tbitem6', actiontarget: 'NONE', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } }, tbitem6: { name: 'tbitem6', actiontarget: 'NONE', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
deuiaction3: { name: 'deuiaction3', actiontarget: 'NONE', caption: '过滤', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'ToggleFilter', target: '' } },
tbitem7: { name: 'tbitem7', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem7: { name: 'tbitem7', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem8: { name: 'tbitem8', actiontarget: 'NONE', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } }, tbitem8: { name: 'tbitem8', actiontarget: 'NONE', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
...@@ -463,7 +427,6 @@ export default class IBIZOrderSGridViewBase extends Vue { ...@@ -463,7 +427,6 @@ export default class IBIZOrderSGridViewBase extends Vue {
this.newdata(args,fullargs, params, $event, xData); this.newdata(args,fullargs, params, $event, xData);
}, },
grid: this.$refs.grid, grid: this.$refs.grid,
searchform: this.$refs.searchform,
keyPSDEField: 'ibizorder', keyPSDEField: 'ibizorder',
majorPSDEField: 'ibizordername', majorPSDEField: 'ibizordername',
isLoadDefault: true, isLoadDefault: true,
...@@ -833,36 +796,6 @@ export default class IBIZOrderSGridViewBase extends Vue { ...@@ -833,36 +796,6 @@ export default class IBIZOrderSGridViewBase extends Vue {
_this.loadQuickGroupModel(); _this.loadQuickGroupModel();
} }
/**
* searchform 部件 search 事件
*
* @param {*} [args={}]
* @param {*} $event
* @memberof IBIZOrderSGridViewBase
*/
public searchform_search($event: any, $event2?: any) {
this.engine.onCtrlEvent('searchform', 'search', $event);
}
/**
* searchform 部件 load 事件
*
* @param {*} [args={}]
* @param {*} $event
* @memberof IBIZOrderSGridViewBase
*/
public searchform_load($event: any, $event2?: any) {
this.engine.onCtrlEvent('searchform', 'load', $event);
}
/**
* searchform 部件 save 事件
*
* @param {*} [args={}]
* @param {*} $event
* @memberof IBIZOrderSGridViewBase
*/
public searchform_save($event: any, $event2?: any) {
this.engine.onCtrlEvent('searchform', 'save', $event);
}
/** /**
* toolbar 部件 click 事件 * toolbar 部件 click 事件
* *
......
...@@ -2,13 +2,11 @@ ...@@ -2,13 +2,11 @@
import { Component } from 'vue-property-decorator'; import { Component } from 'vue-property-decorator';
import IBIZOrderSGridViewBase from './ibizorder-sgrid-view-base.vue'; import IBIZOrderSGridViewBase from './ibizorder-sgrid-view-base.vue';
import view_searchform from '@widgets/ibizorder/default-searchform/default-searchform.vue';
import view_grid from '@widgets/ibizorder/main-grid/main-grid.vue'; import view_grid from '@widgets/ibizorder/main-grid/main-grid.vue';
// 基于 @VIEW/实体表格视图/VIEW.vue.ftl 生成 // 基于 @VIEW/实体表格视图/VIEW.vue.ftl 生成
@Component({ @Component({
components: { components: {
view_searchform,
view_grid, view_grid,
}, },
beforeRouteEnter: (to: any, from: any, next: any) => { beforeRouteEnter: (to: any, from: any, next: any) => {
......
...@@ -56,10 +56,9 @@ ...@@ -56,10 +56,9 @@
</template> </template>
<template #contentBottom> <template #contentBottom>
</template> </template>
<template #footer v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer"> <template #footer v-if="isShowButton">
<row :style="{ textAlign: 'right' }"> <row :style="{ textAlign: 'right' }" class="footer">
<i-button type="primary" :disabled="viewSelections.length > 0 ? false : true" @click="onClickOk">{{containerModel.view_okbtn.text}}</i-button> <i-button type="primary" :disabled="viewSelections.length > 0 ? false : true" @click="onClickOk">{{containerModel.view_okbtn.text}}</i-button>
&nbsp;&nbsp;
<i-button @click="onClickCancel">{{containerModel.view_cancelbtn.text}}</i-button> <i-button @click="onClickCancel">{{containerModel.view_cancelbtn.text}}</i-button>
</row> </row>
</template> </template>
......
...@@ -5,18 +5,18 @@ ...@@ -5,18 +5,18 @@
.pickup-view { .dempickupview{
>.translate-contant { .translate-contant {
overflow: auto; overflow: auto;
flex-grow: 1; flex-grow: 1;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
height: calc(100% - 64px); height: 100%;
.translate-buttons { .translate-buttons {
width: 80px;
display: flex; display: flex;
align-items: center; align-items: center;
text-align: center; text-align: center;
margin-right: 12px;
button { button {
margin-bottom: 5px; margin-bottom: 5px;
} }
...@@ -56,14 +56,16 @@ ...@@ -56,14 +56,16 @@
} }
} }
.center{ .center{
width: calc(100% - 380px); width: calc(100% - 410px);
.pickupviewpanel { .pickupviewpanel {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
} }
} }
>.footer { .footer{
height: 64px; display: flex;
justify-content: end;
} }
} }
...@@ -22,10 +22,9 @@ ...@@ -22,10 +22,9 @@
</template> </template>
<template #contentBottom> <template #contentBottom>
</template> </template>
<template #footer v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer"> <template #footer v-if="isShowButton" >
<row :style="{ textAlign: 'right' }"> <row :style="{ textAlign: 'right' }" class="footer">
<i-button type="primary" :disabled="viewSelections.length > 0 ? false : true" @click="onClickOk">{{containerModel.view_okbtn.text}}</i-button> <i-button type="primary" :disabled="viewSelections.length > 0 ? false : true" @click="onClickOk">{{containerModel.view_okbtn.text}}</i-button>
&nbsp;&nbsp;
<i-button @click="onClickCancel">{{containerModel.view_cancelbtn.text}}</i-button> <i-button @click="onClickCancel">{{containerModel.view_cancelbtn.text}}</i-button>
</row> </row>
</template> </template>
......
...@@ -5,14 +5,19 @@ ...@@ -5,14 +5,19 @@
.pickup-view { .depickupview {
>.pickupviewpanel { .pickupviewpanel {
flex-grow: 1; flex-grow: 1;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
height: calc(100% - 64px); height: 100%;
} }
>.footer { .footer {
height: 64px; display: flex;
justify-content: end;
>.ivu-btn {
margin-left: 10px;
}
} }
} }
...@@ -22,10 +22,9 @@ ...@@ -22,10 +22,9 @@
</template> </template>
<template #contentBottom> <template #contentBottom>
</template> </template>
<template #footer v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer"> <template #footer v-if="isShowButton" >
<row :style="{ textAlign: 'right' }"> <row :style="{ textAlign: 'right' }" class="footer">
<i-button type="primary" :disabled="viewSelections.length > 0 ? false : true" @click="onClickOk">{{containerModel.view_okbtn.text}}</i-button> <i-button type="primary" :disabled="viewSelections.length > 0 ? false : true" @click="onClickOk">{{containerModel.view_okbtn.text}}</i-button>
&nbsp;&nbsp;
<i-button @click="onClickCancel">{{containerModel.view_cancelbtn.text}}</i-button> <i-button @click="onClickCancel">{{containerModel.view_cancelbtn.text}}</i-button>
</row> </row>
</template> </template>
......
...@@ -5,14 +5,19 @@ ...@@ -5,14 +5,19 @@
.pickup-view { .depickupview {
>.pickupviewpanel { .pickupviewpanel {
flex-grow: 1; flex-grow: 1;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
height: calc(100% - 64px); height: 100%;
} }
>.footer { .footer {
height: 64px; display: flex;
justify-content: end;
>.ivu-btn {
margin-left: 10px;
}
} }
} }
...@@ -22,10 +22,9 @@ ...@@ -22,10 +22,9 @@
</template> </template>
<template #contentBottom> <template #contentBottom>
</template> </template>
<template #footer v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer"> <template #footer v-if="isShowButton" >
<row :style="{ textAlign: 'right' }"> <row :style="{ textAlign: 'right' }" class="footer">
<i-button type="primary" :disabled="viewSelections.length > 0 ? false : true" @click="onClickOk">{{containerModel.view_okbtn.text}}</i-button> <i-button type="primary" :disabled="viewSelections.length > 0 ? false : true" @click="onClickOk">{{containerModel.view_okbtn.text}}</i-button>
&nbsp;&nbsp;
<i-button @click="onClickCancel">{{containerModel.view_cancelbtn.text}}</i-button> <i-button @click="onClickCancel">{{containerModel.view_cancelbtn.text}}</i-button>
</row> </row>
</template> </template>
......
...@@ -5,14 +5,19 @@ ...@@ -5,14 +5,19 @@
.pickup-view { .depickupview {
>.pickupviewpanel { .pickupviewpanel {
flex-grow: 1; flex-grow: 1;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
height: calc(100% - 64px); height: 100%;
} }
>.footer { .footer {
height: 64px; display: flex;
justify-content: end;
>.ivu-btn {
margin-left: 10px;
}
} }
} }
...@@ -22,10 +22,9 @@ ...@@ -22,10 +22,9 @@
</template> </template>
<template #contentBottom> <template #contentBottom>
</template> </template>
<template #footer v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer"> <template #footer v-if="isShowButton" >
<row :style="{ textAlign: 'right' }"> <row :style="{ textAlign: 'right' }" class="footer">
<i-button type="primary" :disabled="viewSelections.length > 0 ? false : true" @click="onClickOk">{{containerModel.view_okbtn.text}}</i-button> <i-button type="primary" :disabled="viewSelections.length > 0 ? false : true" @click="onClickOk">{{containerModel.view_okbtn.text}}</i-button>
&nbsp;&nbsp;
<i-button @click="onClickCancel">{{containerModel.view_cancelbtn.text}}</i-button> <i-button @click="onClickCancel">{{containerModel.view_cancelbtn.text}}</i-button>
</row> </row>
</template> </template>
......
...@@ -5,14 +5,19 @@ ...@@ -5,14 +5,19 @@
.pickup-view { .depickupview {
>.pickupviewpanel { .pickupviewpanel {
flex-grow: 1; flex-grow: 1;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
height: calc(100% - 64px); height: 100%;
} }
>.footer { .footer {
height: 64px; display: flex;
justify-content: end;
>.ivu-btn {
margin-left: 10px;
}
} }
} }
...@@ -1911,18 +1911,15 @@ export default class MainMenuBase extends Vue implements ControlInterface { ...@@ -1911,18 +1911,15 @@ export default class MainMenuBase extends Vue implements ControlInterface {
const deResParameters: any[] = []; const deResParameters: any[] = [];
const parameters: any[] = [ const parameters: any[] = [
{ pathName: 'ibizbooks', parameterName: 'ibizbook' }, { pathName: 'ibizbooks', parameterName: 'ibizbook' },
{ pathName: 'usr2editview', parameterName: 'usr2editview' },
]; ];
const view: any = { const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
viewname: 'ibizbookusr2-edit-view', if(Object.is(this.$route.fullPath,path)){
title: (this.$t('entities.ibizbook.views.usr2editview.title') as any), return;
height: 0, }
width: 0, this.$nextTick(function(){
placement: 'POPOVER' this.$router.push(path);
}; })
const appPopover = this.$apppopover.openPop($event, view, JSON.parse(JSON.stringify(this.context)), viewparam);
appPopover.subscribe((result: any) => {
console.log(result);
});
} }
/** /**
......
...@@ -4901,7 +4901,7 @@ export default class MainMenuModel { ...@@ -4901,7 +4901,7 @@ export default class MainMenuModel {
{ {
appfunctag: 'AppFunc64', appfunctag: 'AppFunc64',
appfuncyype: 'APPVIEW', appfuncyype: 'APPVIEW',
openmode: 'POPOVER', openmode: 'INDEXVIEWTAB',
codename: 'ibizbookusr2editview', codename: 'ibizbookusr2editview',
deResParameters: [], deResParameters: [],
routepath: '/index/:index?/ibizbooks/:ibizbook?/usr2editview/:usr2editview?', routepath: '/index/:index?/ibizbooks/:ibizbook?/usr2editview/:usr2editview?',
......
...@@ -712,7 +712,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -712,7 +712,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/ */
public load(opt: any = {}): void { public load(opt: any = {}): void {
if(!this.loadAction){ if(!this.loadAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr5DataView' + (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; return;
} }
const arg: any = { ...opt }; const arg: any = { ...opt };
...@@ -748,7 +748,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -748,7 +748,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/ */
public async loadDraft(opt: any = {},mode?:string): Promise<any> { public async loadDraft(opt: any = {},mode?:string): Promise<any> {
if(!this.loaddraftAction){ if(!this.loaddraftAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr5DataView' + (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; return;
} }
const arg: any = { ...opt } ; const arg: any = { ...opt } ;
......
...@@ -1344,7 +1344,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface ...@@ -1344,7 +1344,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
*/ */
public async load(opt: any = {}): Promise<any> { public async load(opt: any = {}): Promise<any> {
if(!this.loadAction){ 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; return;
} }
const arg: any = { ...opt }; const arg: any = { ...opt };
...@@ -1395,7 +1395,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface ...@@ -1395,7 +1395,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
*/ */
public async loadDraft(opt: any = {}): Promise<any> { public async loadDraft(opt: any = {}): Promise<any> {
if (!this.loaddraftAction) { 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; return;
} }
const arg: any = { ...opt } ; const arg: any = { ...opt } ;
...@@ -1465,7 +1465,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface ...@@ -1465,7 +1465,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction; const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
if(!action){ if(!action){
let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction"; 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; return;
} }
Object.assign(arg,{viewparams:this.viewparams}); Object.assign(arg,{viewparams:this.viewparams});
...@@ -1573,7 +1573,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface ...@@ -1573,7 +1573,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction; const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
if(!action){ if(!action){
let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction"; 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; return;
} }
Object.assign(arg, { viewparams: this.viewparams }); Object.assign(arg, { viewparams: this.viewparams });
...@@ -1765,7 +1765,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface ...@@ -1765,7 +1765,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> { public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
return new Promise((resolve: any, reject: any) => { return new Promise((resolve: any, reject: any) => {
if(!this.removeAction){ 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; return;
} }
const arg: any = opt[0]; const arg: any = opt[0];
......
...@@ -1447,7 +1447,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface { ...@@ -1447,7 +1447,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
*/ */
public async load(opt: any = {}): Promise<any> { public async load(opt: any = {}): Promise<any> {
if(!this.loadAction){ 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; return;
} }
const arg: any = { ...opt }; const arg: any = { ...opt };
...@@ -1499,7 +1499,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface { ...@@ -1499,7 +1499,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
*/ */
public async loadDraft(opt: any = {}): Promise<any> { public async loadDraft(opt: any = {}): Promise<any> {
if (!this.loaddraftAction) { 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; return;
} }
const arg: any = { ...opt } ; const arg: any = { ...opt } ;
...@@ -1569,7 +1569,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface { ...@@ -1569,7 +1569,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction; const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
if(!action){ if(!action){
let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction"; 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; return;
} }
Object.assign(arg,{viewparams:this.viewparams}); Object.assign(arg,{viewparams:this.viewparams});
...@@ -1677,7 +1677,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface { ...@@ -1677,7 +1677,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction; const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
if(!action){ if(!action){
let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction"; 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; return;
} }
Object.assign(arg, { viewparams: this.viewparams }); Object.assign(arg, { viewparams: this.viewparams });
...@@ -1869,7 +1869,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface { ...@@ -1869,7 +1869,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> { public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
return new Promise((resolve: any, reject: any) => { return new Promise((resolve: any, reject: any) => {
if(!this.removeAction){ 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; return;
} }
const arg: any = opt[0]; const arg: any = opt[0];
......
...@@ -828,4 +828,5 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface ...@@ -828,4 +828,5 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface
<style lang='scss'> <style lang='scss'>
@import './quicksearchform-searchform.scss'; @import './quicksearchform-searchform.scss';
</style>;
</style> </style>
\ No newline at end of file
...@@ -933,7 +933,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -933,7 +933,7 @@ export default class MainBase extends Vue implements ControlInterface {
if (!this.fetchAction) { if (!this.fetchAction) {
this.$Notice.error({ this.$Notice.error({
title: this.$t("app.commonWords.wrong") as string, title: this.$t("app.commonWords.wrong") as string,
desc: "IBIZOrderDetailSGridView" + (this.$t("app.gridpage.notConfig.fetchAction") as string), desc: "IBIZOrderDetailSGridView9" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
}); });
return; return;
} }
...@@ -1073,7 +1073,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1073,7 +1073,7 @@ export default class MainBase extends Vue implements ControlInterface {
if (!this.removeAction) { if (!this.removeAction) {
this.$Notice.error({ this.$Notice.error({
title: (this.$t('app.commonWords.wrong') as string), title: (this.$t('app.commonWords.wrong') as string),
desc: 'IBIZOrderDetailSGridView' + (this.$t('app.gridpage.notConfig.removeAction') as string) desc: 'IBIZOrderDetailSGridView9' + (this.$t('app.gridpage.notConfig.removeAction') as string)
}); });
return; return;
} }
...@@ -1187,7 +1187,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1187,7 +1187,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/ */
public addBatch(arg: any = {}): void { public addBatch(arg: any = {}): void {
if(!this.fetchAction){ if(!this.fetchAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailSGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailSGridView9'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
return; return;
} }
if(!arg){ if(!arg){
...@@ -2082,7 +2082,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -2082,7 +2082,7 @@ export default class MainBase extends Vue implements ControlInterface {
try { try {
if (Object.is(item.rowDataState, 'create')) { if (Object.is(item.rowDataState, 'create')) {
if (!this.createAction) { if (!this.createAction) {
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailSGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailSGridView9'+(this.$t('app.gridpage.notConfig.createAction') as string) });
} else { } else {
Object.assign(item, { viewparams: this.viewparams }); Object.assign(item, { viewparams: this.viewparams });
const tempContext = Util.deepCopy(this.context); const tempContext = Util.deepCopy(this.context);
...@@ -2091,7 +2091,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -2091,7 +2091,7 @@ export default class MainBase extends Vue implements ControlInterface {
} }
}else if (Object.is(item.rowDataState, 'update')){ }else if (Object.is(item.rowDataState, 'update')){
if (!this.updateAction) { if (!this.updateAction) {
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailSGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailSGridView9'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
} else { } else {
Object.assign(item, { viewparams: this.viewparams }); Object.assign(item, { viewparams: this.viewparams });
const tempContext = Util.deepCopy(this.context); const tempContext = Util.deepCopy(this.context);
...@@ -2167,7 +2167,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -2167,7 +2167,7 @@ export default class MainBase extends Vue implements ControlInterface {
if(!this.loaddraftAction){ if(!this.loaddraftAction){
this.$Notice.error({ this.$Notice.error({
title: (this.$t('app.commonWords.wrong') as string), title: (this.$t('app.commonWords.wrong') as string),
desc: 'IBIZOrderDetailSGridView' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string) desc: 'IBIZOrderDetailSGridView9' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
}); });
return; return;
} }
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKUsr2EditView.json", "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKUsr2EditView.json",
"mOSFilePath" : "pssysapps/Web/psappdeviews/IBIZBOOKUsr2EditView", "mOSFilePath" : "pssysapps/Web/psappdeviews/IBIZBOOKUsr2EditView",
"name" : "IBIZBOOKUsr2EditView", "name" : "IBIZBOOKUsr2EditView",
"openMode" : "POPOVER", "openMode" : "INDEXVIEWTAB",
"getPSAppDataEntity" : { "getPSAppDataEntity" : {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
......
...@@ -36,10 +36,6 @@ ...@@ -36,10 +36,6 @@
"ctrlName" : "grid", "ctrlName" : "grid",
"name" : "GRID", "name" : "GRID",
"paramType" : "CTRL" "paramType" : "CTRL"
}, {
"ctrlName" : "searchform",
"name" : "SEARCHFORM",
"paramType" : "CTRL"
} ] } ]
} ], } ],
"getPSAppViewLogics" : [ { "getPSAppViewLogics" : [ {
...@@ -464,150 +460,6 @@ ...@@ -464,150 +460,6 @@
"xDataControlName" : "grid" "xDataControlName" : "grid"
} ], } ],
"getPSControls" : [ { "getPSControls" : [ {
"codeName" : "Default",
"controlType" : "SEARCHFORM",
"defaultLabelWidth" : 130,
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZOrder/PSSEARCHFORMS/Default.json",
"hookEventNames" : [ "SEARCH", "LOAD", "SAVE" ],
"logicName" : "默认搜索表单",
"mOSFilePath" : "psmodules/Sample/psdataentities/IBIZORDER/psdeform_searchforms/Default",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZOrder.json"
},
"getPSControlHandler" : {
"getPSHandlerActions" : [ {
"actionType" : "FILTERACTION",
"name" : "load",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "FilterGet"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZOrder.json"
}
}, {
"actionType" : "FILTERACTION",
"name" : "loaddraft",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "FilterGetDraft"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZOrder.json"
}
}, {
"actionType" : "FILTERACTION",
"name" : "search",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "FilterSearch"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZOrder.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"
},
"getPSDEFormItems" : [ {
"id" : "n_ibizordername_like",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "IBIZORDERNAME",
"codeName" : "IBIZOrderName"
}
} ],
"getPSDEFormPages" : [ {
"caption" : "订单名称",
"codeName" : "formpage1",
"detailStyle" : "DEFAULT",
"detailType" : "FORMPAGE",
"mOSFilePath" : "psdeformdetail_formpages/formpage1",
"name" : "formpage1",
"getPSDEFormDetails" : [ {
"getCapPSLanguageRes" : {
"lanResTag" : "CONTROL.DEFSFITEM.IBIZORDER.N_IBIZORDERNAME_LIKE",
"mOSFilePath" : "pslanguageres/Auto338",
"rTMOSFilePath" : "pslanguageres/Auto338"
},
"caption" : "订单名称(%)",
"codeName" : "n_ibizordername_like",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"mOSFilePath" : "psdeformdetail_formitems/n_ibizordername_like",
"name" : "n_ibizordername_like",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "IBIZORDERNAME",
"codeName" : "IBIZOrderName"
},
"getPSEditor" : {
"editorType" : "TEXTBOX",
"editorWidth" : 100.0,
"name" : "n_ibizordername_like"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"rTMOSFilePath" : "psdeformdetail_formitems/n_ibizordername_like",
"allowEmpty" : true,
"showCaption" : true
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"rTMOSFilePath" : "psdeformdetail_formpages/formpage1",
"infoGroupMode" : false
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"rTMOSFilePath" : "pssysapps/Web/psappdeviews/IBIZOrderSGridView/psappviewctrls/searchform",
"searchButtonStyle" : "DEFAULT",
"tabHeaderPos" : "TOP",
"enableAdvanceSearch" : false,
"enableAutoSearch" : false,
"enableFilterSave" : false,
"noTabHeader" : true,
"name" : "searchform",
"modelid" : "1b5557a48588cf3b6a07b7bd6acedd53",
"modeltype" : "PSDEFORM_SEARCHFORM"
}, {
"codeName" : "SGridViewtoolbar", "codeName" : "SGridViewtoolbar",
"controlType" : "TOOLBAR", "controlType" : "TOOLBAR",
"hookEventNames" : [ "CLICK" ], "hookEventNames" : [ "CLICK" ],
...@@ -972,62 +824,6 @@ ...@@ -972,62 +824,6 @@
}, },
"showCaption" : true, "showCaption" : true,
"showIcon" : false "showIcon" : false
}, {
"getCapPSLanguageRes" : {
"lanResTag" : "TBB.TEXT.*.FILTER",
"mOSFilePath" : "pslanguageres/Auto1437",
"rTMOSFilePath" : "pslanguageres/Auto1437"
},
"caption" : "过滤",
"groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION",
"name" : "deuiaction3",
"noPrivDisplayMode" : 2,
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "toolbar_deuiaction3"
},
"getPSSysImage" : {
"glyph" : "xf0b0@FontAwesome",
"cssClass" : "fa fa-filter"
},
"getPSUIAction" : {
"getCapPSLanguageRes" : {
"lanResTag" : "TBB.TEXT.*.FILTER",
"mOSFilePath" : "pslanguageres/Auto1437",
"rTMOSFilePath" : "pslanguageres/Auto1437"
},
"caption" : "过滤",
"codeName" : "ToggleFilter",
"fullCodeName" : "ToggleFilter",
"mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleFilter",
"name" : "表格界面_搜索栏",
"getPSSysImage" : {
"glyph" : "xf0b0@FontAwesome",
"cssClass" : "fa fa-filter"
},
"predefinedType" : "GRIDVIEW_SEARCHBAR",
"rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleFilter",
"timeout" : 60000,
"getTooltipPSLanguageRes" : {
"lanResTag" : "TBB.TOOLTIP.*.FILTER",
"mOSFilePath" : "pslanguageres/Auto796",
"rTMOSFilePath" : "pslanguageres/Auto796"
},
"uIActionMode" : "SYS",
"uIActionTag" : "ToggleFilter",
"uIActionType" : "DEUIACTION",
"enableToggleMode" : true
},
"tooltip" : "过滤",
"getTooltipPSLanguageRes" : {
"lanResTag" : "TBB.TOOLTIP.*.FILTER",
"mOSFilePath" : "pslanguageres/Auto796",
"rTMOSFilePath" : "pslanguageres/Auto796"
},
"enableToggleMode" : true,
"showCaption" : true,
"showIcon" : true
}, { }, {
"itemType" : "SEPERATOR", "itemType" : "SEPERATOR",
"name" : "tbitem7", "name" : "tbitem7",
...@@ -1869,12 +1665,11 @@ ...@@ -1869,12 +1665,11 @@
"xDataControlName" : "grid", "xDataControlName" : "grid",
"enableDP" : true, "enableDP" : true,
"enableExport" : true, "enableExport" : true,
"enableFilter" : true, "enableFilter" : false,
"enableImport" : true, "enableImport" : true,
"enableQuickGroup" : true, "enableQuickGroup" : true,
"enableQuickSearch" : true, "enableQuickSearch" : true,
"enableRowEdit" : false, "enableRowEdit" : false,
"enableSearch" : true,
"rowEditDefault" : false, "rowEditDefault" : false,
"showCaptionBar" : false, "showCaptionBar" : false,
"modelid" : "1a7578c0b5f8a1107d0fe9c2dc51f314", "modelid" : "1a7578c0b5f8a1107d0fe9c2dc51f314",
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册