Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
iBiz企业中心
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
iBiz企业套件
iBiz企业中心
提交
3c640382
提交
3c640382
编写于
6月 16, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
xignzi006 发布系统代码
上级
7833e8a7
变更
19
展开全部
隐藏空白字符变更
内嵌
并排
正在显示
19 个修改的文件
包含
618 行增加
和
44 行删除
+618
-44
view-config.json
app_BusinessCentral/public/assets/json/view-config.json
+30
-0
account_en_US.ts
...ntral/src/locale/lanres/entities/account/account_en_US.ts
+135
-0
account_zh_CN.ts
...ntral/src/locale/lanres/entities/account/account_zh_CN.ts
+135
-0
contact_en_US.ts
...ntral/src/locale/lanres/entities/contact/contact_en_US.ts
+10
-0
contact_zh_CN.ts
...ntral/src/locale/lanres/entities/contact/contact_zh_CN.ts
+10
-0
tasks.ts
app_BusinessCentral/src/mock/entity/tasks/tasks.ts
+0
-1
viewconfig.ts
app_BusinessCentral/src/mock/viewconfig/viewconfig.ts
+24
-0
task-quick-create-base.vue
...c/pages/base/task-quick-create/task-quick-create-base.vue
+1
-1
page-register.ts
...usinessCentral/src/pages/ungroup/central/page-register.ts
+2
-0
router.ts
app_BusinessCentral/src/pages/ungroup/central/router.ts
+28
-0
task-service-base.ts
app_BusinessCentral/src/service/task/task-service-base.ts
+0
-16
state.ts
app_BusinessCentral/src/store/modules/view-action/state.ts
+2
-0
account-ui-service-base.ts
...sCentral/src/uiservice/account/account-ui-service-base.ts
+128
-0
contact-ui-service-base.ts
...sCentral/src/uiservice/contact/contact-ui-service-base.ts
+1
-0
pt-account-info-portlet-base.vue
.../pt-account-info-portlet/pt-account-info-portlet-base.vue
+45
-0
pt-address-portlet-base.vue
...ts/account/pt-address-portlet/pt-address-portlet-base.vue
+45
-0
TaskServiceImpl.java
...sinesscentral/core/base/service/impl/TaskServiceImpl.java
+0
-4
h2_table.xml
...esscentral-core/src/main/resources/liquibase/h2_table.xml
+21
-21
systemResource.json
...al-core/src/main/resources/permission/systemResource.json
+1
-1
未找到文件。
app_BusinessCentral/public/assets/json/view-config.json
浏览文件 @
3c640382
...
...
@@ -29,6 +29,16 @@
"viewtag"
:
"06c6da1c8093784a9e76e1ccc52231b7"
,
"memo"
:
"系统自动添加"
},
"accountedit_accountinfo"
:
{
"title"
:
"地址信息"
,
"caption"
:
"客户"
,
"viewtype"
:
"DEEDITVIEW"
,
"viewmodule"
:
"Base"
,
"viewname"
:
"AccountEdit_AccountInfo"
,
"viewfilename"
:
"account-edit-account-info"
,
"viewtag"
:
"0d25ba75b06acd9c995642d0a45fcd2c"
,
"memo"
:
"系统自动添加"
},
"salesordereditview"
:
{
"title"
:
"salesorder编辑视图"
,
"caption"
:
"订单"
,
...
...
@@ -229,6 +239,16 @@
"viewtag"
:
"6e18ac74e5685439110f9b4e534ee005"
,
"memo"
:
"系统自动添加"
},
"accountedit_address"
:
{
"title"
:
"地址信息"
,
"caption"
:
"客户"
,
"viewtype"
:
"DEEDITVIEW"
,
"viewmodule"
:
"Base"
,
"viewname"
:
"AccountEdit_Address"
,
"viewfilename"
:
"account-edit-address"
,
"viewtag"
:
"728b69e2de09e7920b86712bc17ea963"
,
"memo"
:
"系统自动添加"
},
"accountintroduction"
:
{
"title"
:
"account编辑视图"
,
"caption"
:
"客户"
,
...
...
@@ -329,6 +349,16 @@
"viewtag"
:
"916febbb65be1c54dd42ccb9914fe973"
,
"memo"
:
"系统自动添加"
},
"contactabstracteditview9"
:
{
"title"
:
"联系人编辑视图"
,
"caption"
:
"联系人"
,
"viewtype"
:
"DEEDITVIEW9"
,
"viewmodule"
:
"Base"
,
"viewname"
:
"ContactAbstractEditView9"
,
"viewfilename"
:
"contact-abstract-edit-view9"
,
"viewtag"
:
"928f354b1e67a8b855b7f19f485299b0"
,
"memo"
:
""
},
"serviceappointmenteditview"
:
{
"title"
:
"serviceappointment编辑视图"
,
"caption"
:
"服务活动"
,
...
...
app_BusinessCentral/src/locale/lanres/entities/account/account_en_US.ts
浏览文件 @
3c640382
...
...
@@ -165,6 +165,10 @@ export default {
transactioncurrencyname
:
'货币'
,
},
views
:
{
edit_accountinfo
:
{
caption
:
"客户"
,
title
:
'地址信息'
,
},
accountinfo
:
{
caption
:
"客户"
,
title
:
'account编辑视图'
,
...
...
@@ -188,6 +192,10 @@ export default {
editview
:
{
caption
:
"客户"
,
title
:
'account编辑视图'
,
},
edit_address
:
{
caption
:
"客户"
,
title
:
'地址信息'
,
},
introduction
:
{
caption
:
"客户"
,
...
...
@@ -218,6 +226,33 @@ export default {
title
:
'account编辑视图'
,
},
},
edit_accountinfo_form
:
{
details
:
{
group1
:
"客户基本信息"
,
formpage1
:
"基本信息"
,
srfupdatedate
:
"更新时间"
,
srforikey
:
""
,
srfkey
:
"客户"
,
srfmajortext
:
"客户名称"
,
srftempmode
:
""
,
srfuf
:
""
,
srfdeid
:
""
,
srfsourcekey
:
""
,
accountname
:
"客户名称"
,
telephone1
:
"主要电话"
,
fax
:
"传真"
,
websiteurl
:
"网站"
,
parentaccountname
:
"上级单位"
,
tickersymbol
:
"股票代号"
,
customertypecode
:
"关系类型"
,
defaultpricelevelname
:
"价目表"
,
defaultpricelevelid
:
"价目表"
,
parentaccountid
:
"上级单位"
,
accountid
:
"客户"
,
},
uiactions
:
{
},
},
accountinfo_form
:
{
details
:
{
group1
:
"客户基本信息"
,
...
...
@@ -267,6 +302,30 @@ export default {
uiactions
:
{
},
},
edit_address_form
:
{
details
:
{
group1
:
"客户基本信息"
,
formpage1
:
"基本信息"
,
srfupdatedate
:
"更新时间"
,
srforikey
:
""
,
srfkey
:
"客户"
,
srfmajortext
:
"客户名称"
,
srftempmode
:
""
,
srfuf
:
""
,
srfdeid
:
""
,
srfsourcekey
:
""
,
address1_addressid
:
"地址 1: ID"
,
address1_name
:
"地址 1: 名称"
,
address1_addresstypecode
:
"地址 1: 地址类型"
,
address1_country
:
"地址 1: 国家/地区"
,
address1_stateorprovince
:
"地址 1: 省/市/自治区"
,
address1_city
:
"地址 1: 市/县"
,
address1_county
:
"地址 1: 县"
,
accountid
:
"客户"
,
},
uiactions
:
{
},
},
introduction_form
:
{
details
:
{
group1
:
"客户基本信息"
,
...
...
@@ -446,6 +505,82 @@ export default {
uiactions
:
{
},
},
edit_accountinfotoolbar_toolbar
:
{
tbitem3
:
{
caption
:
"Save"
,
tip
:
"Save"
,
},
tbitem4
:
{
caption
:
"Save And New"
,
tip
:
"Save And New"
,
},
tbitem5
:
{
caption
:
"Save And Close"
,
tip
:
"Save And Close Window"
,
},
tbitem6
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem7
:
{
caption
:
"Remove And Close"
,
tip
:
"Remove And Close Window"
,
},
tbitem8
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem12
:
{
caption
:
"New"
,
tip
:
"New"
,
},
tbitem13
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem14
:
{
caption
:
"Copy"
,
tip
:
"Copy {0}"
,
},
},
edit_addresstoolbar_toolbar
:
{
tbitem3
:
{
caption
:
"Save"
,
tip
:
"Save"
,
},
tbitem4
:
{
caption
:
"Save And New"
,
tip
:
"Save And New"
,
},
tbitem5
:
{
caption
:
"Save And Close"
,
tip
:
"Save And Close Window"
,
},
tbitem6
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem7
:
{
caption
:
"Remove And Close"
,
tip
:
"Remove And Close Window"
,
},
tbitem8
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem12
:
{
caption
:
"New"
,
tip
:
"New"
,
},
tbitem13
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem14
:
{
caption
:
"Copy"
,
tip
:
"Copy {0}"
,
},
},
gridviewtoolbar_toolbar
:
{
tbitem1_openquickcreateview
:
{
caption
:
"新建"
,
...
...
app_BusinessCentral/src/locale/lanres/entities/account/account_zh_CN.ts
浏览文件 @
3c640382
...
...
@@ -164,6 +164,10 @@ export default {
transactioncurrencyname
:
'货币'
,
},
views
:
{
edit_accountinfo
:
{
caption
:
'客户'
,
title
:
'地址信息'
,
},
accountinfo
:
{
caption
:
'客户'
,
title
:
'account编辑视图'
,
...
...
@@ -187,6 +191,10 @@ export default {
editview
:
{
caption
:
'客户'
,
title
:
'account编辑视图'
,
},
edit_address
:
{
caption
:
'客户'
,
title
:
'地址信息'
,
},
introduction
:
{
caption
:
'客户'
,
...
...
@@ -217,6 +225,33 @@ export default {
title
:
'account编辑视图'
,
},
},
edit_accountinfo_form
:
{
details
:
{
group1
:
'客户基本信息'
,
formpage1
:
'基本信息'
,
srfupdatedate
:
'更新时间'
,
srforikey
:
''
,
srfkey
:
'客户'
,
srfmajortext
:
'客户名称'
,
srftempmode
:
''
,
srfuf
:
''
,
srfdeid
:
''
,
srfsourcekey
:
''
,
accountname
:
'客户名称'
,
telephone1
:
'主要电话'
,
fax
:
'传真'
,
websiteurl
:
'网站'
,
parentaccountname
:
'上级单位'
,
tickersymbol
:
'股票代号'
,
customertypecode
:
'关系类型'
,
defaultpricelevelname
:
'价目表'
,
defaultpricelevelid
:
'价目表'
,
parentaccountid
:
'上级单位'
,
accountid
:
'客户'
,
},
uiactions
:
{
},
},
accountinfo_form
:
{
details
:
{
group1
:
'客户基本信息'
,
...
...
@@ -266,6 +301,30 @@ export default {
uiactions
:
{
},
},
edit_address_form
:
{
details
:
{
group1
:
'客户基本信息'
,
formpage1
:
'基本信息'
,
srfupdatedate
:
'更新时间'
,
srforikey
:
''
,
srfkey
:
'客户'
,
srfmajortext
:
'客户名称'
,
srftempmode
:
''
,
srfuf
:
''
,
srfdeid
:
''
,
srfsourcekey
:
''
,
address1_addressid
:
'地址 1: ID'
,
address1_name
:
'地址 1: 名称'
,
address1_addresstypecode
:
'地址 1: 地址类型'
,
address1_country
:
'地址 1: 国家/地区'
,
address1_stateorprovince
:
'地址 1: 省/市/自治区'
,
address1_city
:
'地址 1: 市/县'
,
address1_county
:
'地址 1: 县'
,
accountid
:
'客户'
,
},
uiactions
:
{
},
},
introduction_form
:
{
details
:
{
group1
:
'客户基本信息'
,
...
...
@@ -445,6 +504,82 @@ export default {
uiactions
:
{
},
},
edit_accountinfotoolbar_toolbar
:
{
tbitem3
:
{
caption
:
'保存'
,
tip
:
'保存'
,
},
tbitem4
:
{
caption
:
'保存并新建'
,
tip
:
'保存并新建'
,
},
tbitem5
:
{
caption
:
'保存并关闭'
,
tip
:
'保存并关闭'
,
},
tbitem6
:
{
caption
:
'-'
,
tip
:
''
,
},
tbitem7
:
{
caption
:
'删除并关闭'
,
tip
:
'删除并关闭'
,
},
tbitem8
:
{
caption
:
'-'
,
tip
:
''
,
},
tbitem12
:
{
caption
:
'新建'
,
tip
:
'新建'
,
},
tbitem13
:
{
caption
:
'-'
,
tip
:
''
,
},
tbitem14
:
{
caption
:
'拷贝'
,
tip
:
'拷贝'
,
},
},
edit_addresstoolbar_toolbar
:
{
tbitem3
:
{
caption
:
'保存'
,
tip
:
'保存'
,
},
tbitem4
:
{
caption
:
'保存并新建'
,
tip
:
'保存并新建'
,
},
tbitem5
:
{
caption
:
'保存并关闭'
,
tip
:
'保存并关闭'
,
},
tbitem6
:
{
caption
:
'-'
,
tip
:
''
,
},
tbitem7
:
{
caption
:
'删除并关闭'
,
tip
:
'删除并关闭'
,
},
tbitem8
:
{
caption
:
'-'
,
tip
:
''
,
},
tbitem12
:
{
caption
:
'新建'
,
tip
:
'新建'
,
},
tbitem13
:
{
caption
:
'-'
,
tip
:
''
,
},
tbitem14
:
{
caption
:
'拷贝'
,
tip
:
'拷贝'
,
},
},
gridviewtoolbar_toolbar
:
{
tbitem1_openquickcreateview
:
{
caption
:
'新建'
,
...
...
app_BusinessCentral/src/locale/lanres/entities/contact/contact_en_US.ts
浏览文件 @
3c640382
...
...
@@ -210,6 +210,10 @@ export default {
pickupgridview
:
{
caption
:
"联系人"
,
title
:
'contact选择表格视图'
,
},
abstracteditview9
:
{
caption
:
"联系人"
,
title
:
'联系人编辑视图'
,
},
editview
:
{
caption
:
"联系人"
,
...
...
@@ -374,4 +378,10 @@ export default {
tip
:
"Copy {0}"
,
},
},
abstracteditview9toolbar_toolbar
:
{
deuiaction2
:
{
caption
:
"编辑"
,
tip
:
"编辑"
,
},
},
};
\ No newline at end of file
app_BusinessCentral/src/locale/lanres/entities/contact/contact_zh_CN.ts
浏览文件 @
3c640382
...
...
@@ -209,6 +209,10 @@ export default {
pickupgridview
:
{
caption
:
'联系人'
,
title
:
'contact选择表格视图'
,
},
abstracteditview9
:
{
caption
:
'联系人'
,
title
:
'联系人编辑视图'
,
},
editview
:
{
caption
:
'联系人'
,
...
...
@@ -373,4 +377,10 @@ export default {
tip
:
'拷贝'
,
},
},
abstracteditview9toolbar_toolbar
:
{
deuiaction2
:
{
caption
:
'编辑'
,
tip
:
'编辑'
,
},
},
};
\ No newline at end of file
app_BusinessCentral/src/mock/entity/tasks/tasks.ts
浏览文件 @
3c640382
...
...
@@ -321,7 +321,6 @@ mock.onGet(new RegExp(/^\/tasks\/fetchdefault(\?[\w-./?%&=,]*)*$/)).reply((confi
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// Remove
...
...
app_BusinessCentral/src/mock/viewconfig/viewconfig.ts
浏览文件 @
3c640382
...
...
@@ -31,6 +31,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname"
:
"IncidentEditView"
,
"viewtag"
:
"06c6da1c8093784a9e76e1ccc52231b7"
},
"accountedit_accountinfo"
:
{
"title"
:
"地址信息"
,
"caption"
:
"客户"
,
"viewtype"
:
"DEEDITVIEW"
,
"viewmodule"
:
"Base"
,
"viewname"
:
"AccountEdit_AccountInfo"
,
"viewtag"
:
"0d25ba75b06acd9c995642d0a45fcd2c"
},
"salesordereditview"
:
{
"title"
:
"salesorder编辑视图"
,
"caption"
:
"订单"
,
...
...
@@ -191,6 +199,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname"
:
"AccountEditView"
,
"viewtag"
:
"6e18ac74e5685439110f9b4e534ee005"
},
"accountedit_address"
:
{
"title"
:
"地址信息"
,
"caption"
:
"客户"
,
"viewtype"
:
"DEEDITVIEW"
,
"viewmodule"
:
"Base"
,
"viewname"
:
"AccountEdit_Address"
,
"viewtag"
:
"728b69e2de09e7920b86712bc17ea963"
},
"accountintroduction"
:
{
"title"
:
"account编辑视图"
,
"caption"
:
"客户"
,
...
...
@@ -271,6 +287,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname"
:
"AccountAddress"
,
"viewtag"
:
"916febbb65be1c54dd42ccb9914fe973"
},
"contactabstracteditview9"
:
{
"title"
:
"联系人编辑视图"
,
"caption"
:
"联系人"
,
"viewtype"
:
"DEEDITVIEW9"
,
"viewmodule"
:
"Base"
,
"viewname"
:
"ContactAbstractEditView9"
,
"viewtag"
:
"928f354b1e67a8b855b7f19f485299b0"
},
"serviceappointmenteditview"
:
{
"title"
:
"serviceappointment编辑视图"
,
"caption"
:
"服务活动"
,
...
...
app_BusinessCentral/src/pages/base/task-quick-create/task-quick-create-base.vue
浏览文件 @
3c640382
...
...
@@ -129,7 +129,7 @@ export default class TaskQuickCreateBase extends Vue {
*/
public
customViewParams
:
any
=
{
"regardingobjectid"
:{
"isRawValue"
:
false
,
"value"
:
"account"
},
"regardingobjecttypecode"
:{
"isRawValue"
:
true
,
"value"
:
"
TASK
"
}
"regardingobjecttypecode"
:{
"isRawValue"
:
true
,
"value"
:
"
ACCOUNT
"
}
};
/**
...
...
app_BusinessCentral/src/pages/ungroup/central/page-register.ts
浏览文件 @
3c640382
...
...
@@ -26,6 +26,7 @@ export const PageComponents = {
Vue
.
component
(
'contact-edit-view'
,
()
=>
import
(
'@pages/base/contact-edit-view/contact-edit-view.vue'
));
Vue
.
component
(
'account-address'
,
()
=>
import
(
'@pages/base/account-address/account-address.vue'
));
Vue
.
component
(
'appointment-edit-view'
,
()
=>
import
(
'@pages/base/appointment-edit-view/appointment-edit-view.vue'
));
Vue
.
component
(
'account-edit-address'
,
()
=>
import
(
'@pages/base/account-edit-address/account-edit-address.vue'
));
Vue
.
component
(
'email-edit-view'
,
()
=>
import
(
'@pages/base/email-edit-view/email-edit-view.vue'
));
Vue
.
component
(
'contact-pickup-grid-view'
,
()
=>
import
(
'@pages/base/contact-pickup-grid-view/contact-pickup-grid-view.vue'
));
Vue
.
component
(
'goal-grid-view'
,
()
=>
import
(
'@pages/sales/goal-grid-view/goal-grid-view.vue'
));
...
...
@@ -38,6 +39,7 @@ export const PageComponents = {
Vue
.
component
(
'account-pickup-view'
,
()
=>
import
(
'@pages/base/account-pickup-view/account-pickup-view.vue'
));
Vue
.
component
(
'price-level-pickup-grid-view'
,
()
=>
import
(
'@pages/product/price-level-pickup-grid-view/price-level-pickup-grid-view.vue'
));
Vue
.
component
(
'ibiz-list-grid-view'
,
()
=>
import
(
'@pages/marketing/ibiz-list-grid-view/ibiz-list-grid-view.vue'
));
Vue
.
component
(
'account-edit-account-info'
,
()
=>
import
(
'@pages/base/account-edit-account-info/account-edit-account-info.vue'
));
Vue
.
component
(
'product-grid-view'
,
()
=>
import
(
'@pages/product/product-grid-view/product-grid-view.vue'
));
Vue
.
component
(
'sales-literature-edit-view'
,
()
=>
import
(
'@pages/sales/sales-literature-edit-view/sales-literature-edit-view.vue'
));
Vue
.
component
(
'account-pickup-grid-view'
,
()
=>
import
(
'@pages/base/account-pickup-grid-view/account-pickup-grid-view.vue'
));
...
...
app_BusinessCentral/src/pages/ungroup/central/router.ts
浏览文件 @
3c640382
...
...
@@ -412,6 +412,20 @@ const router = new Router({
},
component
:
()
=>
import
(
'@pages/base/appointment-edit-view/appointment-edit-view.vue'
),
},
{
path
:
'accounts/:account?/edit_address/:edit_address?'
,
meta
:
{
caption
:
'entities.account.views.edit_address.title'
,
info
:
''
,
parameters
:
[
{
pathName
:
'central'
,
parameterName
:
'central'
},
{
pathName
:
'accounts'
,
parameterName
:
'account'
},
{
pathName
:
'edit_address'
,
parameterName
:
'edit_address'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/base/account-edit-address/account-edit-address.vue'
),
},
{
path
:
'emails/:email?/editview/:editview?'
,
meta
:
{
...
...
@@ -580,6 +594,20 @@ const router = new Router({
},
component
:
()
=>
import
(
'@pages/marketing/ibiz-list-grid-view/ibiz-list-grid-view.vue'
),
},
{
path
:
'accounts/:account?/edit_accountinfo/:edit_accountinfo?'
,
meta
:
{
caption
:
'entities.account.views.edit_accountinfo.title'
,
info
:
''
,
parameters
:
[
{
pathName
:
'central'
,
parameterName
:
'central'
},
{
pathName
:
'accounts'
,
parameterName
:
'account'
},
{
pathName
:
'edit_accountinfo'
,
parameterName
:
'edit_accountinfo'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/base/account-edit-account-info/account-edit-account-info.vue'
),
},
{
path
:
'products/:product?/gridview/:gridview?'
,
meta
:
{
...
...
app_BusinessCentral/src/service/task/task-service-base.ts
浏览文件 @
3c640382
import
{
Http
,
Util
}
from
'@/utils'
;
import
EntityService
from
'../entity-service'
;
import
DraftByParentLogic
from
'@/service/task/draft-by-parent-logic'
;
...
...
@@ -177,19 +176,4 @@ export default class TaskServiceBase extends EntityService {
let
tempData
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
return
Http
.
getInstance
().
get
(
`/tasks/fetchdefault`
,
tempData
,
isloading
);
}
/**
* DraftByParent接口方法
*
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof TaskServiceBase
*/
public
async
DraftByParent
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
appLogic
:
DraftByParentLogic
=
new
DraftByParentLogic
({
context
:
JSON
.
parse
(
JSON
.
stringify
(
context
)),
data
:
JSON
.
parse
(
JSON
.
stringify
(
data
))});
const
result
=
await
appLogic
.
onExecute
(
context
,
data
,
isloading
?
true
:
false
);
return
{
status
:
200
,
data
:
result
};
}
}
\ No newline at end of file
app_BusinessCentral/src/store/modules/view-action/state.ts
浏览文件 @
3c640382
...
...
@@ -109,12 +109,14 @@ export const viewstate: any = {
'aa79d35850f36fbc1a5085353ecd5af5'
,
'e38e7b53a449e0f112cb545d2c5d4b85'
,
'fb06f2c1cea1ac2a5a70c20f4a277ae5'
,
'0d25ba75b06acd9c995642d0a45fcd2c'
,
'73bb9f7e653384ca09f8bbbfd580d892'
,
'c607e5bc2c07ab2aca084e275ce677b7'
,
'a95d7d9111bc13a8b73a11ee1e4ff92a'
,
'893e62d6fbdc4580de7e3e802aec9108'
,
'916febbb65be1c54dd42ccb9914fe973'
,
'1d3b94223a5d3f8ab1d2fe334c8c4afd'
,
'728b69e2de09e7920b86712bc17ea963'
,
'a5213905238dbc5d8e1a505029105cc9'
,
],
},
...
...
app_BusinessCentral/src/uiservice/account/account-ui-service-base.ts
浏览文件 @
3c640382
...
...
@@ -79,12 +79,14 @@ export default class AccountUIServiceBase extends UIService {
* @memberof AccountUIServiceBase
*/
public
initViewMap
(){
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'edit_accountinfo'
,
srfappde
:
'accounts'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'accountinfo'
,
srfappde
:
'accounts'
});
this
.
allViewMap
.
set
(
'PICKUPVIEW:'
,{
viewname
:
'pickupview'
,
srfappde
:
'accounts'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'summary'
,
srfappde
:
'accounts'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'info'
,
srfappde
:
'accounts'
});
this
.
allViewMap
.
set
(
'MDATAVIEW:'
,{
viewname
:
'gridview'
,
srfappde
:
'accounts'
});
this
.
allViewMap
.
set
(
'EDITVIEW:'
,{
viewname
:
'editview'
,
srfappde
:
'accounts'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'edit_address'
,
srfappde
:
'accounts'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'introduction'
,
srfappde
:
'accounts'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'address'
,
srfappde
:
'accounts'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'optionview'
,
srfappde
:
'accounts'
});
...
...
@@ -162,6 +164,132 @@ export default class AccountUIServiceBase extends UIService {
openDrawer
(
view
,
data
);
}
/**
* 编辑
*
* @param {any[]} args 当前数据
* @param {any} context 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @param {*} [srfParentDeName] 父实体名称
* @returns {Promise<any>}
*/
public
async
Account_Edit_Address
(
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
=
'SINGLEKEY'
;
Object
.
assign
(
context
,
{
account
:
'%account%'
});
Object
.
assign
(
params
,
{
accountid
:
'%account%'
});
Object
.
assign
(
params
,
{
accountname
:
'%accountname%'
});
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
:
'accounts'
,
parameterName
:
'account'
},
];
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
(
window
.
opener
){
window
.
opener
.
postMessage
({
status
:
'OK'
,
identification
:
'WF'
},
Environment
.
uniteAddress
);
window
.
close
();
}
return
result
.
datas
;
});
}
const
view
:
any
=
{
viewname
:
'account-edit-address'
,
height
:
0
,
width
:
450
,
title
:
actionContext
.
$t
(
'entities.account.views.edit_address.title'
),
placement
:
'DRAWER_RIGHT'
,
};
openDrawer
(
view
,
data
);
}
/**
* 编辑
*
* @param {any[]} args 当前数据
* @param {any} context 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @param {*} [srfParentDeName] 父实体名称
* @returns {Promise<any>}
*/
public
async
Account_Edit_AccountInfo
(
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
=
'SINGLEKEY'
;
Object
.
assign
(
context
,
{
account
:
'%account%'
});
Object
.
assign
(
params
,
{
accountid
:
'%account%'
});
Object
.
assign
(
params
,
{
accountname
:
'%accountname%'
});
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
:
'accounts'
,
parameterName
:
'account'
},
];
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
(
window
.
opener
){
window
.
opener
.
postMessage
({
status
:
'OK'
,
identification
:
'WF'
},
Environment
.
uniteAddress
);
window
.
close
();
}
return
result
.
datas
;
});
}
const
view
:
any
=
{
viewname
:
'account-edit-account-info'
,
height
:
0
,
width
:
450
,
title
:
actionContext
.
$t
(
'entities.account.views.edit_accountinfo.title'
),
placement
:
'DRAWER_RIGHT'
,
};
openDrawer
(
view
,
data
);
}
/**
* 获取指定数据的重定向页面
...
...
app_BusinessCentral/src/uiservice/contact/contact-ui-service-base.ts
浏览文件 @
3c640382
...
...
@@ -81,6 +81,7 @@ export default class ContactUIServiceBase extends UIService {
public
initViewMap
(){
this
.
allViewMap
.
set
(
'MDATAVIEW:'
,{
viewname
:
'gridview'
,
srfappde
:
'contacts'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'pickupgridview'
,
srfappde
:
'contacts'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'abstracteditview9'
,
srfappde
:
'contacts'
});
this
.
allViewMap
.
set
(
'EDITVIEW:'
,{
viewname
:
'editview'
,
srfappde
:
'contacts'
});
this
.
allViewMap
.
set
(
'PICKUPVIEW:'
,{
viewname
:
'pickupview'
,
srfappde
:
'contacts'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'optionview'
,
srfappde
:
'contacts'
});
...
...
app_BusinessCentral/src/widgets/account/pt-account-info-portlet/pt-account-info-portlet-base.vue
浏览文件 @
3c640382
...
...
@@ -5,6 +5,12 @@
账户信息
</span>
<span
class=
"portlet-action"
>
<a
@
click=
"uiAction('uc040f39', $event)"
>
</a>
</span>
</p>
<div
class=
"portlet-with-title"
>
<account-account-info
:viewdata=
"JSON.stringify(context)"
:viewDefaultUsage=
"false"
></account-account-info>
...
...
@@ -20,6 +26,7 @@ import { UIActionTool,Util } from '@/utils';
import
AccountService
from
'@/service/account/account-service'
;
import
PT_AccountInfoService
from
'./pt-account-info-portlet-service'
;
import
AccountUIService
from
'@/uiservice/account/account-ui-service'
;
import
{
Environment
}
from
'@/environments/environment'
;
...
...
@@ -108,6 +115,34 @@ export default class AccountPT_AccountInfoBase extends Vue implements ControlInt
public
appEntityService
:
AccountService
=
new
AccountService
({
$store
:
this
.
$store
});
/**
* 逻辑事件
*
* @param {*} [params={}]
* @param {*} [tag]
* @param {*} [$event]
* @memberof
*/
public
dashboard_sysportlet1_uc040f39_click
(
params
:
any
=
{},
tag
?:
any
,
$event
?:
any
)
{
// 取数
let
datas
:
any
[]
=
[];
let
xData
:
any
=
null
;
// _this 指向容器对象
const
_this
:
any
=
this
;
let
paramJO
:
any
=
{};
let
contextJO
:
any
=
{};
xData
=
this
;
if
(
_this
.
getDatas
&&
_this
.
getDatas
instanceof
Function
)
{
datas
=
[...
_this
.
getDatas
()];
}
if
(
params
){
datas
=
[
params
];
}
// 界面行为
const
curUIService
:
AccountUIService
=
new
AccountUIService
();
curUIService
.
Account_Edit_AccountInfo
(
datas
,
contextJO
,
paramJO
,
$event
,
xData
,
this
,
"Account"
);
}
/**
* 关闭视图
...
...
@@ -231,6 +266,16 @@ export default class AccountPT_AccountInfoBase extends Vue implements ControlInt
}
}
/**
* 执行界面行为
*
* @memberof PT_AccountInfoBase
*/
public
uiAction
(
tag
:
string
,
event
:
any
){
if
(
Object
.
is
(
tag
,
'uc040f39'
)){
this
.
dashboard_sysportlet1_uc040f39_click
(
null
,
tag
,
event
);
}
}
}
</
script
>
...
...
app_BusinessCentral/src/widgets/account/pt-address-portlet/pt-address-portlet-base.vue
浏览文件 @
3c640382
...
...
@@ -5,6 +5,12 @@
地址信息
</span>
<span
class=
"portlet-action"
>
<a
@
click=
"uiAction('u2ccbfc9', $event)"
>
</a>
</span>
</p>
<div
class=
"portlet-with-title"
>
<account-address
:viewdata=
"JSON.stringify(context)"
:viewDefaultUsage=
"false"
></account-address>
...
...
@@ -20,6 +26,7 @@ import { UIActionTool,Util } from '@/utils';
import
AccountService
from
'@/service/account/account-service'
;
import
PT_AddressService
from
'./pt-address-portlet-service'
;
import
AccountUIService
from
'@/uiservice/account/account-ui-service'
;
import
{
Environment
}
from
'@/environments/environment'
;
...
...
@@ -108,6 +115,34 @@ export default class AccountPT_AddressBase extends Vue implements ControlInterfa
public
appEntityService
:
AccountService
=
new
AccountService
({
$store
:
this
.
$store
});
/**
* 逻辑事件
*
* @param {*} [params={}]
* @param {*} [tag]
* @param {*} [$event]
* @memberof
*/
public
dashboard_sysportlet2_u2ccbfc9_click
(
params
:
any
=
{},
tag
?:
any
,
$event
?:
any
)
{
// 取数
let
datas
:
any
[]
=
[];
let
xData
:
any
=
null
;
// _this 指向容器对象
const
_this
:
any
=
this
;
let
paramJO
:
any
=
{};
let
contextJO
:
any
=
{};
xData
=
this
;
if
(
_this
.
getDatas
&&
_this
.
getDatas
instanceof
Function
)
{
datas
=
[...
_this
.
getDatas
()];
}
if
(
params
){
datas
=
[
params
];
}
// 界面行为
const
curUIService
:
AccountUIService
=
new
AccountUIService
();
curUIService
.
Account_Edit_Address
(
datas
,
contextJO
,
paramJO
,
$event
,
xData
,
this
,
"Account"
);
}
/**
* 关闭视图
...
...
@@ -231,6 +266,16 @@ export default class AccountPT_AddressBase extends Vue implements ControlInterfa
}
}
/**
* 执行界面行为
*
* @memberof PT_AddressBase
*/
public
uiAction
(
tag
:
string
,
event
:
any
){
if
(
Object
.
is
(
tag
,
'u2ccbfc9'
)){
this
.
dashboard_sysportlet2_u2ccbfc9_click
(
null
,
tag
,
event
);
}
}
}
</
script
>
...
...
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/TaskServiceImpl.java
浏览文件 @
3c640382
...
...
@@ -54,10 +54,6 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements IT
@Lazy
private
cn
.
ibizlab
.
businesscentral
.
core
.
base
.
service
.
ITransactionCurrencyService
transactioncurrencyService
;
@Autowired
@Lazy
private
cn
.
ibizlab
.
businesscentral
.
core
.
base
.
service
.
logic
.
ITaskDraftByParentLogic
draftbyparentLogic
;
private
int
batchSize
=
500
;
@Override
...
...
businesscentral-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
3c640382
此差异已折叠。
点击以展开。
businesscentral-core/src/main/resources/permission/systemResource.json
浏览文件 @
3c640382
...
...
@@ -8,7 +8,7 @@
"delogicname"
:
"任务"
,
"sysmoudle"
:{
"id"
:
"BASE"
,
"name"
:
"Base"
},
"dedataset"
:[{
"id"
:
"Default"
,
"name"
:
"DEFAULT"
}],
"deaction"
:[{
"id"
:
"CheckKey"
,
"name"
:
"CheckKey"
,
"type"
:
"BUILTIN"
},{
"id"
:
"
DraftByParent"
,
"name"
:
"DraftByParent"
,
"type"
:
"DELOGIC"
},{
"id"
:
"
GetDraft"
,
"name"
:
"GetDraft"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Save"
,
"name"
:
"Save"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Remove"
,
"name"
:
"Remove"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Create"
,
"name"
:
"Create"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Get"
,
"name"
:
"Get"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Update"
,
"name"
:
"Update"
,
"type"
:
"BUILTIN"
}],
"deaction"
:[{
"id"
:
"CheckKey"
,
"name"
:
"CheckKey"
,
"type"
:
"BUILTIN"
},{
"id"
:
"GetDraft"
,
"name"
:
"GetDraft"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Save"
,
"name"
:
"Save"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Remove"
,
"name"
:
"Remove"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Create"
,
"name"
:
"Create"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Get"
,
"name"
:
"Get"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Update"
,
"name"
:
"Update"
,
"type"
:
"BUILTIN"
}],
"datascope"
:[{
"id"
:
"all"
,
"name"
:
"全部数据"
},
{
"id"
:
"createman"
,
"name"
:
"创建人"
}]
}
,
{
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录