Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
iBiz企业中心
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
iBiz企业套件
iBiz企业中心
提交
82172f35
提交
82172f35
编写于
7月 10, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
chitanda 发布系统代码
上级
abd6f505
变更
20
展开全部
显示空白字符变更
内嵌
并排
正在显示
20 个修改的文件
包含
1140 行增加
和
965 行删除
+1140
-965
data-dictionary.json
app_CRM/public/assets/json/data-dictionary.json
+47
-0
view-config.json
app_CRM/public/assets/json/view-config.json
+10
-0
codelist_en_US.ts
app_CRM/src/locale/lanres/codelist/codelist_en_US.ts
+7
-0
codelist_zh_CN.ts
app_CRM/src/locale/lanres/codelist/codelist_zh_CN.ts
+7
-0
invoice_en_US.ts
app_CRM/src/locale/lanres/entities/invoice/invoice_en_US.ts
+24
-0
invoice_zh_CN.ts
app_CRM/src/locale/lanres/entities/invoice/invoice_zh_CN.ts
+24
-0
codelist.ts
app_CRM/src/mock/codelist/codelist.ts
+47
-0
viewconfig.ts
app_CRM/src/mock/viewconfig/viewconfig.ts
+8
-0
account-service-base.ts
app_CRM/src/service/account/account-service-base.ts
+50
-50
campaign-service-base.ts
app_CRM/src/service/campaign/campaign-service-base.ts
+50
-50
contact-service-base.ts
app_CRM/src/service/contact/contact-service-base.ts
+152
-152
ibiz-list-service-base.ts
app_CRM/src/service/ibiz-list/ibiz-list-service-base.ts
+50
-50
opportunity-service-base.ts
app_CRM/src/service/opportunity/opportunity-service-base.ts
+223
-223
product-service-base.ts
app_CRM/src/service/product/product-service-base.ts
+50
-50
sales-literature-service-base.ts
...service/sales-literature/sales-literature-service-base.ts
+47
-47
sales-order-service-base.ts
app_CRM/src/service/sales-order/sales-order-service-base.ts
+308
-308
invoice-ui-service-base.ts
app_CRM/src/uiservice/invoice/invoice-ui-service-base.ts
+1
-0
info-all-form-base.tsx
.../src/widgets/account/info-all-form/info-all-form-base.tsx
+1
-1
date-panel-form.html
.../src/widgets/contact/date-panel-form/date-panel-form.html
+1
-1
h2_table.xml
...esscentral-core/src/main/resources/liquibase/h2_table.xml
+33
-33
未找到文件。
app_CRM/public/assets/json/data-dictionary.json
浏览文件 @
82172f35
...
@@ -6387,6 +6387,53 @@
...
@@ -6387,6 +6387,53 @@
}
}
]
]
},
},
{
"srfkey"
:
"Invoice__StateCode"
,
"emptytext"
:
"未定义"
,
"codelisttype"
:
"static"
,
"items"
:
[
{
"id"
:
"3"
,
"label"
:
"已取消"
,
"text"
:
"已取消"
,
"data"
:
""
,
"codename"
:
"Item_3"
,
"value"
:
"3"
,
"disabled"
:
false
}
,
{
"id"
:
"2"
,
"label"
:
"已支付"
,
"text"
:
"已支付"
,
"data"
:
""
,
"codename"
:
"Item_2"
,
"value"
:
"2"
,
"disabled"
:
false
}
,
{
"id"
:
"1"
,
"label"
:
"已结束(已弃用)"
,
"text"
:
"已结束(已弃用)"
,
"data"
:
""
,
"codename"
:
"Item_1"
,
"value"
:
"1"
,
"disabled"
:
false
}
,
{
"id"
:
"0"
,
"label"
:
"有效"
,
"text"
:
"有效"
,
"data"
:
""
,
"codename"
:
"Item_0"
,
"value"
:
"0"
,
"disabled"
:
false
}
]
},
{
{
"srfkey"
:
"Invoice__PaymentTermsCode"
,
"srfkey"
:
"Invoice__PaymentTermsCode"
,
"emptytext"
:
"未定义"
,
"emptytext"
:
"未定义"
,
...
...
app_CRM/public/assets/json/view-config.json
浏览文件 @
82172f35
...
@@ -809,6 +809,16 @@
...
@@ -809,6 +809,16 @@
"viewtag"
:
"3d538df4ca389d372347f7b53d67269f"
,
"viewtag"
:
"3d538df4ca389d372347f7b53d67269f"
,
"memo"
:
"系统自动添加"
"memo"
:
"系统自动添加"
},
},
"invoiceedit_datapanelview"
:
{
"title"
:
"头部信息编辑"
,
"caption"
:
"发票"
,
"viewtype"
:
"DEEDITVIEW"
,
"viewmodule"
:
"Finance"
,
"viewname"
:
"InvoiceEdit_DataPanelView"
,
"viewfilename"
:
"invoice-edit-data-panel-view"
,
"viewtag"
:
"3dce5b12278b797f02c77e6dad5f6b17"
,
"memo"
:
""
},
"competitorpickupgridview"
:
{
"competitorpickupgridview"
:
{
"title"
:
"竞争对手选择表格视图"
,
"title"
:
"竞争对手选择表格视图"
,
"caption"
:
"竞争对手"
,
"caption"
:
"竞争对手"
,
...
...
app_CRM/src/locale/lanres/codelist/codelist_en_US.ts
浏览文件 @
82172f35
...
@@ -819,6 +819,13 @@ export default {
...
@@ -819,6 +819,13 @@ export default {
"LINK"
:
"链接"
,
"LINK"
:
"链接"
,
"empty"
:
""
"empty"
:
""
},
},
Invoice__StateCode
:
{
"3"
:
"已取消"
,
"2"
:
"已支付"
,
"1"
:
"已结束(已弃用)"
,
"0"
:
"有效"
,
"empty"
:
""
},
Invoice__PaymentTermsCode
:
{
Invoice__PaymentTermsCode
:
{
"2"
:
"2/10 N30"
,
"2"
:
"2/10 N30"
,
"1"
:
"N30"
,
"1"
:
"N30"
,
...
...
app_CRM/src/locale/lanres/codelist/codelist_zh_CN.ts
浏览文件 @
82172f35
...
@@ -819,6 +819,13 @@ export default {
...
@@ -819,6 +819,13 @@ export default {
"LINK"
:
"链接"
,
"LINK"
:
"链接"
,
"empty"
:
""
,
"empty"
:
""
,
},
},
Invoice__StateCode
:
{
"3"
:
"已取消"
,
"2"
:
"已支付"
,
"1"
:
"已结束(已弃用)"
,
"0"
:
"有效"
,
"empty"
:
""
,
},
Invoice__PaymentTermsCode
:
{
Invoice__PaymentTermsCode
:
{
"2"
:
"2/10 N30"
,
"2"
:
"2/10 N30"
,
"1"
:
"N30"
,
"1"
:
"N30"
,
...
...
app_CRM/src/locale/lanres/entities/invoice/invoice_en_US.ts
浏览文件 @
82172f35
...
@@ -111,6 +111,10 @@ export default {
...
@@ -111,6 +111,10 @@ export default {
caption
:
"发票"
,
caption
:
"发票"
,
title
:
"发票信息"
,
title
:
"发票信息"
,
},
},
edit_datapanelview
:
{
caption
:
"发票"
,
title
:
"头部信息编辑"
,
},
paidgridview
:
{
paidgridview
:
{
caption
:
"发票"
,
caption
:
"发票"
,
title
:
"发票信息"
,
title
:
"发票信息"
,
...
@@ -226,6 +230,26 @@ export default {
...
@@ -226,6 +230,26 @@ export default {
uiactions
:
{
uiactions
:
{
},
},
},
},
edit_datapanel_form
:
{
details
:
{
group1
:
"发票基本信息"
,
formpage1
:
"基本信息"
,
srfupdatedate
:
"更新时间"
,
srforikey
:
""
,
srfkey
:
"发票"
,
srfmajortext
:
"发票名称"
,
srftempmode
:
""
,
srfuf
:
""
,
srfdeid
:
""
,
srfsourcekey
:
""
,
totalamount
:
"总金额"
,
statecode
:
"状态"
,
ownername
:
"负责人"
,
invoiceid
:
"发票"
,
},
uiactions
:
{
},
},
main_grid
:
{
main_grid
:
{
columns
:
{
columns
:
{
invoicename
:
"发票名称"
,
invoicename
:
"发票名称"
,
...
...
app_CRM/src/locale/lanres/entities/invoice/invoice_zh_CN.ts
浏览文件 @
82172f35
...
@@ -110,6 +110,10 @@ export default {
...
@@ -110,6 +110,10 @@ export default {
caption
:
"发票"
,
caption
:
"发票"
,
title
:
"发票信息"
,
title
:
"发票信息"
,
},
},
edit_datapanelview
:
{
caption
:
"发票"
,
title
:
"头部信息编辑"
,
},
paidgridview
:
{
paidgridview
:
{
caption
:
"发票"
,
caption
:
"发票"
,
title
:
"发票信息"
,
title
:
"发票信息"
,
...
@@ -225,6 +229,26 @@ export default {
...
@@ -225,6 +229,26 @@ export default {
uiactions
:
{
uiactions
:
{
},
},
},
},
edit_datapanel_form
:
{
details
:
{
group1
:
"发票基本信息"
,
formpage1
:
"基本信息"
,
srfupdatedate
:
"更新时间"
,
srforikey
:
""
,
srfkey
:
"发票"
,
srfmajortext
:
"发票名称"
,
srftempmode
:
""
,
srfuf
:
""
,
srfdeid
:
""
,
srfsourcekey
:
""
,
totalamount
:
"总金额"
,
statecode
:
"状态"
,
ownername
:
"负责人"
,
invoiceid
:
"发票"
,
},
uiactions
:
{
},
},
main_grid
:
{
main_grid
:
{
columns
:
{
columns
:
{
invoicename
:
"发票名称"
,
invoicename
:
"发票名称"
,
...
...
app_CRM/src/mock/codelist/codelist.ts
浏览文件 @
82172f35
...
@@ -6395,6 +6395,53 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
...
@@ -6395,6 +6395,53 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
},
},
]
]
},
},
{
srfkey
:
"Invoice__StateCode"
,
emptytext
:
"未定义"
,
"codelisttype"
:
"static"
,
items
:
[
{
id
:
"3"
,
label
:
"已取消"
,
text
:
"已取消"
,
"data"
:
""
,
"codename"
:
"Item_3"
,
value
:
"3"
,
disabled
:
false
,
},
{
id
:
"2"
,
label
:
"已支付"
,
text
:
"已支付"
,
"data"
:
""
,
"codename"
:
"Item_2"
,
value
:
"2"
,
disabled
:
false
,
},
{
id
:
"1"
,
label
:
"已结束(已弃用)"
,
text
:
"已结束(已弃用)"
,
"data"
:
""
,
"codename"
:
"Item_1"
,
value
:
"1"
,
disabled
:
false
,
},
{
id
:
"0"
,
label
:
"有效"
,
text
:
"有效"
,
"data"
:
""
,
"codename"
:
"Item_0"
,
value
:
"0"
,
disabled
:
false
,
},
]
},
{
{
srfkey
:
"Invoice__PaymentTermsCode"
,
srfkey
:
"Invoice__PaymentTermsCode"
,
emptytext
:
"未定义"
,
emptytext
:
"未定义"
,
...
...
app_CRM/src/mock/viewconfig/viewconfig.ts
浏览文件 @
82172f35
...
@@ -655,6 +655,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
...
@@ -655,6 +655,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname"
:
"LetterEditView"
,
"viewname"
:
"LetterEditView"
,
"viewtag"
:
"3d538df4ca389d372347f7b53d67269f"
"viewtag"
:
"3d538df4ca389d372347f7b53d67269f"
},
},
"invoiceedit_datapanelview"
:
{
"title"
:
"头部信息编辑"
,
"caption"
:
"发票"
,
"viewtype"
:
"DEEDITVIEW"
,
"viewmodule"
:
"Finance"
,
"viewname"
:
"InvoiceEdit_DataPanelView"
,
"viewtag"
:
"3dce5b12278b797f02c77e6dad5f6b17"
},
"competitorpickupgridview"
:
{
"competitorpickupgridview"
:
{
"title"
:
"竞争对手选择表格视图"
,
"title"
:
"竞争对手选择表格视图"
,
"caption"
:
"竞争对手"
,
"caption"
:
"竞争对手"
,
...
...
app_CRM/src/service/account/account-service-base.ts
浏览文件 @
82172f35
此差异已折叠。
点击以展开。
app_CRM/src/service/campaign/campaign-service-base.ts
浏览文件 @
82172f35
此差异已折叠。
点击以展开。
app_CRM/src/service/contact/contact-service-base.ts
浏览文件 @
82172f35
此差异已折叠。
点击以展开。
app_CRM/src/service/ibiz-list/ibiz-list-service-base.ts
浏览文件 @
82172f35
此差异已折叠。
点击以展开。
app_CRM/src/service/opportunity/opportunity-service-base.ts
浏览文件 @
82172f35
此差异已折叠。
点击以展开。
app_CRM/src/service/product/product-service-base.ts
浏览文件 @
82172f35
此差异已折叠。
点击以展开。
app_CRM/src/service/sales-literature/sales-literature-service-base.ts
浏览文件 @
82172f35
此差异已折叠。
点击以展开。
app_CRM/src/service/sales-order/sales-order-service-base.ts
浏览文件 @
82172f35
此差异已折叠。
点击以展开。
app_CRM/src/uiservice/invoice/invoice-ui-service-base.ts
浏览文件 @
82172f35
...
@@ -83,6 +83,7 @@ export default class InvoiceUIServiceBase extends UIService {
...
@@ -83,6 +83,7 @@ export default class InvoiceUIServiceBase extends UIService {
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'statetabview'
,
srfappde
:
'invoices'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'statetabview'
,
srfappde
:
'invoices'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'quickcreateview'
,
srfappde
:
'invoices'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'quickcreateview'
,
srfappde
:
'invoices'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'byparentkey'
,
srfappde
:
'invoices'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'byparentkey'
,
srfappde
:
'invoices'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'edit_datapanelview'
,
srfappde
:
'invoices'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'paidgridview'
,
srfappde
:
'invoices'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'paidgridview'
,
srfappde
:
'invoices'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'cancelgridview'
,
srfappde
:
'invoices'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'cancelgridview'
,
srfappde
:
'invoices'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'summaryview'
,
srfappde
:
'invoices'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'summaryview'
,
srfappde
:
'invoices'
});
...
...
app_CRM/src/widgets/account/info-all-form/info-all-form-base.tsx
浏览文件 @
82172f35
...
@@ -211,7 +211,7 @@ export class Info_AllEditFormBase extends EditFormControlBase {
...
@@ -211,7 +211,7 @@ export class Info_AllEditFormBase extends EditFormControlBase {
* @memberof Info_AllEditFormBase
* @memberof Info_AllEditFormBase
*/
*/
public
detailsModel
:
any
=
{
public
detailsModel
:
any
=
{
group1
:
new
FormGroupPanelModel
({
caption
:
'账户信息'
,
detailType
:
'GROUPPANEL'
,
name
:
'group1'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
showMoreMode
:
2
,
anchorPoints
:
[
'
sic
'
,
'tickersymbol'
,
'ownershipcode'
,
],
controlledItems
:
[
group1
:
new
FormGroupPanelModel
({
caption
:
'账户信息'
,
detailType
:
'GROUPPANEL'
,
name
:
'group1'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
showMoreMode
:
2
,
anchorPoints
:
[
'
telephone1'
,
'sic'
,
'fax'
,
'websiteurl
'
,
'tickersymbol'
,
'ownershipcode'
,
],
controlledItems
:
[
'sic'
,
'sic'
,
'fax'
,
'fax'
,
'websiteurl'
,
'websiteurl'
,
...
...
app_CRM/src/widgets/contact/date-panel-form/date-panel-form.html
浏览文件 @
82172f35
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
<div
v-show=
"detailsModel.button1.visible"
:style=
"{}"
>
<div
v-show=
"detailsModel.button1.visible"
:style=
"{}"
>
<i-button
type=
"primary"
@
click=
"button1_click($event)"
<i-button
type=
"primary"
@
click=
"button1_click($event)"
style=
""
>
style=
""
>
<i
class=
"fa fa-angle-down"
style=
"margin-right: 2px;"
></i>
</i-button>
</i-button>
...
...
businesscentral-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
82172f35
此差异已折叠。
点击以展开。
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录