Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
iBiz企业中心
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
iBiz企业套件
iBiz企业中心
提交
138bc672
提交
138bc672
编写于
7月 09, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
xignzi006 发布系统代码
上级
1c00c80e
变更
17
展开全部
隐藏空白字符变更
内嵌
并排
正在显示
17 个修改的文件
包含
314 行增加
和
41 行删除
+314
-41
view-config.json
app_CRM/public/assets/json/view-config.json
+10
-0
incident_en_US.ts
...CRM/src/locale/lanres/entities/incident/incident_en_US.ts
+5
-1
incident_zh_CN.ts
...CRM/src/locale/lanres/entities/incident/incident_zh_CN.ts
+5
-1
viewconfig.ts
app_CRM/src/mock/viewconfig/viewconfig.ts
+8
-0
incident-by-parent-key-base.tsx
...ce/incident-by-parent-key/incident-by-parent-key-base.tsx
+2
-2
incident-quick-create-by-parent-key-base.tsx
...y-parent-key/incident-quick-create-by-parent-key-base.tsx
+161
-0
incident-quick-create-by-parent-key.html
...te-by-parent-key/incident-quick-create-by-parent-key.html
+34
-0
incident-quick-create-by-parent-key.vue
...ate-by-parent-key/incident-quick-create-by-parent-key.vue
+22
-0
page-register.ts
app_CRM/src/pages/ungroup/central/page-register.ts
+1
-0
router.ts
app_CRM/src/pages/ungroup/central/router.ts
+14
-0
state.ts
app_CRM/src/store/modules/view-action/state.ts
+14
-0
incident-ui-service-base.ts
app_CRM/src/uiservice/incident/incident-ui-service-base.ts
+1
-0
main-grid-base.tsx
app_CRM/src/widgets/incident/main-grid/main-grid-base.tsx
+3
-3
main-grid-model.ts
app_CRM/src/widgets/incident/main-grid/main-grid-model.ts
+5
-5
main-grid.html
app_CRM/src/widgets/incident/main-grid/main-grid.html
+4
-4
h2_table.xml
...esscentral-core/src/main/resources/liquibase/h2_table.xml
+21
-21
IncidentMapper.xml
...main/resources/mapper/service/incident/IncidentMapper.xml
+4
-4
未找到文件。
app_CRM/public/assets/json/view-config.json
浏览文件 @
138bc672
...
...
@@ -1219,6 +1219,16 @@
"viewtag"
:
"6ab7d7604dbd53cc5b469aa9176dcb2f"
,
"memo"
:
""
},
"incidentquickcreatebyparentkey"
:
{
"title"
:
"快速新建"
,
"caption"
:
"案例"
,
"viewtype"
:
"DEOPTVIEW"
,
"viewmodule"
:
"Service"
,
"viewname"
:
"IncidentQuickCreateByParentKey"
,
"viewfilename"
:
"incident-quick-create-by-parent-key"
,
"viewtag"
:
"6b1896d002d20fec6591398a98f37e39"
,
"memo"
:
"系统自动添加"
},
"knowledgearticleincidentgridview"
:
{
"title"
:
"知识文章事件表格视图"
,
"caption"
:
"知识文章事件"
,
...
...
app_CRM/src/locale/lanres/entities/incident/incident_en_US.ts
浏览文件 @
138bc672
...
...
@@ -119,6 +119,10 @@ export default {
caption
:
"案例"
,
title
:
"快速新建"
,
},
quickcreatebyparentkey
:
{
caption
:
"案例"
,
title
:
"快速新建"
,
},
pickupgridview
:
{
caption
:
"案例"
,
title
:
"案例选择表格视图"
,
...
...
@@ -261,7 +265,7 @@ export default {
ticketnumber
:
"案例号"
,
prioritycode
:
"优先级"
,
caseorigincode
:
"起源"
,
customer
id
:
"客户"
,
customer
name
:
"客户"
,
statecode
:
"状态"
,
},
uiactions
:
{
...
...
app_CRM/src/locale/lanres/entities/incident/incident_zh_CN.ts
浏览文件 @
138bc672
...
...
@@ -118,6 +118,10 @@ export default {
caption
:
"案例"
,
title
:
"快速新建"
,
},
quickcreatebyparentkey
:
{
caption
:
"案例"
,
title
:
"快速新建"
,
},
pickupgridview
:
{
caption
:
"案例"
,
title
:
"案例选择表格视图"
,
...
...
@@ -260,7 +264,7 @@ export default {
ticketnumber
:
"案例号"
,
prioritycode
:
"优先级"
,
caseorigincode
:
"起源"
,
customer
id
:
"客户"
,
customer
name
:
"客户"
,
statecode
:
"状态"
,
},
uiactions
:
{
...
...
app_CRM/src/mock/viewconfig/viewconfig.ts
浏览文件 @
138bc672
...
...
@@ -983,6 +983,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname"
:
"AccountEdit_DataPanel"
,
"viewtag"
:
"6ab7d7604dbd53cc5b469aa9176dcb2f"
},
"incidentquickcreatebyparentkey"
:
{
"title"
:
"快速新建"
,
"caption"
:
"案例"
,
"viewtype"
:
"DEOPTVIEW"
,
"viewmodule"
:
"Service"
,
"viewname"
:
"IncidentQuickCreateByParentKey"
,
"viewtag"
:
"6b1896d002d20fec6591398a98f37e39"
},
"knowledgearticleincidentgridview"
:
{
"title"
:
"知识文章事件表格视图"
,
"caption"
:
"知识文章事件"
,
...
...
app_CRM/src/pages/service/incident-by-parent-key/incident-by-parent-key-base.tsx
浏览文件 @
138bc672
...
...
@@ -512,10 +512,10 @@ export class IncidentByParentKeyBase extends GridViewBase {
});
}
const
view
:
any
=
{
viewname
:
'incident-quick-create-
view
'
,
viewname
:
'incident-quick-create-
by-parent-key
'
,
height
:
0
,
width
:
0
,
title
:
this
.
$t
(
'entities.incident.views.quickcreate
view
.title'
),
title
:
this
.
$t
(
'entities.incident.views.quickcreate
byparentkey
.title'
),
placement
:
'DRAWER_RIGHT'
,
};
openDrawer
(
view
,
data
);
...
...
app_CRM/src/pages/service/incident-quick-create-by-parent-key/incident-quick-create-by-parent-key-base.tsx
0 → 100644
浏览文件 @
138bc672
import
{
Subject
}
from
'rxjs'
;
import
{
OptionViewBase
}
from
'@/studio-core'
;
import
IncidentService
from
'@/service/incident/incident-service'
;
import
OptionViewEngine
from
'@engine/view/option-view-engine'
;
/**
* 快速新建视图基类
*
* @export
* @class IncidentQuickCreateByParentKeyBase
* @extends {OptionViewBase}
*/
export
class
IncidentQuickCreateByParentKeyBase
extends
OptionViewBase
{
/**
* 视图对应应用实体名称
*
* @protected
* @type {string}
* @memberof IncidentQuickCreateByParentKeyBase
*/
protected
appDeName
:
string
=
'incident'
;
/**
* 应用实体主键
*
* @protected
* @type {string}
* @memberof IncidentQuickCreateByParentKeyBase
*/
protected
appDeKey
:
string
=
'incidentid'
;
/**
* 应用实体主信息
*
* @protected
* @type {string}
* @memberof IncidentQuickCreateByParentKeyBase
*/
protected
appDeMajor
:
string
=
'title'
;
/**
* 实体服务对象
*
* @type {IncidentService}
* @memberof IncidentQuickCreateByParentKeyBase
*/
protected
appEntityService
:
IncidentService
=
new
IncidentService
;
/**
* 计数器服务对象集合
*
* @protected
* @type {Array<*>}
* @memberof IncidentQuickCreateByParentKeyBase
*/
protected
counterServiceArray
:
Array
<
any
>
=
[];
/**
* 视图模型数据
*
* @protected
* @type {*}
* @memberof IncidentQuickCreateByParentKeyBase
*/
protected
model
:
any
=
{
srfCaption
:
'entities.incident.views.quickcreatebyparentkey.caption'
,
srfTitle
:
'entities.incident.views.quickcreatebyparentkey.title'
,
srfSubTitle
:
'entities.incident.views.quickcreatebyparentkey.subtitle'
,
dataInfo
:
''
}
/**
* 容器模型
*
* @protected
* @type {*}
* @memberof IncidentQuickCreateByParentKeyBase
*/
protected
containerModel
:
any
=
{
view_form
:
{
name
:
'form'
,
type
:
'FORM'
},
view_okbtn
:
{
name
:
'okbtn'
,
type
:
'button'
,
text
:
'确定'
,
disabled
:
true
},
view_cancelbtn
:
{
name
:
'cancelbtn'
,
type
:
'button'
,
text
:
'取消'
,
disabled
:
false
},
view_leftbtn
:
{
name
:
'leftbtn'
,
type
:
'button'
,
text
:
'左移'
,
disabled
:
true
},
view_rightbtn
:
{
name
:
'rightbtn'
,
type
:
'button'
,
text
:
'右移'
,
disabled
:
true
},
view_allleftbtn
:
{
name
:
'allleftbtn'
,
type
:
'button'
,
text
:
'全部左移'
,
disabled
:
true
},
view_allrightbtn
:
{
name
:
'allrightbtn'
,
type
:
'button'
,
text
:
'全部右移'
,
disabled
:
true
},
};
/**
* 视图唯一标识
*
* @protected
* @type {string}
* @memberof ViewBase
*/
protected
viewtag
:
string
=
'6b1896d002d20fec6591398a98f37e39'
;
/**
* 视图引擎
*
* @public
* @type {Engine}
* @memberof IncidentQuickCreateByParentKeyBase
*/
public
engine
:
OptionViewEngine
=
new
OptionViewEngine
();
/**
* 引擎初始化
*
* @public
* @memberof IncidentQuickCreateByParentKeyBase
*/
public
engineInit
():
void
{
this
.
engine
.
init
({
view
:
this
,
form
:
this
.
$refs
.
form
,
p2k
:
'0'
,
keyPSDEField
:
'incident'
,
majorPSDEField
:
'title'
,
isLoadDefault
:
true
,
});
}
/**
* form 部件 save 事件
*
* @param {*} [args={}]
* @param {*} $event
* @memberof IncidentQuickCreateByParentKeyBase
*/
public
form_save
(
$event
:
any
,
$event2
?:
any
):
void
{
this
.
engine
.
onCtrlEvent
(
'form'
,
'save'
,
$event
);
}
/**
* form 部件 remove 事件
*
* @param {*} [args={}]
* @param {*} $event
* @memberof IncidentQuickCreateByParentKeyBase
*/
public
form_remove
(
$event
:
any
,
$event2
?:
any
):
void
{
this
.
engine
.
onCtrlEvent
(
'form'
,
'remove'
,
$event
);
}
/**
* form 部件 load 事件
*
* @param {*} [args={}]
* @param {*} $event
* @memberof IncidentQuickCreateByParentKeyBase
*/
public
form_load
(
$event
:
any
,
$event2
?:
any
):
void
{
this
.
engine
.
onCtrlEvent
(
'form'
,
'load'
,
$event
);
}
}
\ No newline at end of file
app_CRM/src/pages/service/incident-quick-create-by-parent-key/incident-quick-create-by-parent-key.html
0 → 100644
浏览文件 @
138bc672
<studio-view-style2
viewName=
"incidentquickcreatebyparentkey"
viewTitle=
"快速新建"
class=
'deoptview incident-quick-create-by-parent-key'
>
<template
slot=
'title'
>
<span
class=
'caption-info'
>
{{$t(model.srfTitle)}}
</span>
</template>
<view
_form
:viewState=
"viewState"
:viewparams=
"viewparams"
:context=
"context"
:autosave=
"false"
:viewtag=
"viewtag"
:showBusyIndicator=
"true"
updateAction=
"Update"
removeAction=
"Remove"
loaddraftAction=
"GetDraft"
loadAction=
"Get"
createAction=
"Create"
WFSubmitAction=
""
WFStartAction=
""
style=
''
name=
"form"
ref=
'form'
@
save=
"form_save($event)"
@
remove=
"form_remove($event)"
@
load=
"form_load($event)"
@
closeview=
"closeView($event)"
>
</view
_form
>
<template
slot=
"footer"
>
<div
class=
"option-view-footer-actions"
>
<i-button
type=
'primary'
@
click=
"onClickOk.apply(_self, arguments)"
>
{{ containerModel.view_okbtn.text }}
</i-button>
<i-button
@
click=
"onClickCancel.apply(_self, arguments)"
>
{{ containerModel.view_cancelbtn.text }}
</i-button>
</div>
</template>
</studio-view-style2>
\ No newline at end of file
app_CRM/src/pages/service/incident-quick-create-by-parent-key/incident-quick-create-by-parent-key.vue
0 → 100644
浏览文件 @
138bc672
<
template
src=
"./incident-quick-create-by-parent-key.html"
/>
<script
lang=
'tsx'
>
import
{ Component } from 'vue-property-decorator';
import { VueLifeCycleProcessing } from '@/studio-core';
import { IncidentQuickCreateByParentKeyBase } from './incident-quick-create-by-parent-key-base';
import view_form from '@widgets/incident/quick-create-form/quick-create-form.vue';
/**
* 快速新建视图
*
* @export
* @class IncidentQuickCreateByParentKey
* @extends {IncidentQuickCreateByParentKeyBase}
*/
@Component({
components: {
view_form,
}
})
@VueLifeCycleProcessing()
export default class IncidentQuickCreateByParentKey extends IncidentQuickCreateByParentKeyBase { }
</script>
app_CRM/src/pages/ungroup/central/page-register.ts
浏览文件 @
138bc672
...
...
@@ -160,6 +160,7 @@ export const PageComponents = {
Vue
.
component
(
'sales-literature-item-edit-view'
,
()
=>
import
(
'@pages/sales/sales-literature-item-edit-view/sales-literature-item-edit-view.vue'
));
Vue
.
component
(
'competitor-grid-view'
,
()
=>
import
(
'@pages/sales/competitor-grid-view/competitor-grid-view.vue'
));
Vue
.
component
(
'incident-pickup-grid-view'
,
()
=>
import
(
'@pages/service/incident-pickup-grid-view/incident-pickup-grid-view.vue'
));
Vue
.
component
(
'incident-quick-create-by-parent-key'
,
()
=>
import
(
'@pages/service/incident-quick-create-by-parent-key/incident-quick-create-by-parent-key.vue'
));
Vue
.
component
(
'ibiz-list-quick-create'
,
()
=>
import
(
'@pages/marketing/ibiz-list-quick-create/ibiz-list-quick-create.vue'
));
Vue
.
component
(
'opportunity-product-opp-opp-pro-grid-view'
,
()
=>
import
(
'@pages/sales/opportunity-product-opp-opp-pro-grid-view/opportunity-product-opp-opp-pro-grid-view.vue'
));
Vue
.
component
(
'contact-tab-exp-view'
,
()
=>
import
(
'@pages/base/contact-tab-exp-view/contact-tab-exp-view.vue'
));
...
...
app_CRM/src/pages/ungroup/central/router.ts
浏览文件 @
138bc672
...
...
@@ -7132,6 +7132,20 @@ const router = new Router({
},
component
:
()
=>
import
(
'@pages/service/incident-pickup-grid-view/incident-pickup-grid-view.vue'
),
},
{
path
:
'incidents/:incident?/quickcreatebyparentkey/:quickcreatebyparentkey?'
,
meta
:
{
caption
:
'entities.incident.views.quickcreatebyparentkey.title'
,
info
:
''
,
parameters
:
[
{
pathName
:
'central'
,
parameterName
:
'central'
},
{
pathName
:
'incidents'
,
parameterName
:
'incident'
},
{
pathName
:
'quickcreatebyparentkey'
,
parameterName
:
'quickcreatebyparentkey'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/service/incident-quick-create-by-parent-key/incident-quick-create-by-parent-key.vue'
),
},
{
path
:
'ibizlists/:ibizlist?/quickcreate/:quickcreate?'
,
meta
:
{
...
...
app_CRM/src/store/modules/view-action/state.ts
浏览文件 @
138bc672
...
...
@@ -461,6 +461,7 @@ export const viewstate: any = {
refviews
:
[
'540213698dac06ea2ef3193da7fe9b11'
,
'f440f1d3b950a89e6cb72cadea120b74'
,
'6b1896d002d20fec6591398a98f37e39'
,
],
},
{
...
...
@@ -1109,6 +1110,19 @@ export const viewstate: any = {
refviews
:
[
],
},
{
viewtag
:
'6b1896d002d20fec6591398a98f37e39'
,
viewmodule
:
'Service'
,
viewname
:
'IncidentQuickCreateByParentKey'
,
viewaction
:
''
,
viewdatachange
:
false
,
refviews
:
[
'05d66c9ecb6eeb18a00a23cca19bf042'
,
'e52af970c14fd89546ac8ccaecab460c'
,
'ba34ee36c1d0de288403607e17e7eb3e'
,
'0dff48c04927315f77dd70a9a2767b59'
,
],
},
{
viewtag
:
'6c17740cc21fd25906f3feeec10a454a'
,
viewmodule
:
'Service'
,
...
...
app_CRM/src/uiservice/incident/incident-ui-service-base.ts
浏览文件 @
138bc672
...
...
@@ -84,6 +84,7 @@ export default class IncidentUIServiceBase extends UIService {
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'byparentkey'
,
srfappde
:
'incidents'
});
this
.
allViewMap
.
set
(
'MDATAVIEW:'
,{
viewname
:
'gridview'
,
srfappde
:
'incidents'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'quickcreateview'
,
srfappde
:
'incidents'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'quickcreatebyparentkey'
,
srfappde
:
'incidents'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'pickupgridview'
,
srfappde
:
'incidents'
});
this
.
allViewMap
.
set
(
'PICKUPVIEW:'
,{
viewname
:
'pickupview'
,
srfappde
:
'incidents'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'childincidentgridview'
,
srfappde
:
'incidents'
});
...
...
app_CRM/src/widgets/incident/main-grid/main-grid-base.tsx
浏览文件 @
138bc672
...
...
@@ -94,9 +94,9 @@ export class MainGridBase extends GridControllerBase {
util
:
'PX'
},
{
name
:
'customer
id
'
,
name
:
'customer
name
'
,
label
:
'客户'
,
langtag
:
'entities.incident.main_grid.columns.customer
id
'
,
langtag
:
'entities.incident.main_grid.columns.customer
name
'
,
show
:
true
,
util
:
'PX'
},
...
...
@@ -145,7 +145,7 @@ export class MainGridBase extends GridControllerBase {
'ticketnumber'
:
false
,
'prioritycode'
:
false
,
'caseorigincode'
:
false
,
'customer
id
'
:
false
,
'customer
name
'
:
false
,
'statecode'
:
false
,
};
...
...
app_CRM/src/widgets/incident/main-grid/main-grid-model.ts
浏览文件 @
138bc672
...
...
@@ -106,11 +106,6 @@ export default class MainModel {
prop
:
'title'
,
dataType
:
'TEXT'
,
},
{
name
:
'customerid'
,
prop
:
'customerid'
,
dataType
:
'TEXT'
,
},
{
name
:
'productid'
,
prop
:
'productid'
,
...
...
@@ -141,6 +136,11 @@ export default class MainModel {
prop
:
'entitlementid'
,
dataType
:
'PICKUP'
,
},
{
name
:
'customername'
,
prop
:
'customername'
,
dataType
:
'TEXT'
,
},
{
name
:
'incident'
,
prop
:
'incidentid'
,
...
...
app_CRM/src/widgets/incident/main-grid/main-grid.html
浏览文件 @
138bc672
...
...
@@ -75,15 +75,15 @@
</template>
</el-table-column>
</template>
<template
v-if=
"getColumnState('customer
id
')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'customer
id'"
:label=
"$t('entities.incident.main_grid.columns.customerid')"
:width=
"16
0"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-if=
"getColumnState('customer
name
')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'customer
name'"
:label=
"$t('entities.incident.main_grid.columns.customername')"
:width=
"10
0"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"{column}"
>
<span
class=
"column-header "
>
{{$t('entities.incident.main_grid.columns.customer
id
')}}
{{$t('entities.incident.main_grid.columns.customer
name
')}}
</span>
</template>
<template
v-slot=
"{row,column,$index}"
>
<span>
{{row.customer
id
}}
</span>
<span>
{{row.customer
name
}}
</span>
</template>
</el-table-column>
</template>
...
...
businesscentral-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
138bc672
此差异已折叠。
点击以展开。
businesscentral-core/src/main/resources/mapper/service/incident/IncidentMapper.xml
浏览文件 @
138bc672
此差异已折叠。
点击以展开。
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录