Skip to content

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

chitanda 发布系统代码

上级 cd90dc33
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 2001 行增加 和 1877 行删除
app_CRM/public/assets/json/view-config.json
浏览文件 @ e5875839
...@@ -1089,6 +1089,16 @@ ...@@ -1089,6 +1089,16 @@
"viewtag": "9693fc63348c320c4b0dff17cb9a9f25", "viewtag": "9693fc63348c320c4b0dff17cb9a9f25",
"memo": "" "memo": ""
}, },
"productsalesliteraturesallitprogridview": {
"title": "宣传资料产品明细",
"caption": "产品宣传资料",
"viewtype": "DEGRIDVIEW",
"viewmodule": "Sales",
"viewname": "ProductSalesLiteratureSalLitProGridView",
"viewfilename": "product-sales-literature-sal-lit-pro-grid-view",
"viewtag": "96cc644d7d763e47f3644aed0d9850f0",
"memo": ""
},
"serviceappointmenteditview": { "serviceappointmenteditview": {
"title": "服务活动编辑视图", "title": "服务活动编辑视图",
"caption": "服务活动", "caption": "服务活动",
......
app_CRM/src/locale/lang/en-US.ts
浏览文件 @ e5875839
...@@ -47,54 +47,54 @@ import userCustom_en_US from '@locale/lanres/userCustom/userCustom_en_US'; ...@@ -47,54 +47,54 @@ import userCustom_en_US from '@locale/lanres/userCustom/userCustom_en_US';
export default { export default {
app: { app: {
commonWords:{ commonWords:{
error: 'Error', error: "Error",
success: 'Success', success: "Success",
ok: 'OK', ok: "OK",
cancel: 'Cancel', cancel: "Cancel",
}, },
local:{ local:{
new: 'New' new: "New"
}, },
gridpage: { gridpage: {
choicecolumns: 'Choice columns', choicecolumns: "Choice columns",
refresh: 'refresh', refresh: "refresh",
show: 'Show', show: "Show",
records: 'records', records: "records",
totle: 'totle', totle: "totle",
}, },
tabpage: { tabpage: {
sureclosetip: { sureclosetip: {
title: 'Close warning', title: "Close warning",
content: 'Form data Changed, are sure close?', content: "Form data Changed, are sure close?",
}, },
closeall: 'Close all', closeall: "Close all",
closeother: 'Close other', closeother: "Close other",
}, },
fileUpload: { fileUpload: {
caption: 'Upload', caption: "Upload",
}, },
searchButton: { searchButton: {
search: 'Search', search: "Search",
reset: 'Reset', reset: "Reset",
}, },
calendar:{ calendar:{
today: 'today', today: "today",
month: 'month', month: "month",
week: 'week', week: "week",
day: 'day', day: "day",
list: 'list', list: "list",
dateSelectModalTitle: 'select the time you wanted', dateSelectModalTitle: "select the time you wanted",
gotoDate: 'goto', gotoDate: "goto",
}, },
// 非实体视图 // 非实体视图
views: { views: {
centeralportal: { centeralportal: {
caption: '仪表盘', caption: "仪表盘",
title: '仪表盘', title: "仪表盘",
}, },
central: { central: {
caption: '企业中心', caption: "企业中心",
title: '企业中心', title: "企业中心",
}, },
}, },
utilview:{ utilview:{
...@@ -104,43 +104,43 @@ export default { ...@@ -104,43 +104,43 @@ export default {
}, },
menus: { menus: {
central: { central: {
user_menus: '用户菜单', user_menus: "用户菜单",
menuitem3: '设置', menuitem3: "设置",
menuitem4: '注销', menuitem4: "注销",
top_menus: '顶部菜单', top_menus: "顶部菜单",
left_exp: '左侧菜单', left_exp: "左侧菜单",
menuitem17: '主页', menuitem17: "主页",
menuitem18: '最近', menuitem18: "最近",
menuitem19: '固定', menuitem19: "固定",
menuitem16: '我的工作', menuitem16: "我的工作",
menuitem1: '仪表盘', menuitem1: "仪表盘",
menuitem2: '活动', menuitem2: "活动",
menuitem20: '客户', menuitem20: "客户",
menuitem5: '客户', menuitem5: "客户",
menuitem7: '联系人', menuitem7: "联系人",
menuitem21: '销售', menuitem21: "销售",
menuitem8: '潜在客户', menuitem8: "潜在客户",
menuitem9: '商机', menuitem9: "商机",
menuitem10: '竞争对手', menuitem10: "竞争对手",
menuitem22: '宣传资料', menuitem22: "宣传资料",
menuitem11: '报价单', menuitem11: "报价单",
menuitem12: '订单', menuitem12: "订单",
menuitem13: '发票', menuitem13: "发票",
menuitem6: '产品', menuitem6: "产品",
menuitem14: '销售宣传资料', menuitem14: "销售宣传资料",
menuitem23: '市场营销', menuitem23: "市场营销",
menuitem30: '市场活动', menuitem30: "市场活动",
menuitem15: '市场营销列表', menuitem15: "市场营销列表",
menuitem29: '快速市场活动', menuitem29: "快速市场活动",
menuitem24: '绩效', menuitem24: "绩效",
menuitem25: '目标', menuitem25: "目标",
menuitem26: '预测', menuitem26: "预测",
menuitem27: '服务', menuitem27: "服务",
menuitem28: '服务案例', menuitem28: "服务案例",
bottom_exp: '底部内容', bottom_exp: "底部内容",
footer_left: '底部左侧', footer_left: "底部左侧",
footer_center: '底部中间', footer_center: "底部中间",
footer_right: '底部右侧', footer_right: "底部右侧",
}, },
}, },
}, },
......
app_CRM/src/locale/lang/zh-CN.ts
浏览文件 @ e5875839
...@@ -47,54 +47,54 @@ import userCustom_zh_CN from '@locale/lanres/userCustom/userCustom_zh_CN'; ...@@ -47,54 +47,54 @@ import userCustom_zh_CN from '@locale/lanres/userCustom/userCustom_zh_CN';
export default { export default {
app: { app: {
commonWords:{ commonWords:{
error: '失败', error: "失败",
success: '成功', success: "成功",
ok: '确认', ok: "确认",
cancel: '取消', cancel: "取消",
}, },
local:{ local:{
new: '新建' new: "新建"
}, },
gridpage: { gridpage: {
choicecolumns: '选择列', choicecolumns: "选择列",
refresh: '刷新', refresh: "刷新",
show: '显示', show: "显示",
records: '条', records: "条",
totle: '共', totle: "共",
}, },
tabpage: { tabpage: {
sureclosetip: { sureclosetip: {
title: '关闭提醒', title: "关闭提醒",
content: '表单数据已经修改，确定要关闭？', content: "表单数据已经修改，确定要关闭？",
}, },
closeall: '关闭所有', closeall: "关闭所有",
closeother: '关闭其他', closeother: "关闭其他",
}, },
fileUpload: { fileUpload: {
caption: '上传', caption: "上传",
}, },
searchButton: { searchButton: {
search: '搜索', search: "搜索",
reset: '重置', reset: "重置",
}, },
calendar:{ calendar:{
today: '今天', today: "今天",
month: '月', month: "月",
week: '周', week: "周",
day: '天', day: "天",
list: '列', list: "列",
dateSelectModalTitle: '选择要跳转的时间', dateSelectModalTitle: "选择要跳转的时间",
gotoDate: '跳转', gotoDate: "跳转",
}, },
// 非实体视图 // 非实体视图
views: { views: {
centeralportal: { centeralportal: {
caption: '仪表盘', caption: "仪表盘",
title: '仪表盘', title: "仪表盘",
}, },
central: { central: {
caption: '企业中心', caption: "企业中心",
title: '企业中心', title: "企业中心",
}, },
}, },
utilview:{ utilview:{
...@@ -104,43 +104,43 @@ export default { ...@@ -104,43 +104,43 @@ export default {
}, },
menus: { menus: {
central: { central: {
user_menus: '用户菜单', user_menus: "用户菜单",
menuitem3: '设置', menuitem3: "设置",
menuitem4: '注销', menuitem4: "注销",
top_menus: '顶部菜单', top_menus: "顶部菜单",
left_exp: '左侧菜单', left_exp: "左侧菜单",
menuitem17: '主页', menuitem17: "主页",
menuitem18: '最近', menuitem18: "最近",
menuitem19: '固定', menuitem19: "固定",
menuitem16: '我的工作', menuitem16: "我的工作",
menuitem1: '仪表盘', menuitem1: "仪表盘",
menuitem2: '活动', menuitem2: "活动",
menuitem20: '客户', menuitem20: "客户",
menuitem5: '客户', menuitem5: "客户",
menuitem7: '联系人', menuitem7: "联系人",
menuitem21: '销售', menuitem21: "销售",
menuitem8: '潜在客户', menuitem8: "潜在客户",
menuitem9: '商机', menuitem9: "商机",
menuitem10: '竞争对手', menuitem10: "竞争对手",
menuitem22: '宣传资料', menuitem22: "宣传资料",
menuitem11: '报价单', menuitem11: "报价单",
menuitem12: '订单', menuitem12: "订单",
menuitem13: '发票', menuitem13: "发票",
menuitem6: '产品', menuitem6: "产品",
menuitem14: '销售宣传资料', menuitem14: "销售宣传资料",
menuitem23: '市场营销', menuitem23: "市场营销",
menuitem30: '市场活动', menuitem30: "市场活动",
menuitem15: '市场营销列表', menuitem15: "市场营销列表",
menuitem29: '快速市场活动', menuitem29: "快速市场活动",
menuitem24: '绩效', menuitem24: "绩效",
menuitem25: '目标', menuitem25: "目标",
menuitem26: '预测', menuitem26: "预测",
menuitem27: '服务', menuitem27: "服务",
menuitem28: '服务案例', menuitem28: "服务案例",
bottom_exp: '底部内容', bottom_exp: "底部内容",
footer_left: '底部左侧', footer_left: "底部左侧",
footer_center: '底部中间', footer_center: "底部中间",
footer_right: '底部右侧', footer_right: "底部右侧",
}, },
}, },
}, },
......
app_CRM/src/locale/lanres/entities/account/account_en_US.ts
浏览文件 @ e5875839
...@@ -716,4 +716,4 @@ export default { ...@@ -716,4 +716,4 @@ export default {
account_remove: "删除", account_remove: "删除",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/activity-pointer/activity-pointer_en_US.ts
浏览文件 @ e5875839
...@@ -231,4 +231,4 @@ export default { ...@@ -231,4 +231,4 @@ export default {
tip: "Remove {0}", tip: "Remove {0}",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/appointment/appointment_en_US.ts
浏览文件 @ e5875839
...@@ -155,4 +155,4 @@ export default { ...@@ -155,4 +155,4 @@ export default {
tip: "Copy {0}", tip: "Copy {0}",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/campaign-activity/campaign-activity_en_US.ts
浏览文件 @ e5875839
...@@ -275,4 +275,4 @@ export default { ...@@ -275,4 +275,4 @@ export default {
tip: "Filter", tip: "Filter",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/campaign-campaign/campaign-campaign_en_US.ts
浏览文件 @ e5875839
...@@ -13,4 +13,4 @@ export default { ...@@ -13,4 +13,4 @@ export default {
relationshipsid: "关系标识", relationshipsid: "关系标识",
relationshipsname: "关系名称", relationshipsname: "关系名称",
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/campaign-list/campaign-list_en_US.ts
浏览文件 @ e5875839
...@@ -123,4 +123,4 @@ export default { ...@@ -123,4 +123,4 @@ export default {
tip: "关闭", tip: "关闭",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/campaign-response/campaign-response_en_US.ts
浏览文件 @ e5875839
...@@ -235,4 +235,4 @@ export default { ...@@ -235,4 +235,4 @@ export default {
tip: "Filter", tip: "Filter",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/campaign/campaign_en_US.ts
浏览文件 @ e5875839
...@@ -399,4 +399,4 @@ export default { ...@@ -399,4 +399,4 @@ export default {
tip: "关闭", tip: "关闭",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/competitor-sales-literature/competitor-sales-literature_en_US.ts
浏览文件 @ e5875839
...@@ -13,4 +13,4 @@ export default { ...@@ -13,4 +13,4 @@ export default {
entityname: "竞争对手", entityname: "竞争对手",
entity2name: "销售宣传资料", entity2name: "销售宣传资料",
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/competitor/competitor_en_US.ts
浏览文件 @ e5875839
...@@ -281,4 +281,4 @@ export default { ...@@ -281,4 +281,4 @@ export default {
tip: "Copy {0}", tip: "Copy {0}",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/contact/contact_en_US.ts
浏览文件 @ e5875839
...@@ -694,4 +694,4 @@ export default { ...@@ -694,4 +694,4 @@ export default {
tip: "Copy {0}", tip: "Copy {0}",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/email/email_en_US.ts
浏览文件 @ e5875839
...@@ -166,4 +166,4 @@ export default { ...@@ -166,4 +166,4 @@ export default {
tip: "Copy {0}", tip: "Copy {0}",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/fax/fax_en_US.ts
浏览文件 @ e5875839
...@@ -123,4 +123,4 @@ export default { ...@@ -123,4 +123,4 @@ export default {
tip: "Copy {0}", tip: "Copy {0}",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/goal/goal_en_US.ts
浏览文件 @ e5875839
...@@ -207,4 +207,4 @@ export default { ...@@ -207,4 +207,4 @@ export default {
tip: "Copy {0}", tip: "Copy {0}",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/ibiz-list/ibiz-list_en_US.ts
浏览文件 @ e5875839
...@@ -282,4 +282,4 @@ export default { ...@@ -282,4 +282,4 @@ export default {
tip: "Copy {0}", tip: "Copy {0}",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/ibiz-service/ibiz-service_en_US.ts
浏览文件 @ e5875839
...@@ -24,4 +24,4 @@ export default { ...@@ -24,4 +24,4 @@ export default {
utcconversiontimezonecode: "UTC Conversion Time Zone Code", utcconversiontimezonecode: "UTC Conversion Time Zone Code",
resourcespecid: "所需资源", resourcespecid: "所需资源",
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/incident/incident_en_US.ts
浏览文件 @ e5875839
...@@ -213,4 +213,4 @@ export default { ...@@ -213,4 +213,4 @@ export default {
tip: "Filter", tip: "Filter",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/invoice-detail/invoice-detail_en_US.ts
浏览文件 @ e5875839
...@@ -192,4 +192,4 @@ export default { ...@@ -192,4 +192,4 @@ export default {
tip: "Copy {0}", tip: "Copy {0}",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/invoice/invoice_en_US.ts
浏览文件 @ e5875839
...@@ -311,4 +311,4 @@ export default { ...@@ -311,4 +311,4 @@ export default {
tip: "Filter", tip: "Filter",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/lead/lead_en_US.ts
浏览文件 @ e5875839
...@@ -551,4 +551,4 @@ export default { ...@@ -551,4 +551,4 @@ export default {
tip: "Copy {0}", tip: "Copy {0}",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/letter/letter_en_US.ts
浏览文件 @ e5875839
...@@ -121,4 +121,4 @@ export default { ...@@ -121,4 +121,4 @@ export default {
tip: "Copy {0}", tip: "Copy {0}",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/list-account/list-account_en_US.ts
浏览文件 @ e5875839
...@@ -158,4 +158,4 @@ export default { ...@@ -158,4 +158,4 @@ export default {
tip: "Filter", tip: "Filter",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/list-contact/list-contact_en_US.ts
浏览文件 @ e5875839
...@@ -149,4 +149,4 @@ export default { ...@@ -149,4 +149,4 @@ export default {
tip: "Filter", tip: "Filter",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/list-lead/list-lead_en_US.ts
浏览文件 @ e5875839
...@@ -86,4 +86,4 @@ export default { ...@@ -86,4 +86,4 @@ export default {
tip: "Export {0} Data To Excel", tip: "Export {0} Data To Excel",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/opportunity-competitor/opportunity-competitor_en_US.ts
浏览文件 @ e5875839
...@@ -131,4 +131,4 @@ export default { ...@@ -131,4 +131,4 @@ export default {
tip: "关闭", tip: "关闭",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/opportunity-product/opportunity-product_en_US.ts
浏览文件 @ e5875839
...@@ -178,4 +178,4 @@ export default { ...@@ -178,4 +178,4 @@ export default {
tip: "Copy {0}", tip: "Copy {0}",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/opportunity/opportunity_en_US.ts
浏览文件 @ e5875839
...@@ -424,4 +424,4 @@ export default { ...@@ -424,4 +424,4 @@ export default {
tip: "Filter", tip: "Filter",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/phone-call/phone-call_en_US.ts
浏览文件 @ e5875839
...@@ -124,4 +124,4 @@ export default { ...@@ -124,4 +124,4 @@ export default {
tip: "Copy {0}", tip: "Copy {0}",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/price-level/price-level_en_US.ts
浏览文件 @ e5875839
...@@ -49,4 +49,4 @@ export default { ...@@ -49,4 +49,4 @@ export default {
uiactions: { uiactions: {
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/product-sales-literature/product-sales-literature_en_US.ts
浏览文件 @ e5875839
...@@ -14,6 +14,10 @@ export default { ...@@ -14,6 +14,10 @@ export default {
entity2name: "销售宣传资料", entity2name: "销售宣传资料",
}, },
views: { views: {
sallitprogridview: {
caption: "产品宣传资料",
title: "宣传资料产品明细",
},
sallitproeditview: { sallitproeditview: {
caption: "产品宣传资料", caption: "产品宣传资料",
title: "宣传资料产品明细", title: "宣传资料产品明细",
...@@ -39,6 +43,51 @@ export default { ...@@ -39,6 +43,51 @@ export default {
uiactions: { uiactions: {
}, },
}, },
sallitprogrid_grid: {
columns: {
entity2name: "销售宣传资料",
entityname: "产品",
},
uiactions: {
},
},
default_searchform: {
details: {
formpage1: "常规条件",
},
uiactions: {
},
},
sallitprogridviewtoolbar_toolbar: {
tbitem4: {
caption: "Edit",
tip: "Edit {0}",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "Remove",
tip: "Remove {0}",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "Export",
tip: "Export {0} Data To Excel",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "Filter",
tip: "Filter",
},
},
sallitproeditviewtoolbar_toolbar: { sallitproeditviewtoolbar_toolbar: {
tbitem1: { tbitem1: {
caption: "Save And Close", caption: "Save And Close",
...@@ -49,4 +98,4 @@ export default { ...@@ -49,4 +98,4 @@ export default {
tip: "关闭", tip: "关闭",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/product-sales-literature/product-sales-literature_zh_CN.ts
浏览文件 @ e5875839
...@@ -13,6 +13,10 @@ export default { ...@@ -13,6 +13,10 @@ export default {
entity2name: "销售宣传资料", entity2name: "销售宣传资料",
}, },
views: { views: {
sallitprogridview: {
caption: "产品宣传资料",
title: "宣传资料产品明细",
},
sallitproeditview: { sallitproeditview: {
caption: "产品宣传资料", caption: "产品宣传资料",
title: "宣传资料产品明细", title: "宣传资料产品明细",
...@@ -38,6 +42,51 @@ export default { ...@@ -38,6 +42,51 @@ export default {
uiactions: { uiactions: {
}, },
}, },
sallitprogrid_grid: {
columns: {
entity2name: "销售宣传资料",
entityname: "产品",
},
uiactions: {
},
},
default_searchform: {
details: {
formpage1: "常规条件",
},
uiactions: {
},
},
sallitprogridviewtoolbar_toolbar: {
tbitem4: {
caption: "编辑",
tip: "编辑",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "删除",
tip: "删除",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "导出",
tip: "导出",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "过滤",
tip: "过滤",
},
},
sallitproeditviewtoolbar_toolbar: { sallitproeditviewtoolbar_toolbar: {
tbitem1: { tbitem1: {
caption: "保存并关闭", caption: "保存并关闭",
......
app_CRM/src/locale/lanres/entities/product/product_en_US.ts
浏览文件 @ e5875839
...@@ -258,4 +258,4 @@ export default { ...@@ -258,4 +258,4 @@ export default {
tip: "Filter", tip: "Filter",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/quote-detail/quote-detail_en_US.ts
浏览文件 @ e5875839
...@@ -186,4 +186,4 @@ export default { ...@@ -186,4 +186,4 @@ export default {
tip: "Filter", tip: "Filter",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/quote/quote_en_US.ts
浏览文件 @ e5875839
...@@ -352,4 +352,4 @@ export default { ...@@ -352,4 +352,4 @@ export default {
tip: "Filter", tip: "Filter",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/sales-literature-item/sales-literature-item_en_US.ts
浏览文件 @ e5875839
...@@ -114,4 +114,4 @@ export default { ...@@ -114,4 +114,4 @@ export default {
tip: "关闭", tip: "关闭",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/sales-literature/sales-literature_en_US.ts
浏览文件 @ e5875839
...@@ -215,4 +215,4 @@ export default { ...@@ -215,4 +215,4 @@ export default {
tip: "Filter", tip: "Filter",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/sales-order-detail/sales-order-detail_en_US.ts
浏览文件 @ e5875839
...@@ -167,4 +167,4 @@ export default { ...@@ -167,4 +167,4 @@ export default {
tip: "关闭", tip: "关闭",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/sales-order/sales-order_en_US.ts
浏览文件 @ e5875839
...@@ -326,4 +326,4 @@ export default { ...@@ -326,4 +326,4 @@ export default {
tip: "Filter", tip: "Filter",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/service-appointment/service-appointment_en_US.ts
浏览文件 @ e5875839
...@@ -139,4 +139,4 @@ export default { ...@@ -139,4 +139,4 @@ export default {
tip: "Copy {0}", tip: "Copy {0}",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/subject/subject_en_US.ts
浏览文件 @ e5875839
...@@ -41,4 +41,4 @@ export default { ...@@ -41,4 +41,4 @@ export default {
uiactions: { uiactions: {
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/task/task_en_US.ts
浏览文件 @ e5875839
...@@ -150,4 +150,4 @@ export default { ...@@ -150,4 +150,4 @@ export default {
tip: "Copy {0}", tip: "Copy {0}",
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/transaction-currency/transaction-currency_en_US.ts
浏览文件 @ e5875839
...@@ -48,4 +48,4 @@ export default { ...@@ -48,4 +48,4 @@ export default {
uiactions: { uiactions: {
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/locale/lanres/entities/uom/uom_en_US.ts
浏览文件 @ e5875839
...@@ -45,4 +45,4 @@ export default { ...@@ -45,4 +45,4 @@ export default {
uiactions: { uiactions: {
}, },
}, },
}; };
\ No newline at end of file
app_CRM/src/mock/viewconfig/viewconfig.ts
浏览文件 @ e5875839
...@@ -879,6 +879,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -879,6 +879,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "OpportunityOppProDashboardView", "viewname": "OpportunityOppProDashboardView",
"viewtag": "9693fc63348c320c4b0dff17cb9a9f25" "viewtag": "9693fc63348c320c4b0dff17cb9a9f25"
}, },
"productsalesliteraturesallitprogridview": {
"title": "宣传资料产品明细",
"caption": "产品宣传资料",
"viewtype": "DEGRIDVIEW",
"viewmodule": "Sales",
"viewname": "ProductSalesLiteratureSalLitProGridView",
"viewtag": "96cc644d7d763e47f3644aed0d9850f0"
},
"serviceappointmenteditview": { "serviceappointmenteditview": {
"title": "服务活动编辑视图", "title": "服务活动编辑视图",
"caption": "服务活动", "caption": "服务活动",
......
app_CRM/src/pages/base/account-gradation/account-gradation.html
浏览文件 @ e5875839
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:viewUID="viewUID" :viewUID="viewUID"
:newdata="newdata"
:opendata="opendata"
name="treeexpbar" name="treeexpbar"
ref='treeexpbar' ref='treeexpbar'
@selectionchange="treeexpbar_selectionchange($event)" @selectionchange="treeexpbar_selectionchange($event)"
......
app_CRM/src/pages/marketing/campaign-list-grid-view/campaign-list-grid-view-base.tsx
浏览文件 @ e5875839
...@@ -518,6 +518,43 @@ export class CampaignListGridViewBase extends GridViewBase { ...@@ -518,6 +518,43 @@ export class CampaignListGridViewBase extends GridViewBase {
public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) { public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
let localContext:any = null; let localContext:any = null;
let localViewParam:any =null; let localViewParam:any =null;
let batchAddPSAppViews:Array<any>=[];
if(batchAddPSAppViews.length == 0 || !this.context.srfparentdename){
this.$Notice.warning({ title: '错误', desc: '批量添加需添加N:N关系' });
return;
}
let openViewModel:any = batchAddPSAppViews.find((item:any) =>{
return (item.res && (item.res[0] !== this.context.srfparentdename));
})
let otherViewModel:any = batchAddPSAppViews.find((item:any) =>{
return (item.res && (item.res[0] == this.context.srfparentdename));
})
let container: Subject<any> = this.$appmodal.openModal(openViewModel.view, JSON.parse(JSON.stringify(this.context)), args[0]);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if(result.datas && result.datas.length == 0){
return;
}
let requestParam:Array<any> = [];
result.datas.forEach((record:any) => {
let tempParam:any = {};
tempParam[otherViewModel.resAppKey] = this.context['srfparentkey'];
tempParam[openViewModel.resAppKey] = record.srfkey;
requestParam.push(tempParam);
});
this.appEntityService.createBatch(JSON.parse(JSON.stringify(this.context)),requestParam,true).then((response:any) =>{
if (!response || response.status !== 200) {
this.$Notice.error({ title: '错误', desc: '批处理操作失败' });
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
});
} }
......
app_CRM/src/pages/marketing/list-account-by-list/list-account-by-list-base.tsx
浏览文件 @ e5875839
...@@ -518,6 +518,43 @@ export class ListAccountByListBase extends GridViewBase { ...@@ -518,6 +518,43 @@ export class ListAccountByListBase extends GridViewBase {
public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) { public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
let localContext:any = null; let localContext:any = null;
let localViewParam:any =null; let localViewParam:any =null;
let batchAddPSAppViews:Array<any>=[];
if(batchAddPSAppViews.length == 0 || !this.context.srfparentdename){
this.$Notice.warning({ title: '错误', desc: '批量添加需添加N:N关系' });
return;
}
let openViewModel:any = batchAddPSAppViews.find((item:any) =>{
return (item.res && (item.res[0] !== this.context.srfparentdename));
})
let otherViewModel:any = batchAddPSAppViews.find((item:any) =>{
return (item.res && (item.res[0] == this.context.srfparentdename));
})
let container: Subject<any> = this.$appmodal.openModal(openViewModel.view, JSON.parse(JSON.stringify(this.context)), args[0]);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if(result.datas && result.datas.length == 0){
return;
}
let requestParam:Array<any> = [];
result.datas.forEach((record:any) => {
let tempParam:any = {};
tempParam[otherViewModel.resAppKey] = this.context['srfparentkey'];
tempParam[openViewModel.resAppKey] = record.srfkey;
requestParam.push(tempParam);
});
this.appEntityService.createBatch(JSON.parse(JSON.stringify(this.context)),requestParam,true).then((response:any) =>{
if (!response || response.status !== 200) {
this.$Notice.error({ title: '错误', desc: '批处理操作失败' });
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
});
} }
......
app_CRM/src/pages/marketing/list-account-inner/list-account-inner-base.tsx
浏览文件 @ e5875839
...@@ -168,6 +168,43 @@ export class ListAccountInnerBase extends GridView9Base { ...@@ -168,6 +168,43 @@ export class ListAccountInnerBase extends GridView9Base {
public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) { public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
let localContext:any = null; let localContext:any = null;
let localViewParam:any =null; let localViewParam:any =null;
let batchAddPSAppViews:Array<any>=[];
if(batchAddPSAppViews.length == 0 || !this.context.srfparentdename){
this.$Notice.warning({ title: '错误', desc: '批量添加需添加N:N关系' });
return;
}
let openViewModel:any = batchAddPSAppViews.find((item:any) =>{
return (item.res && (item.res[0] !== this.context.srfparentdename));
})
let otherViewModel:any = batchAddPSAppViews.find((item:any) =>{
return (item.res && (item.res[0] == this.context.srfparentdename));
})
let container: Subject<any> = this.$appmodal.openModal(openViewModel.view, JSON.parse(JSON.stringify(this.context)), args[0]);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if(result.datas && result.datas.length == 0){
return;
}
let requestParam:Array<any> = [];
result.datas.forEach((record:any) => {
let tempParam:any = {};
tempParam[otherViewModel.resAppKey] = this.context['srfparentkey'];
tempParam[openViewModel.resAppKey] = record.srfkey;
requestParam.push(tempParam);
});
this.appEntityService.createBatch(JSON.parse(JSON.stringify(this.context)),requestParam,true).then((response:any) =>{
if (!response || response.status !== 200) {
this.$Notice.error({ title: '错误', desc: '批处理操作失败' });
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
});
} }
......
app_CRM/src/pages/marketing/list-contact-grid-view/list-contact-grid-view-base.tsx
浏览文件 @ e5875839
...@@ -518,6 +518,43 @@ export class ListContactGridViewBase extends GridViewBase { ...@@ -518,6 +518,43 @@ export class ListContactGridViewBase extends GridViewBase {
public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) { public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
let localContext:any = null; let localContext:any = null;
let localViewParam:any =null; let localViewParam:any =null;
let batchAddPSAppViews:Array<any>=[];
if(batchAddPSAppViews.length == 0 || !this.context.srfparentdename){
this.$Notice.warning({ title: '错误', desc: '批量添加需添加N:N关系' });
return;
}
let openViewModel:any = batchAddPSAppViews.find((item:any) =>{
return (item.res && (item.res[0] !== this.context.srfparentdename));
})
let otherViewModel:any = batchAddPSAppViews.find((item:any) =>{
return (item.res && (item.res[0] == this.context.srfparentdename));
})
let container: Subject<any> = this.$appmodal.openModal(openViewModel.view, JSON.parse(JSON.stringify(this.context)), args[0]);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if(result.datas && result.datas.length == 0){
return;
}
let requestParam:Array<any> = [];
result.datas.forEach((record:any) => {
let tempParam:any = {};
tempParam[otherViewModel.resAppKey] = this.context['srfparentkey'];
tempParam[openViewModel.resAppKey] = record.srfkey;
requestParam.push(tempParam);
});
this.appEntityService.createBatch(JSON.parse(JSON.stringify(this.context)),requestParam,true).then((response:any) =>{
if (!response || response.status !== 200) {
this.$Notice.error({ title: '错误', desc: '批处理操作失败' });
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
});
} }
......
app_CRM/src/pages/marketing/list-contact-inner/list-contact-inner-base.tsx
浏览文件 @ e5875839
...@@ -179,6 +179,43 @@ export class ListContactInnerBase extends GridView9Base { ...@@ -179,6 +179,43 @@ export class ListContactInnerBase extends GridView9Base {
public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) { public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
let localContext:any = null; let localContext:any = null;
let localViewParam:any =null; let localViewParam:any =null;
let batchAddPSAppViews:Array<any>=[];
if(batchAddPSAppViews.length == 0 || !this.context.srfparentdename){
this.$Notice.warning({ title: '错误', desc: '批量添加需添加N:N关系' });
return;
}
let openViewModel:any = batchAddPSAppViews.find((item:any) =>{
return (item.res && (item.res[0] !== this.context.srfparentdename));
})
let otherViewModel:any = batchAddPSAppViews.find((item:any) =>{
return (item.res && (item.res[0] == this.context.srfparentdename));
})
let container: Subject<any> = this.$appmodal.openModal(openViewModel.view, JSON.parse(JSON.stringify(this.context)), args[0]);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if(result.datas && result.datas.length == 0){
return;
}
let requestParam:Array<any> = [];
result.datas.forEach((record:any) => {
let tempParam:any = {};
tempParam[otherViewModel.resAppKey] = this.context['srfparentkey'];
tempParam[openViewModel.resAppKey] = record.srfkey;
requestParam.push(tempParam);
});
this.appEntityService.createBatch(JSON.parse(JSON.stringify(this.context)),requestParam,true).then((response:any) =>{
if (!response || response.status !== 200) {
this.$Notice.error({ title: '错误', desc: '批处理操作失败' });
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
});
} }
......
app_CRM/src/pages/marketing/list-lead-by-list/list-lead-by-list-base.tsx
浏览文件 @ e5875839
...@@ -480,6 +480,43 @@ export class ListLeadByListBase extends GridViewBase { ...@@ -480,6 +480,43 @@ export class ListLeadByListBase extends GridViewBase {
public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) { public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
let localContext:any = null; let localContext:any = null;
let localViewParam:any =null; let localViewParam:any =null;
let batchAddPSAppViews:Array<any>=[];
if(batchAddPSAppViews.length == 0 || !this.context.srfparentdename){
this.$Notice.warning({ title: '错误', desc: '批量添加需添加N:N关系' });
return;
}
let openViewModel:any = batchAddPSAppViews.find((item:any) =>{
return (item.res && (item.res[0] !== this.context.srfparentdename));
})
let otherViewModel:any = batchAddPSAppViews.find((item:any) =>{
return (item.res && (item.res[0] == this.context.srfparentdename));
})
let container: Subject<any> = this.$appmodal.openModal(openViewModel.view, JSON.parse(JSON.stringify(this.context)), args[0]);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if(result.datas && result.datas.length == 0){
return;
}
let requestParam:Array<any> = [];
result.datas.forEach((record:any) => {
let tempParam:any = {};
tempParam[otherViewModel.resAppKey] = this.context['srfparentkey'];
tempParam[openViewModel.resAppKey] = record.srfkey;
requestParam.push(tempParam);
});
this.appEntityService.createBatch(JSON.parse(JSON.stringify(this.context)),requestParam,true).then((response:any) =>{
if (!response || response.status !== 200) {
this.$Notice.error({ title: '错误', desc: '批处理操作失败' });
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
});
} }
......
app_CRM/src/studio-core/components/layout/app-content-left-nav-menu/app-content-left-nav-menu.less
浏览文件 @ e5875839
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
margin-right: 5px; margin-right: 5px;
width: 24px; width: 24px;
color: var(--app-header-color); color: var(--app-header-color);
text-align: center;
} }
>span { >span {
...@@ -78,9 +79,12 @@ ...@@ -78,9 +79,12 @@
>.el-menu-item, >.el-menu-item,
>.el-menu-item>.el-tooltip { >.el-menu-item>.el-tooltip {
padding: 0 !important; padding: 0 !important;
padding-left: 12px !important; text-align: center;
width: 48px;
min-width: 48px;
>i { >i {
margin: 0 !important;
color: var(--app-header-color); color: var(--app-header-color);
} }
} }
......
app_CRM/src/uiservice/product-sales-literature/product-sales-literature-ui-service-base.ts
浏览文件 @ e5875839
...@@ -79,6 +79,7 @@ export default class ProductSalesLiteratureUIServiceBase extends UIService { ...@@ -79,6 +79,7 @@ export default class ProductSalesLiteratureUIServiceBase extends UIService {
* @memberof ProductSalesLiteratureUIServiceBase * @memberof ProductSalesLiteratureUIServiceBase
*/ */
public initViewMap(){ public initViewMap(){
this.allViewMap.set(':',{viewname:'sallitprogridview',srfappde:'productsalesliteratures'});
this.allViewMap.set(':',{viewname:'sallitproeditview',srfappde:'productsalesliteratures'}); this.allViewMap.set(':',{viewname:'sallitproeditview',srfappde:'productsalesliteratures'});
} }
......
app_CRM/src/widgets/account/inner-pickip-grid/inner-pickip-grid-service.ts
浏览文件 @ e5875839
...@@ -267,7 +267,6 @@ export default class InnerPickipService extends ControlService { ...@@ -267,7 +267,6 @@ export default class InnerPickipService extends ControlService {
response.data.accountid = Util.createUUID(); response.data.accountid = Util.createUUID();
} }
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
this.mergeDefaults(response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
reject(response); reject(response);
...@@ -275,16 +274,6 @@ export default class InnerPickipService extends ControlService { ...@@ -275,16 +274,6 @@ export default class InnerPickipService extends ControlService {
}); });
} }
/**
* 合并配置的默认值
* @param {*}
* @memberof InnerPickipService
*/
public mergeDefaults(response:any = {}){
if(response.data){
}
}
/** /**
* 前台逻辑 * 前台逻辑
......
app_CRM/src/widgets/account/main-grid/main-grid-service.ts
浏览文件 @ e5875839
...@@ -267,7 +267,6 @@ export default class MainService extends ControlService { ...@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response.data.accountid = Util.createUUID(); response.data.accountid = Util.createUUID();
} }
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
this.mergeDefaults(response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
reject(response); reject(response);
...@@ -275,16 +274,6 @@ export default class MainService extends ControlService { ...@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
}); });
} }
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public mergeDefaults(response:any = {}){
if(response.data){
}
}
/** /**
* 前台逻辑 * 前台逻辑
......
app_CRM/src/widgets/account/summary-dashboard/summary-dashboard.html
浏览文件 @ e5875839
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="0"
:width="0"
name="dashboard_sysportlet6" name="dashboard_sysportlet6"
ref='dashboard_sysportlet6' ref='dashboard_sysportlet6'
@closeview="closeView($event)"> @closeview="closeView($event)">
...@@ -50,6 +52,8 @@ ...@@ -50,6 +52,8 @@
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="0"
:width="0"
name="dashboard_sysportlet8" name="dashboard_sysportlet8"
ref='dashboard_sysportlet8' ref='dashboard_sysportlet8'
@closeview="closeView($event)"> @closeview="closeView($event)">
......
app_CRM/src/widgets/activity-pointer/main-grid/main-grid-service.ts
浏览文件 @ e5875839
...@@ -267,7 +267,6 @@ export default class MainService extends ControlService { ...@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response.data.activityid = Util.createUUID(); response.data.activityid = Util.createUUID();
} }
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
this.mergeDefaults(response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
reject(response); reject(response);
...@@ -275,16 +274,6 @@ export default class MainService extends ControlService { ...@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
}); });
} }
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public mergeDefaults(response:any = {}){
if(response.data){
}
}
/** /**
* 前台逻辑 * 前台逻辑
......
app_CRM/src/widgets/app/centeral-portal-db-dashboard/centeral-portal-db-dashboard.html
浏览文件 @ e5875839
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="0"
:width="0"
name="db_sysportlet1" name="db_sysportlet1"
ref='db_sysportlet1' ref='db_sysportlet1'
@closeview="closeView($event)"> @closeview="closeView($event)">
......
app_CRM/src/widgets/app/central-appmenu/central-appmenu-base.tsx
浏览文件 @ e5875839
...@@ -84,7 +84,12 @@ export class CentralBase extends Vue { ...@@ -84,7 +84,12 @@ export class CentralBase extends Vue {
{ pathName: 'gridview', parameterName: 'gridview' }, { pathName: 'gridview', parameterName: 'gridview' },
]; ];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam); const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
this.$router.push(path); if(Object.is(this.$route.fullPath,path)){
return;
}
this.$nextTick(function(){
this.$router.push(path);
})
} }
/** /**
...@@ -102,7 +107,12 @@ export class CentralBase extends Vue { ...@@ -102,7 +107,12 @@ export class CentralBase extends Vue {
{ pathName: 'gridview', parameterName: 'gridview' }, { pathName: 'gridview', parameterName: 'gridview' },
]; ];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam); const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
this.$router.push(path); if(Object.is(this.$route.fullPath,path)){
return;
}
this.$nextTick(function(){
this.$router.push(path);
})
} }
/** /**
...@@ -120,7 +130,12 @@ export class CentralBase extends Vue { ...@@ -120,7 +130,12 @@ export class CentralBase extends Vue {
{ pathName: 'gridview', parameterName: 'gridview' }, { pathName: 'gridview', parameterName: 'gridview' },
]; ];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam); const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
this.$router.push(path); if(Object.is(this.$route.fullPath,path)){
return;
}
this.$nextTick(function(){
this.$router.push(path);
})
} }
/** /**
...@@ -138,7 +153,12 @@ export class CentralBase extends Vue { ...@@ -138,7 +153,12 @@ export class CentralBase extends Vue {
{ pathName: 'gridview', parameterName: 'gridview' }, { pathName: 'gridview', parameterName: 'gridview' },
]; ];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam); const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
this.$router.push(path); if(Object.is(this.$route.fullPath,path)){
return;
}
this.$nextTick(function(){
this.$router.push(path);
})
} }
/** /**
...@@ -156,7 +176,12 @@ export class CentralBase extends Vue { ...@@ -156,7 +176,12 @@ export class CentralBase extends Vue {
{ pathName: 'gridview', parameterName: 'gridview' }, { pathName: 'gridview', parameterName: 'gridview' },
]; ];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam); const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
this.$router.push(path); if(Object.is(this.$route.fullPath,path)){
return;
}
this.$nextTick(function(){
this.$router.push(path);
})
} }
/** /**
...@@ -174,7 +199,12 @@ export class CentralBase extends Vue { ...@@ -174,7 +199,12 @@ export class CentralBase extends Vue {
{ pathName: 'gridview', parameterName: 'gridview' }, { pathName: 'gridview', parameterName: 'gridview' },
]; ];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam); const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
this.$router.push(path); if(Object.is(this.$route.fullPath,path)){
return;
}
this.$nextTick(function(){
this.$router.push(path);
})
} }
/** /**
...@@ -192,7 +222,12 @@ export class CentralBase extends Vue { ...@@ -192,7 +222,12 @@ export class CentralBase extends Vue {
{ pathName: 'gridview', parameterName: 'gridview' }, { pathName: 'gridview', parameterName: 'gridview' },
]; ];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam); const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
this.$router.push(path); if(Object.is(this.$route.fullPath,path)){
return;
}
this.$nextTick(function(){
this.$router.push(path);
})
} }
/** /**
...@@ -210,7 +245,12 @@ export class CentralBase extends Vue { ...@@ -210,7 +245,12 @@ export class CentralBase extends Vue {
{ pathName: 'gridview', parameterName: 'gridview' }, { pathName: 'gridview', parameterName: 'gridview' },
]; ];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam); const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
this.$router.push(path); if(Object.is(this.$route.fullPath,path)){
return;
}
this.$nextTick(function(){
this.$router.push(path);
})
} }
/** /**
...@@ -228,7 +268,12 @@ export class CentralBase extends Vue { ...@@ -228,7 +268,12 @@ export class CentralBase extends Vue {
{ pathName: 'gridview', parameterName: 'gridview' }, { pathName: 'gridview', parameterName: 'gridview' },
]; ];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam); const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
this.$router.push(path); if(Object.is(this.$route.fullPath,path)){
return;
}
this.$nextTick(function(){
this.$router.push(path);
})
} }
/** /**
...@@ -246,7 +291,12 @@ export class CentralBase extends Vue { ...@@ -246,7 +291,12 @@ export class CentralBase extends Vue {
{ pathName: 'gridview', parameterName: 'gridview' }, { pathName: 'gridview', parameterName: 'gridview' },
]; ];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam); const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
this.$router.push(path); if(Object.is(this.$route.fullPath,path)){
return;
}
this.$nextTick(function(){
this.$router.push(path);
})
} }
/** /**
...@@ -264,7 +314,12 @@ export class CentralBase extends Vue { ...@@ -264,7 +314,12 @@ export class CentralBase extends Vue {
{ pathName: 'gridview', parameterName: 'gridview' }, { pathName: 'gridview', parameterName: 'gridview' },
]; ];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam); const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
this.$router.push(path); if(Object.is(this.$route.fullPath,path)){
return;
}
this.$nextTick(function(){
this.$router.push(path);
})
} }
/** /**
...@@ -281,7 +336,12 @@ export class CentralBase extends Vue { ...@@ -281,7 +336,12 @@ export class CentralBase extends Vue {
{ pathName: 'centeralportal', parameterName: 'centeralportal' }, { pathName: 'centeralportal', parameterName: 'centeralportal' },
]; ];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam); const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
this.$router.push(path); if(Object.is(this.$route.fullPath,path)){
return;
}
this.$nextTick(function(){
this.$router.push(path);
})
} }
/** /**
...@@ -299,7 +359,12 @@ export class CentralBase extends Vue { ...@@ -299,7 +359,12 @@ export class CentralBase extends Vue {
{ pathName: 'gridview', parameterName: 'gridview' }, { pathName: 'gridview', parameterName: 'gridview' },
]; ];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam); const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
this.$router.push(path); if(Object.is(this.$route.fullPath,path)){
return;
}
this.$nextTick(function(){
this.$router.push(path);
})
} }
/** /**
...@@ -317,7 +382,12 @@ export class CentralBase extends Vue { ...@@ -317,7 +382,12 @@ export class CentralBase extends Vue {
{ pathName: 'gridview', parameterName: 'gridview' }, { pathName: 'gridview', parameterName: 'gridview' },
]; ];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam); const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
this.$router.push(path); if(Object.is(this.$route.fullPath,path)){
return;
}
this.$nextTick(function(){
this.$router.push(path);
})
} }
/** /**
...@@ -335,7 +405,12 @@ export class CentralBase extends Vue { ...@@ -335,7 +405,12 @@ export class CentralBase extends Vue {
{ pathName: 'gradation', parameterName: 'gradation' }, { pathName: 'gradation', parameterName: 'gradation' },
]; ];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam); const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
this.$router.push(path); if(Object.is(this.$route.fullPath,path)){
return;
}
this.$nextTick(function(){
this.$router.push(path);
})
} }
/** /**
...@@ -353,7 +428,12 @@ export class CentralBase extends Vue { ...@@ -353,7 +428,12 @@ export class CentralBase extends Vue {
{ pathName: 'gridview', parameterName: 'gridview' }, { pathName: 'gridview', parameterName: 'gridview' },
]; ];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam); const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
this.$router.push(path); if(Object.is(this.$route.fullPath,path)){
return;
}
this.$nextTick(function(){
this.$router.push(path);
})
} }
/** /**
......
app_CRM/src/widgets/campaign-activity/main-grid/main-grid-service.ts
浏览文件 @ e5875839
...@@ -267,7 +267,6 @@ export default class MainService extends ControlService { ...@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response.data.activityid = Util.createUUID(); response.data.activityid = Util.createUUID();
} }
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
this.mergeDefaults(response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
reject(response); reject(response);
...@@ -275,16 +274,6 @@ export default class MainService extends ControlService { ...@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
}); });
} }
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public mergeDefaults(response:any = {}){
if(response.data){
}
}
/** /**
* 前台逻辑 * 前台逻辑
......
app_CRM/src/widgets/campaign-list/main-grid/main-grid-service.ts
浏览文件 @ e5875839
...@@ -267,7 +267,6 @@ export default class MainService extends ControlService { ...@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response.data.relationshipsid = Util.createUUID(); response.data.relationshipsid = Util.createUUID();
} }
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
this.mergeDefaults(response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
reject(response); reject(response);
...@@ -275,16 +274,6 @@ export default class MainService extends ControlService { ...@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
}); });
} }
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public mergeDefaults(response:any = {}){
if(response.data){
}
}
/** /**
* 前台逻辑 * 前台逻辑
......
app_CRM/src/widgets/campaign-response/main-grid/main-grid-service.ts
浏览文件 @ e5875839
...@@ -267,7 +267,6 @@ export default class MainService extends ControlService { ...@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response.data.activityid = Util.createUUID(); response.data.activityid = Util.createUUID();
} }
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
this.mergeDefaults(response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
reject(response); reject(response);
...@@ -275,16 +274,6 @@ export default class MainService extends ControlService { ...@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
}); });
} }
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public mergeDefaults(response:any = {}){
if(response.data){
}
}
/** /**
* 前台逻辑 * 前台逻辑
......
app_CRM/src/widgets/campaign/head-summary-dashboard/head-summary-dashboard.html
浏览文件 @ e5875839
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="0"
:width="0"
name="dashboard_sysportlet1" name="dashboard_sysportlet1"
ref='dashboard_sysportlet1' ref='dashboard_sysportlet1'
@closeview="closeView($event)"> @closeview="closeView($event)">
...@@ -32,6 +34,8 @@ ...@@ -32,6 +34,8 @@
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="0"
:width="0"
name="dashboard_sysportlet2" name="dashboard_sysportlet2"
ref='dashboard_sysportlet2' ref='dashboard_sysportlet2'
@closeview="closeView($event)"> @closeview="closeView($event)">
......
app_CRM/src/widgets/campaign/main-grid/main-grid-service.ts
浏览文件 @ e5875839
...@@ -267,7 +267,6 @@ export default class MainService extends ControlService { ...@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response.data.campaignid = Util.createUUID(); response.data.campaignid = Util.createUUID();
} }
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
this.mergeDefaults(response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
reject(response); reject(response);
...@@ -275,16 +274,6 @@ export default class MainService extends ControlService { ...@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
}); });
} }
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public mergeDefaults(response:any = {}){
if(response.data){
}
}
/** /**
* 前台逻辑 * 前台逻辑
......
app_CRM/src/widgets/campaign/summary-dashboard/summary-dashboard.html
浏览文件 @ e5875839
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="0"
:width="0"
name="dashboard_sysportlet1" name="dashboard_sysportlet1"
ref='dashboard_sysportlet1' ref='dashboard_sysportlet1'
@closeview="closeView($event)"> @closeview="closeView($event)">
...@@ -38,6 +40,8 @@ ...@@ -38,6 +40,8 @@
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="0"
:width="0"
name="dashboard_sysportlet2" name="dashboard_sysportlet2"
ref='dashboard_sysportlet2' ref='dashboard_sysportlet2'
@closeview="closeView($event)"> @closeview="closeView($event)">
...@@ -54,6 +58,8 @@ ...@@ -54,6 +58,8 @@
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="0"
:width="0"
name="dashboard_sysportlet3" name="dashboard_sysportlet3"
ref='dashboard_sysportlet3' ref='dashboard_sysportlet3'
@closeview="closeView($event)"> @closeview="closeView($event)">
...@@ -82,6 +88,8 @@ ...@@ -82,6 +88,8 @@
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="0"
:width="0"
name="dashboard_sysportlet4" name="dashboard_sysportlet4"
ref='dashboard_sysportlet4' ref='dashboard_sysportlet4'
@closeview="closeView($event)"> @closeview="closeView($event)">
......
app_CRM/src/widgets/competitor/abstract-info-dashboard/abstract-info-dashboard.html
浏览文件 @ e5875839
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="0"
:width="0"
name="dashboard_sysportlet1" name="dashboard_sysportlet1"
ref='dashboard_sysportlet1' ref='dashboard_sysportlet1'
@closeview="closeView($event)"> @closeview="closeView($event)">
...@@ -42,6 +44,8 @@ ...@@ -42,6 +44,8 @@
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="0"
:width="0"
name="dashboard_sysportlet2" name="dashboard_sysportlet2"
ref='dashboard_sysportlet2' ref='dashboard_sysportlet2'
@closeview="closeView($event)"> @closeview="closeView($event)">
......
app_CRM/src/widgets/competitor/main-grid/main-grid-service.ts
浏览文件 @ e5875839
...@@ -267,7 +267,6 @@ export default class MainService extends ControlService { ...@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response.data.competitorid = Util.createUUID(); response.data.competitorid = Util.createUUID();
} }
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
this.mergeDefaults(response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
reject(response); reject(response);
...@@ -275,16 +274,6 @@ export default class MainService extends ControlService { ...@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
}); });
} }
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public mergeDefaults(response:any = {}){
if(response.data){
}
}
/** /**
* 前台逻辑 * 前台逻辑
......
app_CRM/src/widgets/contact/by-account-grid/by-account-grid-service.ts
浏览文件 @ e5875839
...@@ -267,7 +267,6 @@ export default class ByAccountService extends ControlService { ...@@ -267,7 +267,6 @@ export default class ByAccountService extends ControlService {
response.data.contactid = Util.createUUID(); response.data.contactid = Util.createUUID();
} }
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
this.mergeDefaults(response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
reject(response); reject(response);
...@@ -275,16 +274,6 @@ export default class ByAccountService extends ControlService { ...@@ -275,16 +274,6 @@ export default class ByAccountService extends ControlService {
}); });
} }
/**
* 合并配置的默认值
* @param {*}
* @memberof ByAccountService
*/
public mergeDefaults(response:any = {}){
if(response.data){
}
}
/** /**
* 前台逻辑 * 前台逻辑
......
app_CRM/src/widgets/contact/con-abs-dashboard/con-abs-dashboard.html
浏览文件 @ e5875839
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="0"
:width="0"
name="dashboard_sysportlet1" name="dashboard_sysportlet1"
ref='dashboard_sysportlet1' ref='dashboard_sysportlet1'
@closeview="closeView($event)"> @closeview="closeView($event)">
...@@ -32,6 +34,8 @@ ...@@ -32,6 +34,8 @@
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="0"
:width="0"
name="dashboard_sysportlet2" name="dashboard_sysportlet2"
ref='dashboard_sysportlet2' ref='dashboard_sysportlet2'
@closeview="closeView($event)"> @closeview="closeView($event)">
...@@ -48,6 +52,8 @@ ...@@ -48,6 +52,8 @@
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="0"
:width="0"
name="dashboard_sysportlet3" name="dashboard_sysportlet3"
ref='dashboard_sysportlet3' ref='dashboard_sysportlet3'
@closeview="closeView($event)"> @closeview="closeView($event)">
...@@ -64,6 +70,8 @@ ...@@ -64,6 +70,8 @@
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="0"
:width="0"
name="dashboard_sysportlet4" name="dashboard_sysportlet4"
ref='dashboard_sysportlet4' ref='dashboard_sysportlet4'
@closeview="closeView($event)"> @closeview="closeView($event)">
...@@ -80,6 +88,8 @@ ...@@ -80,6 +88,8 @@
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="0"
:width="0"
name="dashboard_sysportlet5" name="dashboard_sysportlet5"
ref='dashboard_sysportlet5' ref='dashboard_sysportlet5'
@closeview="closeView($event)"> @closeview="closeView($event)">
...@@ -106,6 +116,8 @@ ...@@ -106,6 +116,8 @@
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="0"
:width="0"
name="dashboard_sysportlet6" name="dashboard_sysportlet6"
ref='dashboard_sysportlet6' ref='dashboard_sysportlet6'
@closeview="closeView($event)"> @closeview="closeView($event)">
......
app_CRM/src/widgets/contact/main-grid/main-grid-service.ts
浏览文件 @ e5875839
...@@ -267,7 +267,6 @@ export default class MainService extends ControlService { ...@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response.data.contactid = Util.createUUID(); response.data.contactid = Util.createUUID();
} }
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
this.mergeDefaults(response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
reject(response); reject(response);
...@@ -275,16 +274,6 @@ export default class MainService extends ControlService { ...@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
}); });
} }
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public mergeDefaults(response:any = {}){
if(response.data){
}
}
/** /**
* 前台逻辑 * 前台逻辑
......
app_CRM/src/widgets/goal/main-grid/main-grid-service.ts
浏览文件 @ e5875839
...@@ -267,7 +267,6 @@ export default class MainService extends ControlService { ...@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response.data.goalid = Util.createUUID(); response.data.goalid = Util.createUUID();
} }
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
this.mergeDefaults(response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
reject(response); reject(response);
...@@ -275,16 +274,6 @@ export default class MainService extends ControlService { ...@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
}); });
} }
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public mergeDefaults(response:any = {}){
if(response.data){
}
}
/** /**
* 前台逻辑 * 前台逻辑
......
app_CRM/src/widgets/ibiz-list/main-grid/main-grid-service.ts
浏览文件 @ e5875839
...@@ -267,7 +267,6 @@ export default class MainService extends ControlService { ...@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response.data.listid = Util.createUUID(); response.data.listid = Util.createUUID();
} }
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
this.mergeDefaults(response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
reject(response); reject(response);
...@@ -275,16 +274,6 @@ export default class MainService extends ControlService { ...@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
}); });
} }
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public mergeDefaults(response:any = {}){
if(response.data){
}
}
/** /**
* 前台逻辑 * 前台逻辑
......
app_CRM/src/widgets/ibiz-list/summary-dashboard/summary-dashboard.html
浏览文件 @ e5875839
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="300" :height="300"
:width="0"
name="dashboard_sysportlet1" name="dashboard_sysportlet1"
ref='dashboard_sysportlet1' ref='dashboard_sysportlet1'
@closeview="closeView($event)"> @closeview="closeView($event)">
...@@ -43,6 +44,8 @@ ...@@ -43,6 +44,8 @@
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="0"
:width="0"
name="dashboard_sysportlet2" name="dashboard_sysportlet2"
ref='dashboard_sysportlet2' ref='dashboard_sysportlet2'
@closeview="closeView($event)"> @closeview="closeView($event)">
......
app_CRM/src/widgets/incident/main-grid/main-grid-service.ts
浏览文件 @ e5875839
...@@ -267,7 +267,6 @@ export default class MainService extends ControlService { ...@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response.data.incidentid = Util.createUUID(); response.data.incidentid = Util.createUUID();
} }
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
this.mergeDefaults(response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
reject(response); reject(response);
...@@ -275,16 +274,6 @@ export default class MainService extends ControlService { ...@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
}); });
} }
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public mergeDefaults(response:any = {}){
if(response.data){
}
}
/** /**
* 前台逻辑 * 前台逻辑
......
app_CRM/src/widgets/invoice-detail/invoice-product-grid-grid/invoice-product-grid-grid-service.ts
浏览文件 @ e5875839
...@@ -267,7 +267,6 @@ export default class InvoiceProductGridService extends ControlService { ...@@ -267,7 +267,6 @@ export default class InvoiceProductGridService extends ControlService {
response.data.invoicedetailid = Util.createUUID(); response.data.invoicedetailid = Util.createUUID();
} }
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
this.mergeDefaults(response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
reject(response); reject(response);
...@@ -275,16 +274,6 @@ export default class InvoiceProductGridService extends ControlService { ...@@ -275,16 +274,6 @@ export default class InvoiceProductGridService extends ControlService {
}); });
} }
/**
* 合并配置的默认值
* @param {*}
* @memberof InvoiceProductGridService
*/
public mergeDefaults(response:any = {}){
if(response.data){
}
}
/** /**
* 前台逻辑 * 前台逻辑
......
app_CRM/src/widgets/invoice/board-dashboard/board-dashboard.html
浏览文件 @ e5875839
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="300" :height="300"
:width="0"
name="dashboard_sysportlet1" name="dashboard_sysportlet1"
ref='dashboard_sysportlet1' ref='dashboard_sysportlet1'
@closeview="closeView($event)"> @closeview="closeView($event)">
...@@ -43,6 +44,8 @@ ...@@ -43,6 +44,8 @@
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="0"
:width="0"
name="dashboard_sysportlet2" name="dashboard_sysportlet2"
ref='dashboard_sysportlet2' ref='dashboard_sysportlet2'
@closeview="closeView($event)"> @closeview="closeView($event)">
......
app_CRM/src/widgets/invoice/main-grid/main-grid-service.ts
浏览文件 @ e5875839
...@@ -267,7 +267,6 @@ export default class MainService extends ControlService { ...@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response.data.invoiceid = Util.createUUID(); response.data.invoiceid = Util.createUUID();
} }
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
this.mergeDefaults(response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
reject(response); reject(response);
...@@ -275,16 +274,6 @@ export default class MainService extends ControlService { ...@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
}); });
} }
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public mergeDefaults(response:any = {}){
if(response.data){
}
}
/** /**
* 前台逻辑 * 前台逻辑
......
app_CRM/src/widgets/lead/lead-info-dashboard/lead-info-dashboard.html
浏览文件 @ e5875839
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="0"
:width="0"
name="dashboard_sysportlet1" name="dashboard_sysportlet1"
ref='dashboard_sysportlet1' ref='dashboard_sysportlet1'
@closeview="closeView($event)"> @closeview="closeView($event)">
...@@ -32,6 +34,8 @@ ...@@ -32,6 +34,8 @@
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="0"
:width="0"
name="dashboard_sysportlet3" name="dashboard_sysportlet3"
ref='dashboard_sysportlet3' ref='dashboard_sysportlet3'
@closeview="closeView($event)"> @closeview="closeView($event)">
...@@ -48,6 +52,8 @@ ...@@ -48,6 +52,8 @@
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="0"
:width="0"
name="dashboard_sysportlet4" name="dashboard_sysportlet4"
ref='dashboard_sysportlet4' ref='dashboard_sysportlet4'
@closeview="closeView($event)"> @closeview="closeView($event)">
...@@ -64,6 +70,8 @@ ...@@ -64,6 +70,8 @@
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="0"
:width="0"
name="dashboard_sysportlet5" name="dashboard_sysportlet5"
ref='dashboard_sysportlet5' ref='dashboard_sysportlet5'
@closeview="closeView($event)"> @closeview="closeView($event)">
...@@ -90,6 +98,8 @@ ...@@ -90,6 +98,8 @@
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="0"
:width="0"
name="dashboard_sysportlet2" name="dashboard_sysportlet2"
ref='dashboard_sysportlet2' ref='dashboard_sysportlet2'
@closeview="closeView($event)"> @closeview="closeView($event)">
......
app_CRM/src/widgets/lead/main-grid/main-grid-service.ts
浏览文件 @ e5875839
...@@ -267,7 +267,6 @@ export default class MainService extends ControlService { ...@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response.data.leadid = Util.createUUID(); response.data.leadid = Util.createUUID();
} }
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
this.mergeDefaults(response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
reject(response); reject(response);
...@@ -275,16 +274,6 @@ export default class MainService extends ControlService { ...@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
}); });
} }
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public mergeDefaults(response:any = {}){
if(response.data){
}
}
/** /**
* 前台逻辑 * 前台逻辑
......
app_CRM/src/widgets/list-account/main-grid/main-grid-service.ts
浏览文件 @ e5875839
...@@ -267,7 +267,6 @@ export default class MainService extends ControlService { ...@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response.data.relationshipsid = Util.createUUID(); response.data.relationshipsid = Util.createUUID();
} }
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
this.mergeDefaults(response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
reject(response); reject(response);
...@@ -275,16 +274,6 @@ export default class MainService extends ControlService { ...@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
}); });
} }
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public mergeDefaults(response:any = {}){
if(response.data){
}
}
/** /**
* 前台逻辑 * 前台逻辑
......
app_CRM/src/widgets/list-contact/inner-grid/inner-grid-service.ts
浏览文件 @ e5875839
...@@ -267,7 +267,6 @@ export default class InnerService extends ControlService { ...@@ -267,7 +267,6 @@ export default class InnerService extends ControlService {
response.data.relationshipsid = Util.createUUID(); response.data.relationshipsid = Util.createUUID();
} }
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
this.mergeDefaults(response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
reject(response); reject(response);
...@@ -275,16 +274,6 @@ export default class InnerService extends ControlService { ...@@ -275,16 +274,6 @@ export default class InnerService extends ControlService {
}); });
} }
/**
* 合并配置的默认值
* @param {*}
* @memberof InnerService
*/
public mergeDefaults(response:any = {}){
if(response.data){
}
}
/** /**
* 前台逻辑 * 前台逻辑
......
app_CRM/src/widgets/list-contact/main-grid/main-grid-service.ts
浏览文件 @ e5875839
...@@ -267,7 +267,6 @@ export default class MainService extends ControlService { ...@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response.data.relationshipsid = Util.createUUID(); response.data.relationshipsid = Util.createUUID();
} }
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
this.mergeDefaults(response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
reject(response); reject(response);
...@@ -275,16 +274,6 @@ export default class MainService extends ControlService { ...@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
}); });
} }
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public mergeDefaults(response:any = {}){
if(response.data){
}
}
/** /**
* 前台逻辑 * 前台逻辑
......
app_CRM/src/widgets/list-lead/main-grid/main-grid-service.ts
浏览文件 @ e5875839
...@@ -267,7 +267,6 @@ export default class MainService extends ControlService { ...@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response.data.relationshipsid = Util.createUUID(); response.data.relationshipsid = Util.createUUID();
} }
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
this.mergeDefaults(response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
reject(response); reject(response);
...@@ -275,16 +274,6 @@ export default class MainService extends ControlService { ...@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
}); });
} }
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public mergeDefaults(response:any = {}){
if(response.data){
}
}
/** /**
* 前台逻辑 * 前台逻辑
......
app_CRM/src/widgets/opportunity-competitor/main-grid/main-grid-service.ts
浏览文件 @ e5875839
...@@ -267,7 +267,6 @@ export default class MainService extends ControlService { ...@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response.data.relationshipsid = Util.createUUID(); response.data.relationshipsid = Util.createUUID();
} }
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
this.mergeDefaults(response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
reject(response); reject(response);
...@@ -275,16 +274,6 @@ export default class MainService extends ControlService { ...@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
}); });
} }
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public mergeDefaults(response:any = {}){
if(response.data){
}
}
/** /**
* 前台逻辑 * 前台逻辑
......
app_CRM/src/widgets/opportunity-product/main-grid/main-grid-service.ts
浏览文件 @ e5875839
...@@ -267,7 +267,6 @@ export default class MainService extends ControlService { ...@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response.data.opportunityproductid = Util.createUUID(); response.data.opportunityproductid = Util.createUUID();
} }
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
this.mergeDefaults(response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
reject(response); reject(response);
...@@ -275,16 +274,6 @@ export default class MainService extends ControlService { ...@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
}); });
} }
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public mergeDefaults(response:any = {}){
if(response.data){
}
}
/** /**
* 前台逻辑 * 前台逻辑
......
app_CRM/src/widgets/opportunity/abstract-info-dashboard/abstract-info-dashboard.html
浏览文件 @ e5875839
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="0"
:width="0"
name="dashboard_sysportlet1" name="dashboard_sysportlet1"
ref='dashboard_sysportlet1' ref='dashboard_sysportlet1'
@closeview="closeView($event)"> @closeview="closeView($event)">
...@@ -42,6 +44,8 @@ ...@@ -42,6 +44,8 @@
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="0"
:width="0"
name="dashboard_sysportlet2" name="dashboard_sysportlet2"
ref='dashboard_sysportlet2' ref='dashboard_sysportlet2'
@closeview="closeView($event)"> @closeview="closeView($event)">
......
app_CRM/src/widgets/opportunity/chart-001-chart/chart-001-chart-base.tsx
浏览文件 @ e5875839
...@@ -254,7 +254,7 @@ export class CHART_001ChartBase extends MainControlBase { ...@@ -254,7 +254,7 @@ export class CHART_001ChartBase extends MainControlBase {
{ {
gridIndex:0, gridIndex:0,
position:"bottom", position:"bottom",
type:'numeric', type:'value',
name:'金额', name:'金额',
......
app_CRM/src/widgets/opportunity/main-grid/main-grid-service.ts
浏览文件 @ e5875839
...@@ -267,7 +267,6 @@ export default class MainService extends ControlService { ...@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response.data.opportunityid = Util.createUUID(); response.data.opportunityid = Util.createUUID();
} }
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
this.mergeDefaults(response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
reject(response); reject(response);
...@@ -275,16 +274,6 @@ export default class MainService extends ControlService { ...@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
}); });
} }
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public mergeDefaults(response:any = {}){
if(response.data){
}
}
/** /**
* 前台逻辑 * 前台逻辑
......
app_CRM/src/widgets/opportunity/product-info-dashboard/product-info-dashboard.html
浏览文件 @ e5875839
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="0"
:width="0"
name="dashboard_sysportlet1" name="dashboard_sysportlet1"
ref='dashboard_sysportlet1' ref='dashboard_sysportlet1'
@closeview="closeView($event)"> @closeview="closeView($event)">
......
app_CRM/src/widgets/price-level/main-grid/main-grid-service.ts
浏览文件 @ e5875839
...@@ -267,7 +267,6 @@ export default class MainService extends ControlService { ...@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response.data.pricelevelid = Util.createUUID(); response.data.pricelevelid = Util.createUUID();
} }
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
this.mergeDefaults(response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
reject(response); reject(response);
...@@ -275,16 +274,6 @@ export default class MainService extends ControlService { ...@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
}); });
} }
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public mergeDefaults(response:any = {}){
if(response.data){
}
}
/** /**
* 前台逻辑 * 前台逻辑
......
app_CRM/src/widgets/product/main-grid/main-grid-service.ts
浏览文件 @ e5875839
...@@ -267,7 +267,6 @@ export default class MainService extends ControlService { ...@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response.data.productid = Util.createUUID(); response.data.productid = Util.createUUID();
} }
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
this.mergeDefaults(response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
reject(response); reject(response);
...@@ -275,16 +274,6 @@ export default class MainService extends ControlService { ...@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
}); });
} }
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public mergeDefaults(response:any = {}){
if(response.data){
}
}
/** /**
* 前台逻辑 * 前台逻辑
......
app_CRM/src/widgets/quote-detail/main-grid/main-grid-service.ts
浏览文件 @ e5875839
...@@ -267,7 +267,6 @@ export default class MainService extends ControlService { ...@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response.data.quotedetailid = Util.createUUID(); response.data.quotedetailid = Util.createUUID();
} }
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
this.mergeDefaults(response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
reject(response); reject(response);
...@@ -275,16 +274,6 @@ export default class MainService extends ControlService { ...@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
}); });
} }
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public mergeDefaults(response:any = {}){
if(response.data){
}
}
/** /**
* 前台逻辑 * 前台逻辑
......
app_CRM/src/widgets/quote/abstract-info-dashboard/abstract-info-dashboard.html
浏览文件 @ e5875839
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="300" :height="300"
:width="0"
name="dashboard_sysportlet1" name="dashboard_sysportlet1"
ref='dashboard_sysportlet1' ref='dashboard_sysportlet1'
@closeview="closeView($event)"> @closeview="closeView($event)">
...@@ -43,6 +44,8 @@ ...@@ -43,6 +44,8 @@
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:height="0"
:width="0"
name="dashboard_sysportlet2" name="dashboard_sysportlet2"
ref='dashboard_sysportlet2' ref='dashboard_sysportlet2'
@closeview="closeView($event)"> @closeview="closeView($event)">
......
app_CRM/src/widgets/quote/main-grid/main-grid-service.ts
浏览文件 @ e5875839
...@@ -267,7 +267,6 @@ export default class MainService extends ControlService { ...@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response.data.quoteid = Util.createUUID(); response.data.quoteid = Util.createUUID();
} }
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
this.mergeDefaults(response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
reject(response); reject(response);
...@@ -275,16 +274,6 @@ export default class MainService extends ControlService { ...@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
}); });
} }
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public mergeDefaults(response:any = {}){
if(response.data){
}
}
/** /**
* 前台逻辑 * 前台逻辑
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或