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

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

上级 217af54b
...@@ -484,33 +484,39 @@ export default class IBIZBOOKOptionView_layoutBase extends Vue { ...@@ -484,33 +484,39 @@ export default class IBIZBOOKOptionView_layoutBase extends Vue {
* @param {*} [srfParentDeName] 父实体名称 * @param {*} [srfParentDeName] 父实体名称
*/ */
public async panel_Layoutpanel_button_calluilogic2_click(args: any[], context: any = {}, params: any = {}, $event?: any, xData?: any, actionContext?: any, srfParentDeName?: string) { public async panel_Layoutpanel_button_calluilogic2_click(args: any[], context: any = {}, params: any = {}, $event?: any, xData?: any, actionContext?: any, srfParentDeName?: string) {
// 准备上下文参数 // 选择视图保存变更
const tempContext = {...context}; if (Object.is(this.viewType, 'DEPICKUPVIEW') || Object.is(this.viewType, 'DEMPICKUPVIEW')) {
if (xData && xData.context) { this.$emit('viewdataschange', this.viewSelections);
Object.assign(tempContext, xData.context); this.$emit('close', null);
} } else {
const data = args[0]; // 准备上下文参数
let action: string | undefined = undefined; const tempContext = {...context};
const service = await window.entityServiceRegister.getService('ibizbook'); if (xData && xData.context) {
if (service) { Object.assign(tempContext, xData.context);
const key = service.APPDEKEY.toLowerCase();
const name = service.APPLYDEKEY.toLowerCase();
if (data.hasOwnProperty(key)) {
Object.assign(tempContext, { [name]: data[key] });
action = 'Update';
} else {
action = 'Create';
} }
if (service[action] && service[action] instanceof Function) { const data = args[0];
service[action](tempContext, data).then((response: any) => { let action: string | undefined = undefined;
if (!response.status || response.status !== 200) { const service = await window.entityServiceRegister.getService('ibizbook');
if (service) {
const key = service.APPDEKEY.toLowerCase();
const name = service.APPLYDEKEY.toLowerCase();
if (data.hasOwnProperty(key)) {
Object.assign(tempContext, { [name]: data[key] });
action = 'Update';
} else {
action = 'Create';
}
if (service[action] && service[action] instanceof Function) {
service[action](tempContext, data).then((response: any) => {
if (!response.status || response.status !== 200) {
actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
}
}).catch((error: any) => {
actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' }); actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
} })
}).catch((error: any) => { } else {
actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' }); actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
}) }
} else {
actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
} }
} }
} }
......
...@@ -692,33 +692,39 @@ export default class IBIZBOOKUsr2CustomViewBase extends Vue { ...@@ -692,33 +692,39 @@ export default class IBIZBOOKUsr2CustomViewBase extends Vue {
* @param {*} [srfParentDeName] 父实体名称 * @param {*} [srfParentDeName] 父实体名称
*/ */
public async panel_Usr1110541566_button_calluilogic4_click(args: any[], context: any = {}, params: any = {}, $event?: any, xData?: any, actionContext?: any, srfParentDeName?: string) { public async panel_Usr1110541566_button_calluilogic4_click(args: any[], context: any = {}, params: any = {}, $event?: any, xData?: any, actionContext?: any, srfParentDeName?: string) {
// 准备上下文参数 // 选择视图保存变更
const tempContext = {...context}; if (Object.is(this.viewType, 'DEPICKUPVIEW') || Object.is(this.viewType, 'DEMPICKUPVIEW')) {
if (xData && xData.context) { this.$emit('viewdataschange', this.viewSelections);
Object.assign(tempContext, xData.context); this.$emit('close', null);
} } else {
const data = args[0]; // 准备上下文参数
let action: string | undefined = undefined; const tempContext = {...context};
const service = await window.entityServiceRegister.getService('ibizbook'); if (xData && xData.context) {
if (service) { Object.assign(tempContext, xData.context);
const key = service.APPDEKEY.toLowerCase();
const name = service.APPLYDEKEY.toLowerCase();
if (data.hasOwnProperty(key)) {
Object.assign(tempContext, { [name]: data[key] });
action = 'Update';
} else {
action = 'Create';
} }
if (service[action] && service[action] instanceof Function) { const data = args[0];
service[action](tempContext, data).then((response: any) => { let action: string | undefined = undefined;
if (!response.status || response.status !== 200) { const service = await window.entityServiceRegister.getService('ibizbook');
if (service) {
const key = service.APPDEKEY.toLowerCase();
const name = service.APPLYDEKEY.toLowerCase();
if (data.hasOwnProperty(key)) {
Object.assign(tempContext, { [name]: data[key] });
action = 'Update';
} else {
action = 'Create';
}
if (service[action] && service[action] instanceof Function) {
service[action](tempContext, data).then((response: any) => {
if (!response.status || response.status !== 200) {
actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
}
}).catch((error: any) => {
actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' }); actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
} })
}).catch((error: any) => { } else {
actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' }); actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
}) }
} else {
actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
} }
} }
} }
......
...@@ -5,21 +5,51 @@ ...@@ -5,21 +5,51 @@
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<div class="translate-contant"> <div class="translate-contant">
<div class="center" :style="{width : !isShowButton ? '100%' : ''}"> <div class="center" :style="{width : !isShowButton ? '100%' : ''}">
<!-- DEMPICKUPVIEW --> <div class="pickupviewpanel__container">
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))" :viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="JSON.parse(JSON.stringify(context))" :context="JSON.parse(JSON.stringify(context))"
:isSingleSelect="isSingleSelect" :isSingleSelect="isSingleSelect"
:selectedData="selectedData" :selectedData="selectedData"
:isShowButton="isShowButton" :isShowButton="isShowButton"
name="pickupviewpanel" name="pickupviewpanel"
ref='pickupviewpanel' ref='pickupviewpanel'
@selectionchange="pickupviewpanel_selectionchange($event)" @selectionchange="pickupviewpanel_selectionchange($event)"
@load="pickupviewpanel_load($event)" @load="pickupviewpanel_load($event)"
@activated="pickupviewpanel_activated($event)" @activated="pickupviewpanel_activated($event)"
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_pickupviewpanel> </view_pickupviewpanel>
<div v-if="isShowButton" class="pickupviewpanel__center">
<div class="pickupviewpanel__center__buttons">
<i-button type="primary" :title="containerModel.view_rightbtn.text"
:disabled="containerModel.view_rightbtn.disabled"
@click="onCLickRight">
<i class="el-icon-arrow-right"></i>
</i-button>
<i-button type="primary" :title="containerModel.view_leftbtn.text"
:disabled="containerModel.view_leftbtn.disabled"
@click="onCLickLeft">
<i class="el-icon-arrow-left"></i>
</i-button>
<i-button type="primary" :title="containerModel.view_allrightbtn.text"
@click="onCLickAllRight">
<i class="el-icon-d-arrow-right"></i>
</i-button>
<i-button type="primary" :title="containerModel.view_allleftbtn.text"
@click="onCLickAllLeft">
<i class="el-icon-d-arrow-left"></i>
</i-button>
</div>
</div>
<div v-if="isShowButton" class="pickupviewpanel__right">
<div class="pickupviewpanel__right__select">
<div v-for="(item, index) in viewSelections" :key="index" :class="item._select ? 'select' : ''" @click="selectionsClick(item)" @dblclick="selectionsDBLClick(item)">
<span>{{item.srfmajortext}}</span>
</div>
</div>
</div>
</div>
</div> </div>
<div v-if="isShowButton" class="translate-buttons"> <div v-if="isShowButton" class="translate-buttons">
<div class="buttons"> <div class="buttons">
......
...@@ -6,21 +6,52 @@ ...@@ -6,21 +6,52 @@
<app-scroll-container name="container_scroll_main1" :layoutModelDetails="layoutModelDetails"> <app-scroll-container name="container_scroll_main1" :layoutModelDetails="layoutModelDetails">
<template #pickupviewpanel> <template #pickupviewpanel>
<app-ctrl-pos name="pickupviewpanel" :layoutModelDetails="layoutModelDetails"> <app-ctrl-pos name="pickupviewpanel" :layoutModelDetails="layoutModelDetails">
<!-- DEMPICKUPVIEW --> <div class="pickupviewpanel__container">
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))" :viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="JSON.parse(JSON.stringify(context))" :context="JSON.parse(JSON.stringify(context))"
:isSingleSelect="isSingleSelect" :isSingleSelect="isSingleSelect"
:selectedData="selectedData" :selectedData="selectedData"
:isShowButton="isShowButton" :isShowButton="isShowButton"
name="pickupviewpanel" name="pickupviewpanel"
ref='pickupviewpanel' ref='pickupviewpanel'
@selectionchange="pickupviewpanel_selectionchange($event)" @selectionchange="pickupviewpanel_selectionchange($event)"
@load="pickupviewpanel_load($event)" @load="pickupviewpanel_load($event)"
@activated="pickupviewpanel_activated($event)" @activated="pickupviewpanel_activated($event)"
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_pickupviewpanel> </view_pickupviewpanel>
<div v-if="isShowButton" class="pickupviewpanel__center">
<div class="pickupviewpanel__center__buttons">
<i-button type="primary" :title="containerModel.view_rightbtn.text"
:disabled="containerModel.view_rightbtn.disabled"
@click="onCLickRight">
<i class="el-icon-arrow-right"></i>
</i-button>
<i-button type="primary" :title="containerModel.view_leftbtn.text"
:disabled="containerModel.view_leftbtn.disabled"
@click="onCLickLeft">
<i class="el-icon-arrow-left"></i>
</i-button>
<i-button type="primary" :title="containerModel.view_allrightbtn.text"
@click="onCLickAllRight">
<i class="el-icon-d-arrow-right"></i>
</i-button>
<i-button type="primary" :title="containerModel.view_allleftbtn.text"
@click="onCLickAllLeft">
<i class="el-icon-d-arrow-left"></i>
</i-button>
</div>
</div>
<div v-if="isShowButton" class="pickupviewpanel__right">
<div class="pickupviewpanel__right__select">
<div v-for="(item, index) in viewSelections" :key="index" :class="item._select ? 'select' : ''" @click="selectionsClick(item)" @dblclick="selectionsDBLClick(item)">
<span>{{item.srfmajortext}}</span>
</div>
</div>
</div>
</div>
</app-ctrl-pos> </app-ctrl-pos>
</template> </template>
</app-scroll-container> </app-scroll-container>
...@@ -469,33 +500,39 @@ export default class IBIZCustomerMPickupView_layoutBase extends Vue { ...@@ -469,33 +500,39 @@ export default class IBIZCustomerMPickupView_layoutBase extends Vue {
* @param {*} [srfParentDeName] 父实体名称 * @param {*} [srfParentDeName] 父实体名称
*/ */
public async panel_Layoutpanel_button_calluilogic1_click(args: any[], context: any = {}, params: any = {}, $event?: any, xData?: any, actionContext?: any, srfParentDeName?: string) { public async panel_Layoutpanel_button_calluilogic1_click(args: any[], context: any = {}, params: any = {}, $event?: any, xData?: any, actionContext?: any, srfParentDeName?: string) {
// 准备上下文参数 // 选择视图保存变更
const tempContext = {...context}; if (Object.is(this.viewType, 'DEPICKUPVIEW') || Object.is(this.viewType, 'DEMPICKUPVIEW')) {
if (xData && xData.context) { this.$emit('viewdataschange', this.viewSelections);
Object.assign(tempContext, xData.context); this.$emit('close', null);
} } else {
const data = args[0]; // 准备上下文参数
let action: string | undefined = undefined; const tempContext = {...context};
const service = await window.entityServiceRegister.getService('ibizcustomer'); if (xData && xData.context) {
if (service) { Object.assign(tempContext, xData.context);
const key = service.APPDEKEY.toLowerCase();
const name = service.APPLYDEKEY.toLowerCase();
if (data.hasOwnProperty(key)) {
Object.assign(tempContext, { [name]: data[key] });
action = 'Update';
} else {
action = 'Create';
} }
if (service[action] && service[action] instanceof Function) { const data = args[0];
service[action](tempContext, data).then((response: any) => { let action: string | undefined = undefined;
if (!response.status || response.status !== 200) { const service = await window.entityServiceRegister.getService('ibizcustomer');
if (service) {
const key = service.APPDEKEY.toLowerCase();
const name = service.APPLYDEKEY.toLowerCase();
if (data.hasOwnProperty(key)) {
Object.assign(tempContext, { [name]: data[key] });
action = 'Update';
} else {
action = 'Create';
}
if (service[action] && service[action] instanceof Function) {
service[action](tempContext, data).then((response: any) => {
if (!response.status || response.status !== 200) {
actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
}
}).catch((error: any) => {
actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' }); actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
} })
}).catch((error: any) => { } else {
actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' }); actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
}) }
} else {
actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
} }
} }
} }
......
...@@ -5,21 +5,51 @@ ...@@ -5,21 +5,51 @@
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<div class="translate-contant"> <div class="translate-contant">
<div class="center" :style="{width : !isShowButton ? '100%' : ''}"> <div class="center" :style="{width : !isShowButton ? '100%' : ''}">
<!-- DEMPICKUPVIEW --> <div class="pickupviewpanel__container">
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))" :viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="JSON.parse(JSON.stringify(context))" :context="JSON.parse(JSON.stringify(context))"
:isSingleSelect="isSingleSelect" :isSingleSelect="isSingleSelect"
:selectedData="selectedData" :selectedData="selectedData"
:isShowButton="isShowButton" :isShowButton="isShowButton"
name="pickupviewpanel" name="pickupviewpanel"
ref='pickupviewpanel' ref='pickupviewpanel'
@selectionchange="pickupviewpanel_selectionchange($event)" @selectionchange="pickupviewpanel_selectionchange($event)"
@load="pickupviewpanel_load($event)" @load="pickupviewpanel_load($event)"
@activated="pickupviewpanel_activated($event)" @activated="pickupviewpanel_activated($event)"
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_pickupviewpanel> </view_pickupviewpanel>
<div v-if="isShowButton" class="pickupviewpanel__center">
<div class="pickupviewpanel__center__buttons">
<i-button type="primary" :title="containerModel.view_rightbtn.text"
:disabled="containerModel.view_rightbtn.disabled"
@click="onCLickRight">
<i class="el-icon-arrow-right"></i>
</i-button>
<i-button type="primary" :title="containerModel.view_leftbtn.text"
:disabled="containerModel.view_leftbtn.disabled"
@click="onCLickLeft">
<i class="el-icon-arrow-left"></i>
</i-button>
<i-button type="primary" :title="containerModel.view_allrightbtn.text"
@click="onCLickAllRight">
<i class="el-icon-d-arrow-right"></i>
</i-button>
<i-button type="primary" :title="containerModel.view_allleftbtn.text"
@click="onCLickAllLeft">
<i class="el-icon-d-arrow-left"></i>
</i-button>
</div>
</div>
<div v-if="isShowButton" class="pickupviewpanel__right">
<div class="pickupviewpanel__right__select">
<div v-for="(item, index) in viewSelections" :key="index" :class="item._select ? 'select' : ''" @click="selectionsClick(item)" @dblclick="selectionsDBLClick(item)">
<span>{{item.srfmajortext}}</span>
</div>
</div>
</div>
</div>
</div> </div>
<div v-if="isShowButton" class="translate-buttons"> <div v-if="isShowButton" class="translate-buttons">
<div class="buttons"> <div class="buttons">
......
...@@ -6,8 +6,7 @@ ...@@ -6,8 +6,7 @@
<app-scroll-container name="container_scroll_main1" :layoutModelDetails="layoutModelDetails"> <app-scroll-container name="container_scroll_main1" :layoutModelDetails="layoutModelDetails">
<template #pickupviewpanel> <template #pickupviewpanel>
<app-ctrl-pos name="pickupviewpanel" :layoutModelDetails="layoutModelDetails"> <app-ctrl-pos name="pickupviewpanel" :layoutModelDetails="layoutModelDetails">
<!-- DEPICKUPVIEW --> <view_pickupviewpanel
<view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))" :viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="JSON.parse(JSON.stringify(context))" :context="JSON.parse(JSON.stringify(context))"
...@@ -21,6 +20,7 @@ ...@@ -21,6 +20,7 @@
@activated="pickupviewpanel_activated($event)" @activated="pickupviewpanel_activated($event)"
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_pickupviewpanel> </view_pickupviewpanel>
</app-ctrl-pos> </app-ctrl-pos>
</template> </template>
</app-scroll-container> </app-scroll-container>
...@@ -468,33 +468,39 @@ export default class IBIZCustomerPickupView_layoutBase extends Vue { ...@@ -468,33 +468,39 @@ export default class IBIZCustomerPickupView_layoutBase extends Vue {
* @param {*} [srfParentDeName] 父实体名称 * @param {*} [srfParentDeName] 父实体名称
*/ */
public async panel_Layoutpanel_button_calluilogic1_click(args: any[], context: any = {}, params: any = {}, $event?: any, xData?: any, actionContext?: any, srfParentDeName?: string) { public async panel_Layoutpanel_button_calluilogic1_click(args: any[], context: any = {}, params: any = {}, $event?: any, xData?: any, actionContext?: any, srfParentDeName?: string) {
// 准备上下文参数 // 选择视图保存变更
const tempContext = {...context}; if (Object.is(this.viewType, 'DEPICKUPVIEW') || Object.is(this.viewType, 'DEMPICKUPVIEW')) {
if (xData && xData.context) { this.$emit('viewdataschange', this.viewSelections);
Object.assign(tempContext, xData.context); this.$emit('close', null);
} } else {
const data = args[0]; // 准备上下文参数
let action: string | undefined = undefined; const tempContext = {...context};
const service = await window.entityServiceRegister.getService('ibizcustomer'); if (xData && xData.context) {
if (service) { Object.assign(tempContext, xData.context);
const key = service.APPDEKEY.toLowerCase();
const name = service.APPLYDEKEY.toLowerCase();
if (data.hasOwnProperty(key)) {
Object.assign(tempContext, { [name]: data[key] });
action = 'Update';
} else {
action = 'Create';
} }
if (service[action] && service[action] instanceof Function) { const data = args[0];
service[action](tempContext, data).then((response: any) => { let action: string | undefined = undefined;
if (!response.status || response.status !== 200) { const service = await window.entityServiceRegister.getService('ibizcustomer');
if (service) {
const key = service.APPDEKEY.toLowerCase();
const name = service.APPLYDEKEY.toLowerCase();
if (data.hasOwnProperty(key)) {
Object.assign(tempContext, { [name]: data[key] });
action = 'Update';
} else {
action = 'Create';
}
if (service[action] && service[action] instanceof Function) {
service[action](tempContext, data).then((response: any) => {
if (!response.status || response.status !== 200) {
actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
}
}).catch((error: any) => {
actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' }); actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
} })
}).catch((error: any) => { } else {
actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' }); actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
}) }
} else {
actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
} }
} }
} }
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<app-studioaction :viewTitle="$t(model.srfCaption)" viewName="ibizcustomerpickupview"></app-studioaction> <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="ibizcustomerpickupview"></app-studioaction>
<card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false"> <card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false">
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<!-- DEPICKUPVIEW -->
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))" :viewparams="JSON.parse(JSON.stringify(viewparams))"
......
...@@ -6,21 +6,52 @@ ...@@ -6,21 +6,52 @@
<app-scroll-container name="container_scroll_main1" :layoutModelDetails="layoutModelDetails"> <app-scroll-container name="container_scroll_main1" :layoutModelDetails="layoutModelDetails">
<template #pickupviewpanel> <template #pickupviewpanel>
<app-ctrl-pos name="pickupviewpanel" :layoutModelDetails="layoutModelDetails"> <app-ctrl-pos name="pickupviewpanel" :layoutModelDetails="layoutModelDetails">
<!-- DEMPICKUPVIEW --> <div class="pickupviewpanel__container">
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))" :viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="JSON.parse(JSON.stringify(context))" :context="JSON.parse(JSON.stringify(context))"
:isSingleSelect="isSingleSelect" :isSingleSelect="isSingleSelect"
:selectedData="selectedData" :selectedData="selectedData"
:isShowButton="isShowButton" :isShowButton="isShowButton"
name="pickupviewpanel" name="pickupviewpanel"
ref='pickupviewpanel' ref='pickupviewpanel'
@selectionchange="pickupviewpanel_selectionchange($event)" @selectionchange="pickupviewpanel_selectionchange($event)"
@load="pickupviewpanel_load($event)" @load="pickupviewpanel_load($event)"
@activated="pickupviewpanel_activated($event)" @activated="pickupviewpanel_activated($event)"
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_pickupviewpanel> </view_pickupviewpanel>
<div v-if="isShowButton" class="pickupviewpanel__center">
<div class="pickupviewpanel__center__buttons">
<i-button type="primary" :title="containerModel.view_rightbtn.text"
:disabled="containerModel.view_rightbtn.disabled"
@click="onCLickRight">
<i class="el-icon-arrow-right"></i>
</i-button>
<i-button type="primary" :title="containerModel.view_leftbtn.text"
:disabled="containerModel.view_leftbtn.disabled"
@click="onCLickLeft">
<i class="el-icon-arrow-left"></i>
</i-button>
<i-button type="primary" :title="containerModel.view_allrightbtn.text"
@click="onCLickAllRight">
<i class="el-icon-d-arrow-right"></i>
</i-button>
<i-button type="primary" :title="containerModel.view_allleftbtn.text"
@click="onCLickAllLeft">
<i class="el-icon-d-arrow-left"></i>
</i-button>
</div>
</div>
<div v-if="isShowButton" class="pickupviewpanel__right">
<div class="pickupviewpanel__right__select">
<div v-for="(item, index) in viewSelections" :key="index" :class="item._select ? 'select' : ''" @click="selectionsClick(item)" @dblclick="selectionsDBLClick(item)">
<span>{{item.srfmajortext}}</span>
</div>
</div>
</div>
</div>
</app-ctrl-pos> </app-ctrl-pos>
</template> </template>
</app-scroll-container> </app-scroll-container>
...@@ -469,33 +500,39 @@ export default class IBIZCustomerUsr2MPickupView_layoutBase extends Vue { ...@@ -469,33 +500,39 @@ export default class IBIZCustomerUsr2MPickupView_layoutBase extends Vue {
* @param {*} [srfParentDeName] 父实体名称 * @param {*} [srfParentDeName] 父实体名称
*/ */
public async panel_Layoutpanel_button_calluilogic1_click(args: any[], context: any = {}, params: any = {}, $event?: any, xData?: any, actionContext?: any, srfParentDeName?: string) { public async panel_Layoutpanel_button_calluilogic1_click(args: any[], context: any = {}, params: any = {}, $event?: any, xData?: any, actionContext?: any, srfParentDeName?: string) {
// 准备上下文参数 // 选择视图保存变更
const tempContext = {...context}; if (Object.is(this.viewType, 'DEPICKUPVIEW') || Object.is(this.viewType, 'DEMPICKUPVIEW')) {
if (xData && xData.context) { this.$emit('viewdataschange', this.viewSelections);
Object.assign(tempContext, xData.context); this.$emit('close', null);
} } else {
const data = args[0]; // 准备上下文参数
let action: string | undefined = undefined; const tempContext = {...context};
const service = await window.entityServiceRegister.getService('ibizcustomer'); if (xData && xData.context) {
if (service) { Object.assign(tempContext, xData.context);
const key = service.APPDEKEY.toLowerCase();
const name = service.APPLYDEKEY.toLowerCase();
if (data.hasOwnProperty(key)) {
Object.assign(tempContext, { [name]: data[key] });
action = 'Update';
} else {
action = 'Create';
} }
if (service[action] && service[action] instanceof Function) { const data = args[0];
service[action](tempContext, data).then((response: any) => { let action: string | undefined = undefined;
if (!response.status || response.status !== 200) { const service = await window.entityServiceRegister.getService('ibizcustomer');
if (service) {
const key = service.APPDEKEY.toLowerCase();
const name = service.APPLYDEKEY.toLowerCase();
if (data.hasOwnProperty(key)) {
Object.assign(tempContext, { [name]: data[key] });
action = 'Update';
} else {
action = 'Create';
}
if (service[action] && service[action] instanceof Function) {
service[action](tempContext, data).then((response: any) => {
if (!response.status || response.status !== 200) {
actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
}
}).catch((error: any) => {
actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' }); actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
} })
}).catch((error: any) => { } else {
actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' }); actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
}) }
} else {
actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
} }
} }
} }
......
...@@ -5,21 +5,51 @@ ...@@ -5,21 +5,51 @@
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<div class="translate-contant"> <div class="translate-contant">
<div class="center" :style="{width : !isShowButton ? '100%' : ''}"> <div class="center" :style="{width : !isShowButton ? '100%' : ''}">
<!-- DEMPICKUPVIEW --> <div class="pickupviewpanel__container">
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))" :viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="JSON.parse(JSON.stringify(context))" :context="JSON.parse(JSON.stringify(context))"
:isSingleSelect="isSingleSelect" :isSingleSelect="isSingleSelect"
:selectedData="selectedData" :selectedData="selectedData"
:isShowButton="isShowButton" :isShowButton="isShowButton"
name="pickupviewpanel" name="pickupviewpanel"
ref='pickupviewpanel' ref='pickupviewpanel'
@selectionchange="pickupviewpanel_selectionchange($event)" @selectionchange="pickupviewpanel_selectionchange($event)"
@load="pickupviewpanel_load($event)" @load="pickupviewpanel_load($event)"
@activated="pickupviewpanel_activated($event)" @activated="pickupviewpanel_activated($event)"
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_pickupviewpanel> </view_pickupviewpanel>
<div v-if="isShowButton" class="pickupviewpanel__center">
<div class="pickupviewpanel__center__buttons">
<i-button type="primary" :title="containerModel.view_rightbtn.text"
:disabled="containerModel.view_rightbtn.disabled"
@click="onCLickRight">
<i class="el-icon-arrow-right"></i>
</i-button>
<i-button type="primary" :title="containerModel.view_leftbtn.text"
:disabled="containerModel.view_leftbtn.disabled"
@click="onCLickLeft">
<i class="el-icon-arrow-left"></i>
</i-button>
<i-button type="primary" :title="containerModel.view_allrightbtn.text"
@click="onCLickAllRight">
<i class="el-icon-d-arrow-right"></i>
</i-button>
<i-button type="primary" :title="containerModel.view_allleftbtn.text"
@click="onCLickAllLeft">
<i class="el-icon-d-arrow-left"></i>
</i-button>
</div>
</div>
<div v-if="isShowButton" class="pickupviewpanel__right">
<div class="pickupviewpanel__right__select">
<div v-for="(item, index) in viewSelections" :key="index" :class="item._select ? 'select' : ''" @click="selectionsClick(item)" @dblclick="selectionsDBLClick(item)">
<span>{{item.srfmajortext}}</span>
</div>
</div>
</div>
</div>
</div> </div>
<div v-if="isShowButton" class="translate-buttons"> <div v-if="isShowButton" class="translate-buttons">
<div class="buttons"> <div class="buttons">
......
...@@ -6,8 +6,7 @@ ...@@ -6,8 +6,7 @@
<app-scroll-container name="container_scroll_main1" :layoutModelDetails="layoutModelDetails"> <app-scroll-container name="container_scroll_main1" :layoutModelDetails="layoutModelDetails">
<template #pickupviewpanel> <template #pickupviewpanel>
<app-ctrl-pos name="pickupviewpanel" :layoutModelDetails="layoutModelDetails"> <app-ctrl-pos name="pickupviewpanel" :layoutModelDetails="layoutModelDetails">
<!-- DEPICKUPVIEW --> <view_pickupviewpanel
<view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))" :viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="JSON.parse(JSON.stringify(context))" :context="JSON.parse(JSON.stringify(context))"
...@@ -21,6 +20,7 @@ ...@@ -21,6 +20,7 @@
@activated="pickupviewpanel_activated($event)" @activated="pickupviewpanel_activated($event)"
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_pickupviewpanel> </view_pickupviewpanel>
</app-ctrl-pos> </app-ctrl-pos>
</template> </template>
</app-scroll-container> </app-scroll-container>
...@@ -468,33 +468,39 @@ export default class IBIZCustomerUsr2PickupView_layoutBase extends Vue { ...@@ -468,33 +468,39 @@ export default class IBIZCustomerUsr2PickupView_layoutBase extends Vue {
* @param {*} [srfParentDeName] 父实体名称 * @param {*} [srfParentDeName] 父实体名称
*/ */
public async panel_Layoutpanel_button_calluilogic1_click(args: any[], context: any = {}, params: any = {}, $event?: any, xData?: any, actionContext?: any, srfParentDeName?: string) { public async panel_Layoutpanel_button_calluilogic1_click(args: any[], context: any = {}, params: any = {}, $event?: any, xData?: any, actionContext?: any, srfParentDeName?: string) {
// 准备上下文参数 // 选择视图保存变更
const tempContext = {...context}; if (Object.is(this.viewType, 'DEPICKUPVIEW') || Object.is(this.viewType, 'DEMPICKUPVIEW')) {
if (xData && xData.context) { this.$emit('viewdataschange', this.viewSelections);
Object.assign(tempContext, xData.context); this.$emit('close', null);
} } else {
const data = args[0]; // 准备上下文参数
let action: string | undefined = undefined; const tempContext = {...context};
const service = await window.entityServiceRegister.getService('ibizcustomer'); if (xData && xData.context) {
if (service) { Object.assign(tempContext, xData.context);
const key = service.APPDEKEY.toLowerCase();
const name = service.APPLYDEKEY.toLowerCase();
if (data.hasOwnProperty(key)) {
Object.assign(tempContext, { [name]: data[key] });
action = 'Update';
} else {
action = 'Create';
} }
if (service[action] && service[action] instanceof Function) { const data = args[0];
service[action](tempContext, data).then((response: any) => { let action: string | undefined = undefined;
if (!response.status || response.status !== 200) { const service = await window.entityServiceRegister.getService('ibizcustomer');
if (service) {
const key = service.APPDEKEY.toLowerCase();
const name = service.APPLYDEKEY.toLowerCase();
if (data.hasOwnProperty(key)) {
Object.assign(tempContext, { [name]: data[key] });
action = 'Update';
} else {
action = 'Create';
}
if (service[action] && service[action] instanceof Function) {
service[action](tempContext, data).then((response: any) => {
if (!response.status || response.status !== 200) {
actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
}
}).catch((error: any) => {
actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' }); actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
} })
}).catch((error: any) => { } else {
actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' }); actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
}) }
} else {
actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
} }
} }
} }
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<app-studioaction :viewTitle="$t(model.srfCaption)" viewName="ibizcustomerusr2pickupview"></app-studioaction> <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="ibizcustomerusr2pickupview"></app-studioaction>
<card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false"> <card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false">
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<!-- DEPICKUPVIEW -->
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))" :viewparams="JSON.parse(JSON.stringify(viewparams))"
......
...@@ -533,7 +533,7 @@ export default class IBIZCustomerUsr3EditViewBase extends Vue { ...@@ -533,7 +533,7 @@ export default class IBIZCustomerUsr3EditViewBase extends Vue {
view_pagecaption3:{ name: 'view_pagecaption3', type: 'VIEWLAYOUT', caption: '页面标题', isShowCaption: false, sysCss: '', itemType: 'FIELD', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'LEFT', vAlignSelf:'TOP', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container21', panel: this , required: false, fieldState: '0', predefinedType: 'VIEW_PAGECAPTION', renderMode: 'HEADING1', dataItemName:'', wrapMode:'', vAlign:'', hAlign:'', }, view_pagecaption3:{ name: 'view_pagecaption3', type: 'VIEWLAYOUT', caption: '页面标题', isShowCaption: false, sysCss: '', itemType: 'FIELD', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'LEFT', vAlignSelf:'TOP', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container21', panel: this , required: false, fieldState: '0', predefinedType: 'VIEW_PAGECAPTION', renderMode: 'HEADING1', dataItemName:'', wrapMode:'', vAlign:'', hAlign:'', },
view_pagecaption4:{ name: 'view_pagecaption4', type: 'VIEWLAYOUT', caption: '页面标题', isShowCaption: false, sysCss: '', itemType: 'FIELD', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container21', panel: this , required: false, fieldState: '0', predefinedType: 'VIEW_PAGECAPTION', renderMode: 'HEADING1', dataItemName:'', wrapMode:'', vAlign:'', hAlign:'', }, view_pagecaption4:{ name: 'view_pagecaption4', type: 'VIEWLAYOUT', caption: '页面标题', isShowCaption: false, sysCss: '', itemType: 'FIELD', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container21', panel: this , required: false, fieldState: '0', predefinedType: 'VIEW_PAGECAPTION', renderMode: 'HEADING1', dataItemName:'', wrapMode:'', vAlign:'', hAlign:'', },
view_pagecaption5:{ name: 'view_pagecaption5', type: 'VIEWLAYOUT', caption: '页面标题', isShowCaption: false, sysCss: '', itemType: 'FIELD', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'RIGHT', vAlignSelf:'BOTTOM', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container21', panel: this , required: false, fieldState: '0', predefinedType: 'VIEW_PAGECAPTION', renderMode: 'HEADING1', dataItemName:'', wrapMode:'', vAlign:'', hAlign:'', }, view_pagecaption5:{ name: 'view_pagecaption5', type: 'VIEWLAYOUT', caption: '页面标题', isShowCaption: false, sysCss: '', itemType: 'FIELD', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'RIGHT', vAlignSelf:'BOTTOM', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container21', panel: this , required: false, fieldState: '0', predefinedType: 'VIEW_PAGECAPTION', renderMode: 'HEADING1', dataItemName:'', wrapMode:'', vAlign:'', hAlign:'', },
container21:{ name: 'container21', type: 'VIEWLAYOUT', caption: '容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'FLEX', layoutPos:'CENTER', layoutHeight:100, heightMode:'PX', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'center',dir:'row',vAlign:'center'}, parentName: 'container_scroll_main1', panel: this , details:['view_pagecaption3','view_pagecaption4','view_pagecaption5'] , dataRegionType: 'INHERIT' }, container21:{ name: 'container21', type: 'VIEWLAYOUT', caption: '容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'FLEX', layoutPos:'CENTER', layoutHeight:500, heightMode:'PX', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'center',dir:'row',vAlign:'center'}, parentName: 'container_scroll_main1', panel: this , details:['view_pagecaption3','view_pagecaption4','view_pagecaption5'] , dataRegionType: 'INHERIT' },
container_scroll_main1:{ name: 'container_scroll_main1', type: 'VIEWLAYOUT', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['static_label1','container_grid1','static_label2','container_grid2','static_label3','container_grid5','static_label4','container_grid3','container20','container21'] , dataRegionType: 'INHERIT' }, container_scroll_main1:{ name: 'container_scroll_main1', type: 'VIEWLAYOUT', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['static_label1','container_grid1','static_label2','container_grid2','static_label3','container_grid5','static_label4','container_grid3','container20','container21'] , dataRegionType: 'INHERIT' },
container_scroll1:{ name: 'container_scroll1', type: 'VIEWLAYOUT', caption: '滚动条容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, panel: this , details:['container_scroll_main1'] , dataRegionType: 'INHERIT' } container_scroll1:{ name: 'container_scroll1', type: 'VIEWLAYOUT', caption: '滚动条容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, panel: this , details:['container_scroll_main1'] , dataRegionType: 'INHERIT' }
} }
...@@ -774,33 +774,39 @@ export default class IBIZCustomerUsr3EditViewBase extends Vue { ...@@ -774,33 +774,39 @@ export default class IBIZCustomerUsr3EditViewBase extends Vue {
* @param {*} [srfParentDeName] 父实体名称 * @param {*} [srfParentDeName] 父实体名称
*/ */
public async panel_Layoutpanel_button_calluilogic23_click(args: any[], context: any = {}, params: any = {}, $event?: any, xData?: any, actionContext?: any, srfParentDeName?: string) { public async panel_Layoutpanel_button_calluilogic23_click(args: any[], context: any = {}, params: any = {}, $event?: any, xData?: any, actionContext?: any, srfParentDeName?: string) {
// 准备上下文参数 // 选择视图保存变更
const tempContext = {...context}; if (Object.is(this.viewType, 'DEPICKUPVIEW') || Object.is(this.viewType, 'DEMPICKUPVIEW')) {
if (xData && xData.context) { this.$emit('viewdataschange', this.viewSelections);
Object.assign(tempContext, xData.context); this.$emit('close', null);
} } else {
const data = args[0]; // 准备上下文参数
let action: string | undefined = undefined; const tempContext = {...context};
const service = await window.entityServiceRegister.getService('ibizcustomer'); if (xData && xData.context) {
if (service) { Object.assign(tempContext, xData.context);
const key = service.APPDEKEY.toLowerCase();
const name = service.APPLYDEKEY.toLowerCase();
if (data.hasOwnProperty(key)) {
Object.assign(tempContext, { [name]: data[key] });
action = 'Update';
} else {
action = 'Create';
} }
if (service[action] && service[action] instanceof Function) { const data = args[0];
service[action](tempContext, data).then((response: any) => { let action: string | undefined = undefined;
if (!response.status || response.status !== 200) { const service = await window.entityServiceRegister.getService('ibizcustomer');
if (service) {
const key = service.APPDEKEY.toLowerCase();
const name = service.APPLYDEKEY.toLowerCase();
if (data.hasOwnProperty(key)) {
Object.assign(tempContext, { [name]: data[key] });
action = 'Update';
} else {
action = 'Create';
}
if (service[action] && service[action] instanceof Function) {
service[action](tempContext, data).then((response: any) => {
if (!response.status || response.status !== 200) {
actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
}
}).catch((error: any) => {
actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' }); actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
} })
}).catch((error: any) => { } else {
actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' }); actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
}) }
} else {
actionContext.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
} }
} }
} }
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<app-studioaction :viewTitle="$t(model.srfCaption)" viewName="ibizhardwareindexpickupview"></app-studioaction> <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="ibizhardwareindexpickupview"></app-studioaction>
<card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false"> <card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false">
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<!-- DEPICKUPVIEW -->
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))" :viewparams="JSON.parse(JSON.stringify(viewparams))"
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<app-studioaction :viewTitle="$t(model.srfCaption)" viewName="ibizorderpickupview"></app-studioaction> <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="ibizorderpickupview"></app-studioaction>
<card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false"> <card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false">
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<!-- DEPICKUPVIEW -->
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))" :viewparams="JSON.parse(JSON.stringify(viewparams))"
......
...@@ -5,21 +5,51 @@ ...@@ -5,21 +5,51 @@
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<div class="translate-contant"> <div class="translate-contant">
<div class="center" :style="{width : !isShowButton ? '100%' : ''}"> <div class="center" :style="{width : !isShowButton ? '100%' : ''}">
<!-- DEMPICKUPVIEW --> <div class="pickupviewpanel__container">
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))" :viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="JSON.parse(JSON.stringify(context))" :context="JSON.parse(JSON.stringify(context))"
:isSingleSelect="isSingleSelect" :isSingleSelect="isSingleSelect"
:selectedData="selectedData" :selectedData="selectedData"
:isShowButton="isShowButton" :isShowButton="isShowButton"
name="pickupviewpanel" name="pickupviewpanel"
ref='pickupviewpanel' ref='pickupviewpanel'
@selectionchange="pickupviewpanel_selectionchange($event)" @selectionchange="pickupviewpanel_selectionchange($event)"
@load="pickupviewpanel_load($event)" @load="pickupviewpanel_load($event)"
@activated="pickupviewpanel_activated($event)" @activated="pickupviewpanel_activated($event)"
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_pickupviewpanel> </view_pickupviewpanel>
<div v-if="isShowButton" class="pickupviewpanel__center">
<div class="pickupviewpanel__center__buttons">
<i-button type="primary" :title="containerModel.view_rightbtn.text"
:disabled="containerModel.view_rightbtn.disabled"
@click="onCLickRight">
<i class="el-icon-arrow-right"></i>
</i-button>
<i-button type="primary" :title="containerModel.view_leftbtn.text"
:disabled="containerModel.view_leftbtn.disabled"
@click="onCLickLeft">
<i class="el-icon-arrow-left"></i>
</i-button>
<i-button type="primary" :title="containerModel.view_allrightbtn.text"
@click="onCLickAllRight">
<i class="el-icon-d-arrow-right"></i>
</i-button>
<i-button type="primary" :title="containerModel.view_allleftbtn.text"
@click="onCLickAllLeft">
<i class="el-icon-d-arrow-left"></i>
</i-button>
</div>
</div>
<div v-if="isShowButton" class="pickupviewpanel__right">
<div class="pickupviewpanel__right__select">
<div v-for="(item, index) in viewSelections" :key="index" :class="item._select ? 'select' : ''" @click="selectionsClick(item)" @dblclick="selectionsDBLClick(item)">
<span>{{item.srfmajortext}}</span>
</div>
</div>
</div>
</div>
</div> </div>
<div v-if="isShowButton" class="translate-buttons"> <div v-if="isShowButton" class="translate-buttons">
<div class="buttons"> <div class="buttons">
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<app-studioaction :viewTitle="$t(model.srfCaption)" viewName="ibizsample0002pickupview"></app-studioaction> <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="ibizsample0002pickupview"></app-studioaction>
<card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false"> <card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false">
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<!-- DEPICKUPVIEW -->
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))" :viewparams="JSON.parse(JSON.stringify(viewparams))"
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<app-studioaction :viewTitle="$t(model.srfCaption)" viewName="ibizsample0003pickupview"></app-studioaction> <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="ibizsample0003pickupview"></app-studioaction>
<card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false"> <card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false">
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<!-- DEPICKUPVIEW -->
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))" :viewparams="JSON.parse(JSON.stringify(viewparams))"
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<app-studioaction :viewTitle="$t(model.srfCaption)" viewName="ibizuniproductindexpickupview"></app-studioaction> <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="ibizuniproductindexpickupview"></app-studioaction>
<card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false"> <card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false">
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<!-- DEPICKUPVIEW -->
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))" :viewparams="JSON.parse(JSON.stringify(viewparams))"
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<app-studioaction :viewTitle="$t(model.srfCaption)" viewName="ibizuniproductpickupview"></app-studioaction> <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="ibizuniproductpickupview"></app-studioaction>
<card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false"> <card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false">
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<!-- DEPICKUPVIEW -->
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))" :viewparams="JSON.parse(JSON.stringify(viewparams))"
......
...@@ -712,7 +712,13 @@ export default class AppIndexViewBase extends Vue { ...@@ -712,7 +712,13 @@ export default class AppIndexViewBase extends Vue {
* @param {*} [srfParentDeName] 父实体名称 * @param {*} [srfParentDeName] 父实体名称
*/ */
public async panel_Usr1102678360_button_calluilogic6_click(args: any[], context: any = {}, params: any = {}, $event?: any, xData?: any, actionContext?: any, srfParentDeName?: string) { public async panel_Usr1102678360_button_calluilogic6_click(args: any[], context: any = {}, params: any = {}, $event?: any, xData?: any, actionContext?: any, srfParentDeName?: string) {
actionContext.$Notice.error({ title: '错误', desc: '保存变更行为未配置实体' }); // 选择视图保存变更
if (Object.is(this.viewType, 'DEPICKUPVIEW') || Object.is(this.viewType, 'DEMPICKUPVIEW')) {
this.$emit('viewdataschange', this.viewSelections);
this.$emit('close', null);
} else {
actionContext.$Notice.error({ title: '错误', desc: '保存变更行为未配置实体' });
}
} }
/** /**
* 删除数据按钮 * 删除数据按钮
......
...@@ -315,9 +315,56 @@ ...@@ -315,9 +315,56 @@
margin: 6px 0 4px 4px; margin: 6px 0 4px 4px;
} }
} }
.app-ctrl-pos>.pickupviewpanel { .app-ctrl-pos.pickupviewpanel {
height: 100%; .pickupviewpanel__container {
padding-top: 8px; overflow: auto;
flex-grow: 1;
display: flex;
justify-content: flex-end;
height: 100%;
.pickupviewpanel__center {
width: 80px;
display: flex;
align-items: center;
text-align: center;
button {
margin-bottom: 5px;
}
}
.pickupviewpanel__right {
width: 300px;
border: 1px solid #e9e9e9;
.pickupviewpanel__right__select {
font-family: helvetica, sans-serif;
font-size: 16px;
text-align: justify;
word-spacing: -3.8pt;
line-height: 1.6;
font-weight: bold;
word-spacing: 10px;
height: 100%;
overflow: auto;
}
.pickupviewpanel__right__select > div {
padding: 3px 10px;
font-size: 14px;
color: rgba(0, 0, 0, 0.85);
font-weight: initial;
cursor: pointer;
min-height: 28px;
border: 1px solid #e9e9e9;
margin: 4px 4px;
transition: all .3s;
}
.pickupviewpanel__right__select > div:hover {
background: #ecf6fd;
}
.pickupviewpanel__right__select > .select{
color: #108ee9;
background: #ecf6fd;
}
}
}
} }
} }
.app-view-layout__appindexview,.app-view-layout__apploginview { .app-view-layout__appindexview,.app-view-layout__apploginview {
......
...@@ -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: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCalendarView' + (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: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
return; return;
} }
const arg: any = { ...opt } ; const arg: any = { ...opt } ;
......
...@@ -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_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loadaction') as string) });
return; return;
} }
const arg: any = { ...opt }; const arg: any = { ...opt };
...@@ -1494,7 +1494,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface { ...@@ -1494,7 +1494,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_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
return; return;
} }
const arg: any = { ...opt } ; const arg: any = { ...opt } ;
...@@ -1564,7 +1564,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface { ...@@ -1564,7 +1564,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_layout' + (this.$t('app.formpage.notconfig.actionname') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
return; return;
} }
Object.assign(arg,{viewparams:this.viewparams}); Object.assign(arg,{viewparams:this.viewparams});
...@@ -1672,7 +1672,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface { ...@@ -1672,7 +1672,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_layout' + (this.$t('app.formpage.notconfig.actionname') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
return; return;
} }
Object.assign(arg, { viewparams: this.viewparams }); Object.assign(arg, { viewparams: this.viewparams });
...@@ -1764,7 +1764,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface { ...@@ -1764,7 +1764,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_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.removeaction') as string) });
return; return;
} }
const arg: any = opt[0]; const arg: any = opt[0];
...@@ -1830,7 +1830,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface { ...@@ -1830,7 +1830,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
// 極雿,憛怠摮 // 極雿,憛怠摮
Object.assign(arg,copyData); Object.assign(arg,copyData);
// 漱 // 漱
if(this.viewparams){ if(is.viewparams){
let copyViewParams:any = Util.deepCopy(this.viewparams); let copyViewParams:any = Util.deepCopy(this.viewparams);
if(copyViewParams.w){ if(copyViewParams.w){
delete copyViewParams.w; delete copyViewParams.w;
...@@ -1993,7 +1993,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface { ...@@ -1993,7 +1993,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
this.onFormLoad(data,emitAction); this.onFormLoad(data,emitAction);
this.$emit(emitAction, data); this.$emit(emitAction, data);
this.$nextTick(() => { this.$nextTick(() => {
this.formState.next({ type: emitAction, data: data }); i this.formState.next({ type: emitAction, data: data });
}); });
}).catch((response: any) => { }).catch((response: any) => {
if (response && response.status && response.data) { if (response && response.status && response.data) {
...@@ -2194,4 +2194,5 @@ export default class GuideViewFormBase extends Vue implements ControlInterface { ...@@ -2194,4 +2194,5 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
<style lang='less'> <style lang='less'>
@import './guide-view-form-form.less'; @import './guide-view-form-form.less';
</style>uide-view-form-form.less';
</style> </style>
\ No newline at end of file
...@@ -319,7 +319,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -319,7 +319,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @param {*} [$event] 事件源 * @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件 * @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文 * @param {*} [actionContext] 执行行为上下文
* @memberof IBIZOrderSF1GridViewBase * @memberof IBIZOrderPickupGridViewBase
*/ */
public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) { public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
if (args.length === 0) { if (args.length === 0) {
...@@ -462,20 +462,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -462,20 +462,6 @@ export default class MainBase extends Vue implements ControlInterface {
return this.selections[0]; return this.selections[0];
} }
/**
* 打开新建数据视图
*
* @type {any}
* @memberof MainBase
*/
@Prop() public newdata: any;
/**
* 打开编辑数据视图
*
* @type {any}
* @memberof MainBase
*/
@Prop() public opendata: any;
/** /**
* 是否嵌入关系界面 * 是否嵌入关系界面
...@@ -1010,7 +996,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1010,7 +996,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: "IBIZOrderSF1GridView" + (this.$t("app.gridpage.notConfig.fetchAction") as string), desc: "IBIZOrderPickupGridView" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
}); });
return; return;
} }
...@@ -1139,7 +1125,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1139,7 +1125,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: 'IBIZOrderSF1GridView' + (this.$t('app.gridpage.notConfig.removeAction') as string) desc: 'IBIZOrderPickupGridView' + (this.$t('app.gridpage.notConfig.removeAction') as string)
}); });
return; return;
} }
...@@ -1253,7 +1239,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1253,7 +1239,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: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
return; return;
} }
if(!arg){ if(!arg){
...@@ -2184,7 +2170,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -2184,7 +2170,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: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.createAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(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);
...@@ -2193,7 +2179,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -2193,7 +2179,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: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(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);
...@@ -2269,7 +2255,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -2269,7 +2255,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: 'IBIZOrderSF1GridView' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string) desc: 'IBIZOrderPickupGridView' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
}); });
return; return;
} }
......
...@@ -105,21 +105,6 @@ export default class MainModel { ...@@ -105,21 +105,6 @@ export default class MainModel {
prop: 'n_ibizordername_like', prop: 'n_ibizordername_like',
dataType: 'QUERYPARAM' dataType: 'QUERYPARAM'
}, },
{
name: 'n_orderstate_eq',
prop: 'n_orderstate_eq',
dataType: 'QUERYPARAM'
},
{
name: 'n_ordertime_gt',
prop: 'n_ordertime_gt',
dataType: 'QUERYPARAM'
},
{
name: 'n_ordertime_lt',
prop: 'n_ordertime_lt',
dataType: 'QUERYPARAM'
},
{ {
name:'size', name:'size',
......
...@@ -11,51 +11,51 @@ ...@@ -11,51 +11,51 @@
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
}, },
"getPSDETreeColumns" : [ { "getPSDETreeColumns" : [ {
"caption" : "借出日期", "caption" : "归还日期",
"codeName" : "lendouttime", "codeName" : "returntime",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "lendouttime", "dataItemName" : "returntime",
"name" : "lendouttime", "name" : "returntime",
"width" : 200, "width" : 200,
"widthUnit" : "px", "widthUnit" : "px",
"enableExpand" : false, "enableExpand" : false,
"enableSort" : false "enableSort" : false
}, { }, {
"caption" : "作者", "caption" : "出版社",
"codeName" : "author", "codeName" : "press",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "author", "dataItemName" : "press",
"name" : "author", "name" : "press",
"width" : 200, "width" : 200,
"widthUnit" : "px", "widthUnit" : "px",
"enableExpand" : false, "enableExpand" : false,
"enableSort" : false "enableSort" : false
}, { }, {
"caption" : "图书名称", "caption" : "借出日期",
"codeName" : "ibizbookname", "codeName" : "lendouttime",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "ibizbookname", "dataItemName" : "lendouttime",
"name" : "ibizbookname", "name" : "lendouttime",
"width" : 200, "width" : 200,
"widthUnit" : "px", "widthUnit" : "px",
"enableExpand" : false, "enableExpand" : false,
"enableSort" : false "enableSort" : false
}, { }, {
"caption" : "归还日期", "caption" : "作者",
"codeName" : "returntime", "codeName" : "author",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "returntime", "dataItemName" : "author",
"name" : "returntime", "name" : "author",
"width" : 200, "width" : 200,
"widthUnit" : "px", "widthUnit" : "px",
"enableExpand" : false, "enableExpand" : false,
"enableSort" : false "enableSort" : false
}, { }, {
"caption" : "出版社", "caption" : "图书名称",
"codeName" : "press", "codeName" : "ibizbookname",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "press", "dataItemName" : "ibizbookname",
"name" : "press", "name" : "ibizbookname",
"width" : 200, "width" : 200,
"widthUnit" : "px", "widthUnit" : "px",
"enableExpand" : false, "enableExpand" : false,
......
...@@ -19,6 +19,16 @@ ...@@ -19,6 +19,16 @@
} }
} ], } ],
"getPSDETreeColumns" : [ { "getPSDETreeColumns" : [ {
"caption" : "图书名称",
"codeName" : "ibizbookname",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "ibizbookname",
"name" : "ibizbookname",
"width" : 50,
"widthUnit" : "px",
"enableExpand" : false,
"enableSort" : false
}, {
"caption" : "作者", "caption" : "作者",
"codeName" : "author", "codeName" : "author",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
...@@ -38,16 +48,6 @@ ...@@ -38,16 +48,6 @@
"widthUnit" : "px", "widthUnit" : "px",
"enableExpand" : false, "enableExpand" : false,
"enableSort" : false "enableSort" : false
}, {
"caption" : "图书名称",
"codeName" : "ibizbookname",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "ibizbookname",
"name" : "ibizbookname",
"width" : 50,
"widthUnit" : "px",
"enableExpand" : false,
"enableSort" : false
} ], } ],
"getPSDETreeNodeRSs" : [ { "getPSDETreeNodeRSs" : [ {
"getChildPSDETreeNode" : { "getChildPSDETreeNode" : {
......
...@@ -34,51 +34,51 @@ ...@@ -34,51 +34,51 @@
"id" : "GANTT" "id" : "GANTT"
}, },
"getPSDETreeColumns" : [ { "getPSDETreeColumns" : [ {
"caption" : "借出日期", "caption" : "归还日期",
"codeName" : "lendouttime", "codeName" : "returntime",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "lendouttime", "dataItemName" : "returntime",
"name" : "lendouttime", "name" : "returntime",
"width" : 200, "width" : 200,
"widthUnit" : "px", "widthUnit" : "px",
"enableExpand" : false, "enableExpand" : false,
"enableSort" : false "enableSort" : false
}, { }, {
"caption" : "作者", "caption" : "出版社",
"codeName" : "author", "codeName" : "press",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "author", "dataItemName" : "press",
"name" : "author", "name" : "press",
"width" : 200, "width" : 200,
"widthUnit" : "px", "widthUnit" : "px",
"enableExpand" : false, "enableExpand" : false,
"enableSort" : false "enableSort" : false
}, { }, {
"caption" : "图书名称", "caption" : "借出日期",
"codeName" : "ibizbookname", "codeName" : "lendouttime",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "ibizbookname", "dataItemName" : "lendouttime",
"name" : "ibizbookname", "name" : "lendouttime",
"width" : 200, "width" : 200,
"widthUnit" : "px", "widthUnit" : "px",
"enableExpand" : false, "enableExpand" : false,
"enableSort" : false "enableSort" : false
}, { }, {
"caption" : "归还日期", "caption" : "作者",
"codeName" : "returntime", "codeName" : "author",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "returntime", "dataItemName" : "author",
"name" : "returntime", "name" : "author",
"width" : 200, "width" : 200,
"widthUnit" : "px", "widthUnit" : "px",
"enableExpand" : false, "enableExpand" : false,
"enableSort" : false "enableSort" : false
}, { }, {
"caption" : "出版社", "caption" : "图书名称",
"codeName" : "press", "codeName" : "ibizbookname",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "press", "dataItemName" : "ibizbookname",
"name" : "press", "name" : "ibizbookname",
"width" : 200, "width" : 200,
"widthUnit" : "px", "widthUnit" : "px",
"enableExpand" : false, "enableExpand" : false,
......
...@@ -75,6 +75,16 @@ ...@@ -75,6 +75,16 @@
"id" : "TREEGRIDEX" "id" : "TREEGRIDEX"
}, },
"getPSDETreeColumns" : [ { "getPSDETreeColumns" : [ {
"caption" : "图书名称",
"codeName" : "ibizbookname",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "ibizbookname",
"name" : "ibizbookname",
"width" : 50,
"widthUnit" : "px",
"enableExpand" : false,
"enableSort" : false
}, {
"caption" : "作者", "caption" : "作者",
"codeName" : "author", "codeName" : "author",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
...@@ -94,16 +104,6 @@ ...@@ -94,16 +104,6 @@
"widthUnit" : "px", "widthUnit" : "px",
"enableExpand" : false, "enableExpand" : false,
"enableSort" : false "enableSort" : false
}, {
"caption" : "图书名称",
"codeName" : "ibizbookname",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "ibizbookname",
"name" : "ibizbookname",
"width" : 50,
"widthUnit" : "px",
"enableExpand" : false,
"enableSort" : false
} ], } ],
"getPSDETreeNodeRSs" : [ { "getPSDETreeNodeRSs" : [ {
"getChildPSDETreeNode" : { "getChildPSDETreeNode" : {
......
...@@ -2137,7 +2137,7 @@ ...@@ -2137,7 +2137,7 @@
} ] } ]
}, { }, {
"caption" : "容器", "caption" : "容器",
"contentHeight" : 100.0, "contentHeight" : 500.0,
"itemStyle" : "DEFAULT", "itemStyle" : "DEFAULT",
"itemType" : "CONTAINER", "itemType" : "CONTAINER",
"name" : "container21", "name" : "container21",
...@@ -2148,7 +2148,7 @@ ...@@ -2148,7 +2148,7 @@
"vAlign" : "center" "vAlign" : "center"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"height" : 100, "height" : 500,
"heightMode" : "PX", "heightMode" : "PX",
"layout" : "BORDER", "layout" : "BORDER",
"layoutPos" : "CENTER" "layoutPos" : "CENTER"
......
...@@ -278,7 +278,7 @@ ...@@ -278,7 +278,7 @@
<!--输出实体[IBIZCUSTOMER]数据结构 --> <!--输出实体[IBIZCUSTOMER]数据结构 -->
<changeSet author="a_LAB01_df847bdfd" id="tab-ibizcustomer-452-10"> <changeSet author="a_LAB01_df847bdfd" id="tab-ibizcustomer-456-10">
<createTable tableName="T_IBIZCUSTOMER"> <createTable tableName="T_IBIZCUSTOMER">
<column name="CREATEMAN" remarks="" type="VARCHAR(60)"> <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
</column> </column>
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</createView> </createView>
</changeSet> </changeSet>
<!--输出实体[IBIZCUSTOMER]视图结构信息 runOnChange="true" 当视图发生变更时,通过liquibase强刷prod的视图,实现视图的同步--> <!--输出实体[IBIZCUSTOMER]视图结构信息 runOnChange="true" 当视图发生变更时,通过liquibase强刷prod的视图,实现视图的同步-->
<changeSet author="a_LAB01_df847bdfd" id="view-ibizcustomer-452-4" runOnChange="true"> <changeSet author="a_LAB01_df847bdfd" id="view-ibizcustomer-456-4" runOnChange="true">
<createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZCUSTOMER"> <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZCUSTOMER">
<![CDATA[ SELECT t1.[ADDRESS], t1.[CREATEDATE], t1.[CREATEMAN], t1.[CUSTOMERUID], t1.[IBIZCUSTOMERID], t1.[IBIZCUSTOMERNAME], t1.[SN], t1.[UPDATEDATE], t1.[UPDATEMAN] FROM [T_IBIZCUSTOMER] t1 ]]> <![CDATA[ SELECT t1.[ADDRESS], t1.[CREATEDATE], t1.[CREATEMAN], t1.[CUSTOMERUID], t1.[IBIZCUSTOMERID], t1.[IBIZCUSTOMERNAME], t1.[SN], t1.[UPDATEDATE], t1.[UPDATEMAN] FROM [T_IBIZCUSTOMER] t1 ]]>
</createView> </createView>
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册