Skip to content

I
iBiz企业中心
提交 3c026a6d 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

xignzi006 发布系统代码

上级 2d832af3
显示空白字符变更
内嵌 并排
正在显示 包含 151 行增加 和 70 行删除
app_CRM/public/assets/json/view-config.json
浏览文件 @ 3c026a6d
......@@ -2080,7 +2080,7 @@
"memo": ""
},
"competitorinfo": {
"title": "竞争对手",
"title": "竞争对手信息",
"caption": "竞争对手",
"viewtype": "DETABEXPVIEW",
"viewmodule": "Sales",
......
app_CRM/src/locale/lanres/entities/competitor/competitor_en_US.ts
浏览文件 @ 3c026a6d
......@@ -102,7 +102,7 @@ export default {
},
info: {
caption: "竞争对手",
title: "竞争对手",
title: "竞争对手信息",
},
pickupview: {
caption: "竞争对手",
......
app_CRM/src/locale/lanres/entities/competitor/competitor_zh_CN.ts
浏览文件 @ 3c026a6d
......@@ -101,7 +101,7 @@ export default {
},
info: {
caption: "竞争对手",
title: "竞争对手",
title: "竞争对手信息",
},
pickupview: {
caption: "竞争对手",
......
app_CRM/src/locale/lanres/entities/incident/incident_en_US.ts
浏览文件 @ 3c026a6d
......@@ -148,7 +148,7 @@ export default {
title: "案例数据看板视图",
},
},
quickcreate_form: {
byparentkey_form: {
details: {
group1: "案例基本信息",
formpage1: "基本信息",
......@@ -162,11 +162,11 @@ export default {
srfsourcekey: "",
title: "案例标题",
subjectname: "主题",
customername: "客户",
caseorigincode: "起源",
productname: "产品",
entitlementname: "权利",
customerid: "客户",
customername: "客户",
customertype: "客户类型",
productid: "产品",
incidentid: "案例",
......@@ -235,10 +235,12 @@ export default {
uiactions: {
},
},
byparentkey_form: {
main_form: {
details: {
group1: "案例基本信息",
group1: "incident基本信息",
formpage1: "基本信息",
group2: "操作信息",
formpage2: "其它",
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "案例",
......@@ -248,27 +250,19 @@ export default {
srfdeid: "",
srfsourcekey: "",
title: "案例标题",
subjectname: "主题",
caseorigincode: "起源",
productname: "产品",
entitlementname: "权利",
customerid: "客户",
customername: "客户",
customertype: "客户类型",
productid: "产品",
createman: "建立人",
createdate: "建立时间",
updateman: "更新人",
updatedate: "更新时间",
incidentid: "案例",
subjectid: "主题",
entitlementid: "权利",
},
uiactions: {
},
},
main_form: {
quickcreate_form: {
details: {
group1: "incident基本信息",
group1: "案例基本信息",
formpage1: "基本信息",
group2: "操作信息",
formpage2: "其它",
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "案例",
......@@ -278,11 +272,17 @@ export default {
srfdeid: "",
srfsourcekey: "",
title: "案例标题",
createman: "建立人",
createdate: "建立时间",
updateman: "更新人",
updatedate: "更新时间",
subjectname: "主题",
customername: "客户",
caseorigincode: "起源",
productname: "产品",
entitlementname: "权利",
customerid: "客户",
customertype: "客户类型",
productid: "产品",
incidentid: "案例",
subjectid: "主题",
entitlementid: "权利",
},
uiactions: {
},
......@@ -319,7 +319,7 @@ export default {
},
},
byparentkeytoolbar_toolbar: {
tbitem1_openquickcreateview: {
tbitem1_byparent: {
caption: "新建",
tip: "新建",
},
......
app_CRM/src/locale/lanres/entities/incident/incident_zh_CN.ts
浏览文件 @ 3c026a6d
......@@ -147,7 +147,7 @@ export default {
title: "案例数据看板视图",
},
},
quickcreate_form: {
byparentkey_form: {
details: {
group1: "案例基本信息",
formpage1: "基本信息",
......@@ -161,11 +161,11 @@ export default {
srfsourcekey: "",
title: "案例标题",
subjectname: "主题",
customername: "客户",
caseorigincode: "起源",
productname: "产品",
entitlementname: "权利",
customerid: "客户",
customername: "客户",
customertype: "客户类型",
productid: "产品",
incidentid: "案例",
......@@ -234,10 +234,12 @@ export default {
uiactions: {
},
},
byparentkey_form: {
main_form: {
details: {
group1: "案例基本信息",
group1: "incident基本信息",
formpage1: "基本信息",
group2: "操作信息",
formpage2: "其它",
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "案例",
......@@ -247,27 +249,19 @@ export default {
srfdeid: "",
srfsourcekey: "",
title: "案例标题",
subjectname: "主题",
caseorigincode: "起源",
productname: "产品",
entitlementname: "权利",
customerid: "客户",
customername: "客户",
customertype: "客户类型",
productid: "产品",
createman: "建立人",
createdate: "建立时间",
updateman: "更新人",
updatedate: "更新时间",
incidentid: "案例",
subjectid: "主题",
entitlementid: "权利",
},
uiactions: {
},
},
main_form: {
quickcreate_form: {
details: {
group1: "incident基本信息",
group1: "案例基本信息",
formpage1: "基本信息",
group2: "操作信息",
formpage2: "其它",
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "案例",
......@@ -277,11 +271,17 @@ export default {
srfdeid: "",
srfsourcekey: "",
title: "案例标题",
createman: "建立人",
createdate: "建立时间",
updateman: "更新人",
updatedate: "更新时间",
subjectname: "主题",
customername: "客户",
caseorigincode: "起源",
productname: "产品",
entitlementname: "权利",
customerid: "客户",
customertype: "客户类型",
productid: "产品",
incidentid: "案例",
subjectid: "主题",
entitlementid: "权利",
},
uiactions: {
},
......@@ -318,7 +318,7 @@ export default {
},
},
byparentkeytoolbar_toolbar: {
tbitem1_openquickcreateview: {
tbitem1_byparent: {
caption: "新建",
tip: "新建",
},
......
app_CRM/src/mock/viewconfig/viewconfig.ts
浏览文件 @ 3c026a6d
......@@ -1672,7 +1672,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtag": "ac5ea5e435a4102d39f1f4a569368b25"
},
"competitorinfo": {
"title": "竞争对手",
"title": "竞争对手信息",
"caption": "竞争对手",
"viewtype": "DETABEXPVIEW",
"viewmodule": "Sales",
......
app_CRM/src/pages/sales/competitor-info/competitor-info-base.tsx
浏览文件 @ 3c026a6d
......@@ -5,7 +5,7 @@ import TabExpViewEngine from '@engine/view/tab-exp-view-engine';
import DataPanelEngine from '@engine/ctrl/data-panel-engine';
/**
* 竞争对手视图基类
* 竞争对手信息视图基类
*
* @export
* @class CompetitorInfoBase
......
app_CRM/src/pages/sales/competitor-info/competitor-info.html
浏览文件 @ 3c026a6d
<studio-view-style2 viewName="competitorinfo" viewTitle="竞争对手" class='detabexpview competitor-info'>
<studio-view-style2 viewName="competitorinfo" viewTitle="竞争对手信息" class='detabexpview competitor-info'>
<template slot='title'>
<span class='caption-info'>{{$t(model.srfTitle)}}</span>
</template>
......
app_CRM/src/pages/sales/competitor-info/competitor-info.vue
浏览文件 @ 3c026a6d
......@@ -7,7 +7,7 @@ import view_datapanel from '@widgets/competitor/data-panel-form/data-panel-form.
import view_tabexppanel from '@widgets/competitor/infotabexppanel-tabexppanel/infotabexppanel-tabexppanel.vue';
/**
* 竞争对手视图
* 竞争对手信息视图
*
* @export
* @class CompetitorInfo
......
app_CRM/src/pages/service/incident-by-parent-key/incident-by-parent-key-base.tsx
浏览文件 @ 3c026a6d
......@@ -94,7 +94,7 @@ export class IncidentByParentKeyBase extends GridViewBase {
* @memberof IncidentByParentKey
*/
public toolBarModels: any = {
tbitem1_openquickcreateview: { name: 'tbitem1_openquickcreateview', caption: '新建','isShowCaption':true,'isShowIcon':true, tooltip: '新建', iconcls: 'fa fa-user-plus', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'OpenQuickCreateView', target: 'NONE' }, class: '' },
tbitem1_byparent: { name: 'tbitem1_byparent', caption: '新建','isShowCaption':true,'isShowIcon':true, tooltip: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'ByParent', target: 'NONE' }, class: '' },
tbitem2: { name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem4: { name: 'tbitem4', caption: '编辑','isShowCaption':true,'isShowIcon':true, tooltip: '编辑', iconcls: 'fa fa-edit', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' }, class: '' },
......@@ -164,8 +164,8 @@ export class IncidentByParentKeyBase extends GridViewBase {
* @memberof IncidentByParentKeyBase
*/
public toolbar_click($event: any, $event2?: any): void {
if (Object.is($event.tag, 'tbitem1_openquickcreateview')) {
this.toolbar_tbitem1_openquickcreateview_click(null, '', $event2);
if (Object.is($event.tag, 'tbitem1_byparent')) {
this.toolbar_tbitem1_byparent_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem4')) {
this.toolbar_tbitem4_click(null, '', $event2);
......@@ -283,7 +283,7 @@ export class IncidentByParentKeyBase extends GridViewBase {
* @param {*} [$event]
* @memberof
*/
public toolbar_tbitem1_openquickcreateview_click(params: any = {}, tag?: any, $event?: any) {
public toolbar_tbitem1_byparent_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
......@@ -301,7 +301,7 @@ export class IncidentByParentKeyBase extends GridViewBase {
}
// 界面行为
const curUIService:IncidentUIService = new IncidentUIService();
curUIService.Incident_OpenQuickCreateView(datas,contextJO, paramJO, $event, xData,this,"Incident");
curUIService.Incident_ByParent(datas,contextJO, paramJO, $event, xData,this,"Incident");
}
/**
......
app_CRM/src/store/modules/view-action/state.ts
浏览文件 @ 3c026a6d
......@@ -459,7 +459,6 @@ export const viewstate: any = {
viewaction: '',
viewdatachange: false,
refviews: [
'540213698dac06ea2ef3193da7fe9b11',
'f440f1d3b950a89e6cb72cadea120b74',
'6b1896d002d20fec6591398a98f37e39',
],
......
app_CRM/src/uiservice/incident/incident-ui-service-base.ts
浏览文件 @ 3c026a6d
......@@ -216,6 +216,73 @@ export default class IncidentUIServiceBase extends UIService {
openIndexViewTab(data);
}
/**
* 新建
*
* @param {any[]} args 当前数据
* @param {any} context 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @param {*} [srfParentDeName] 父实体名称
* @returns {Promise<any>}
*/
public async Incident_ByParent(args: any[], context:any = {} ,params: any={}, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
let data: any = {};
let parentContext:any = {};
let parentViewParam:any = {};
const _this: any = actionContext;
const _args: any[] = Util.deepCopy(args);
const actionTarget: string | null = 'NONE';
if(_this.context){
parentContext = _this.context;
}
if(_this.viewparams){
parentViewParam = _this.viewparams;
}
context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
context = Object.assign({},actionContext.context,context);
let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
Object.assign(data,parentObj);
Object.assign(context,parentObj);
let deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'incidents', parameterName: 'incident' },
];
actionContext.closeView(null);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = actionContext.$appdrawer.openDrawer(view, context,data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
const _this: any = actionContext;
if (xData && xData.refresh && xData.refresh instanceof Function) {
xData.refresh(args);
}
if (this.Incident_OpenInfoView && this.Incident_OpenInfoView instanceof Function) {
this.Incident_OpenInfoView(result.datas,context,params, $event, xData,actionContext);
}
if(window.opener){
window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress);
window.close();
}
return result.datas;
});
}
const view: any = {
viewname: 'incident-quick-create-by-parent-key',
height: 0,
width: 0,
title: actionContext.$t('entities.incident.views.quickcreatebyparentkey.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
/**
* 获取指定数据的重定向页面
......
app_CRM/src/uiservice/quote/quote-ui-service-base.ts
浏览文件 @ 3c026a6d
......@@ -266,14 +266,29 @@ export default class QuoteUIServiceBase extends UIService {
}
const parameters: any[] = [
{ pathName: 'quotes', parameterName: 'quote' },
{ pathName: 'edit_datapanelview', parameterName: 'edit_datapanelview' },
];
const openIndexViewTab = (data: any) => {
const routePath = actionContext.$viewTool.buildUpRoutePath(actionContext.$route, context, deResParameters, parameters, _args, data);
actionContext.$router.push(routePath);
return null;
const openPopOver = (view: any, data: any) => {
let container: Subject<any> = actionContext.$apppopover.openPop($event, view, context,data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
openIndexViewTab(data);
const _this: any = actionContext;
if(window.opener){
window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress);
window.close();
}
return result.datas;
});
}
const view: any = {
viewname: 'quote-edit-data-panel-view',
height: 300,
width: 300,
title: actionContext.$t('entities.quote.views.edit_datapanelview.title'),
placement: 'POPOVER',
};
openPopOver(view, data);
}
/**
......
app_CRM/src/widgets/quote/data-panel-form/data-panel-form.html
浏览文件 @ 3c026a6d
......@@ -6,28 +6,28 @@
<app-form-group :model="detailsModel.group1" layoutType="FLEX" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.quote.datapanel_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >
<div style="height: 100%;display: flex;">
<div v-show="detailsModel.totalamount.visible" :style="{}">
<app-form-item name='totalamount' :itemRules="this.rules.totalamount" class='datapanel-style' :caption="$t('entities.quote.datapanel_form.details.totalamount')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.totalamount.error" :isEmptyCaption="false" labelPos="LEFT">
<app-form-item name='totalamount' :itemRules="this.rules.totalamount" class='datapanel-style' :caption="$t('entities.quote.datapanel_form.details.totalamount')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.totalamount.error" :isEmptyCaption="false" labelPos="BOTTOM">
<app-span name='totalamount' :value="data.totalamount" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style=""></app-span>
</app-form-item>
</div>
<div v-show="detailsModel.effectivefrom.visible" :style="{}">
<app-form-item name='effectivefrom' :itemRules="this.rules.effectivefrom" class='datapanel-style' :caption="$t('entities.quote.datapanel_form.details.effectivefrom')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.effectivefrom.error" :isEmptyCaption="false" labelPos="LEFT">
<app-form-item name='effectivefrom' :itemRules="this.rules.effectivefrom" class='datapanel-style' :caption="$t('entities.quote.datapanel_form.details.effectivefrom')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.effectivefrom.error" :isEmptyCaption="false" labelPos="BOTTOM">
<app-span name='effectivefrom' :value="data.effectivefrom" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style=""></app-span>
</app-form-item>
</div>
<div v-show="detailsModel.effectiveto.visible" :style="{}">
<app-form-item name='effectiveto' :itemRules="this.rules.effectiveto" class='datapanel-style' :caption="$t('entities.quote.datapanel_form.details.effectiveto')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.effectiveto.error" :isEmptyCaption="false" labelPos="LEFT">
<app-form-item name='effectiveto' :itemRules="this.rules.effectiveto" class='datapanel-style' :caption="$t('entities.quote.datapanel_form.details.effectiveto')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.effectiveto.error" :isEmptyCaption="false" labelPos="BOTTOM">
<app-span name='effectiveto' :value="data.effectiveto" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style=""></app-span>
</app-form-item>
</div>
<div v-show="detailsModel.ownername.visible" :style="{}">
<app-form-item name='ownername' :itemRules="this.rules.ownername" class='datapanel-style' :caption="$t('entities.quote.datapanel_form.details.ownername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ownername.error" :isEmptyCaption="false" labelPos="LEFT">
<app-form-item name='ownername' :itemRules="this.rules.ownername" class='datapanel-style' :caption="$t('entities.quote.datapanel_form.details.ownername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ownername.error" :isEmptyCaption="false" labelPos="BOTTOM">
<app-span name='ownername' :value="data.ownername" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style=""></app-span>
</app-form-item>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或