Skip to content

I
iBiz人力资源
提交 4285b736 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

jackwang 部署微服务应用

上级 f83a312e
隐藏空白字符变更
内嵌 并排
正在显示 包含 945 行增加 和 300 行删除
app_PIM/public/assets/json/data-dictionary.json
浏览文件 @ 4285b736
...@@ -7,6 +7,35 @@ ...@@ -7,6 +7,35 @@
"appdedataset":"", "appdedataset":"",
"items": [] "items": []
}, },
{
"srfkey": "YesNo",
"emptytext": "未定义",
"codelisttype":"static",
"items": [
{
"id": "1",
"label": "是",
"text": "是",
"data":"",
"codename":"Item_1",
"value": "1",
"disabled": false,
"default": false
}
, {
"id": "0",
"label": "否",
"text": "否",
"data":"",
"codename":"Item_0",
"value": "0",
"disabled": false,
"default": false
}
]
},
{ {
"srfkey": "CL_HR_0001", "srfkey": "CL_HR_0001",
"emptytext": "未定义", "emptytext": "未定义",
...@@ -58,6 +87,240 @@ ...@@ -58,6 +87,240 @@
} }
] ]
}, },
{
"srfkey": "CL_HR_0002",
"emptytext": "未定义",
"codelisttype":"static",
"items": [
{
"id": "BUSINESS",
"label": "业务",
"text": "业务",
"data":"",
"codename":"Business",
"value": "BUSINESS",
"disabled": false,
"default": false
}
, {
"id": "HOME",
"label": "家庭住址",
"text": "家庭住址",
"data":"",
"codename":"Home",
"value": "HOME",
"disabled": false,
"default": false
}
, {
"id": "REALLOCATION",
"label": "实际位置",
"text": "实际位置",
"data":"",
"codename":"Reallocation",
"value": "REALLOCATION",
"disabled": false,
"default": false
}
, {
"id": "RECRUIT",
"label": "招聘",
"text": "招聘",
"data":"",
"codename":"Recruit",
"value": "RECRUIT",
"disabled": false,
"default": false
}
, {
"id": "SERVICE",
"label": "服务",
"text": "服务",
"data":"",
"codename":"Service",
"value": "SERVICE",
"disabled": false,
"default": false
}
, {
"id": "HEADCOMPANY",
"label": "总公司",
"text": "总公司",
"data":"",
"codename":"Headcompany",
"value": "HEADCOMPANY",
"disabled": false,
"default": false
}
, {
"id": "INVOICE",
"label": "发票",
"text": "发票",
"data":"",
"codename":"Invoice",
"value": "INVOICE",
"disabled": false,
"default": false
}
, {
"id": "PAYMENT",
"label": "付款",
"text": "付款",
"data":"",
"codename":"Payment",
"value": "PAYMENT",
"disabled": false,
"default": false
}
, {
"id": "REMIT",
"label": "汇款至",
"text": "汇款至",
"data":"",
"codename":"Remit",
"value": "REMIT",
"disabled": false,
"default": false
}
, {
"id": "STATEMENT",
"label": "对帐单",
"text": "对帐单",
"data":"",
"codename":"Statement",
"value": "STATEMENT",
"disabled": false,
"default": false
}
, {
"id": "CONSIGNMENT",
"label": "托运",
"text": "托运",
"data":"",
"codename":"Consignment",
"value": "CONSIGNMENT",
"disabled": false,
"default": false
}
, {
"id": "DELIVERY",
"label": "交货",
"text": "交货",
"data":"",
"codename":"Delivery",
"value": "DELIVERY",
"disabled": false,
"default": false
}
, {
"id": "LADING",
"label": "装货",
"text": "装货",
"data":"",
"codename":"Lading",
"value": "LADING",
"disabled": false,
"default": false
}
, {
"id": "UNLADING",
"label": "卸货",
"text": "卸货",
"data":"",
"codename":"Unlading",
"value": "UNLADING",
"disabled": false,
"default": false
}
, {
"id": "OTHER",
"label": "其他",
"text": "其他",
"data":"",
"codename":"Other",
"value": "OTHER",
"disabled": false,
"default": false
}
]
},
{
"srfkey": "CL_HR_0003",
"emptytext": "未定义",
"codelisttype":"static",
"items": [
{
"id": "TEL",
"label": "电话",
"text": "电话",
"data":"",
"codename":"Tel",
"value": "TEL",
"disabled": false,
"default": false
}
, {
"id": "EMAIL",
"label": "电子邮件地址",
"text": "电子邮件地址",
"data":"",
"codename":"Email",
"value": "EMAIL",
"disabled": false,
"default": false
}
, {
"id": "WECHAT",
"label": "微信",
"text": "微信",
"data":"",
"codename":"Wechat",
"value": "WECHAT",
"disabled": false,
"default": false
}
, {
"id": "QQ",
"label": "QQ",
"text": "QQ",
"data":"",
"codename":"Qq",
"value": "QQ",
"disabled": false,
"default": false
}
, {
"id": "FAX",
"label": "传真",
"text": "传真",
"data":"",
"codename":"Fax",
"value": "FAX",
"disabled": false,
"default": false
}
]
},
{ {
"srfkey": "OrganizationType", "srfkey": "OrganizationType",
"emptytext": "未定义", "emptytext": "未定义",
......
app_PIM/src/locale/lanres/codelist/codelist_en_US.ts
浏览文件 @ 4285b736
...@@ -2,6 +2,11 @@ export default { ...@@ -2,6 +2,11 @@ export default {
SysOperator: { SysOperator: {
"empty": "", "empty": "",
}, },
YesNo: {
"1": "是",
"0": "否",
"empty": ""
},
CL_HR_0001: { CL_HR_0001: {
"COSTCENTER": "成本中心", "COSTCENTER": "成本中心",
"BUSINESSUNIT": "业务单位", "BUSINESSUNIT": "业务单位",
...@@ -9,6 +14,32 @@ export default { ...@@ -9,6 +14,32 @@ export default {
"COMMERCIAL": "商业渠道", "COMMERCIAL": "商业渠道",
"empty": "" "empty": ""
}, },
CL_HR_0002: {
"BUSINESS": "业务",
"HOME": "家庭住址",
"REALLOCATION": "实际位置",
"RECRUIT": "招聘",
"SERVICE": "服务",
"HEADCOMPANY": "总公司",
"INVOICE": "发票",
"PAYMENT": "付款",
"REMIT": "汇款至",
"STATEMENT": "对帐单",
"CONSIGNMENT": "托运",
"DELIVERY": "交货",
"LADING": "装货",
"UNLADING": "卸货",
"OTHER": "其他",
"empty": ""
},
CL_HR_0003: {
"TEL": "电话",
"EMAIL": "电子邮件地址",
"WECHAT": "微信",
"QQ": "QQ",
"FAX": "传真",
"empty": ""
},
OrganizationType: { OrganizationType: {
"LEGAL": "法人", "LEGAL": "法人",
"OPERATIONUNIT": "运营单位", "OPERATIONUNIT": "运营单位",
......
app_PIM/src/locale/lanres/codelist/codelist_zh_CN.ts
浏览文件 @ 4285b736
...@@ -2,6 +2,11 @@ export default { ...@@ -2,6 +2,11 @@ export default {
SysOperator: { SysOperator: {
"empty": "", "empty": "",
}, },
YesNo: {
"1": "是",
"0": "否",
"empty": "",
},
CL_HR_0001: { CL_HR_0001: {
"COSTCENTER": "成本中心", "COSTCENTER": "成本中心",
"BUSINESSUNIT": "业务单位", "BUSINESSUNIT": "业务单位",
...@@ -9,6 +14,32 @@ export default { ...@@ -9,6 +14,32 @@ export default {
"COMMERCIAL": "商业渠道", "COMMERCIAL": "商业渠道",
"empty": "", "empty": "",
}, },
CL_HR_0002: {
"BUSINESS": "业务",
"HOME": "家庭住址",
"REALLOCATION": "实际位置",
"RECRUIT": "招聘",
"SERVICE": "服务",
"HEADCOMPANY": "总公司",
"INVOICE": "发票",
"PAYMENT": "付款",
"REMIT": "汇款至",
"STATEMENT": "对帐单",
"CONSIGNMENT": "托运",
"DELIVERY": "交货",
"LADING": "装货",
"UNLADING": "卸货",
"OTHER": "其他",
"empty": "",
},
CL_HR_0003: {
"TEL": "电话",
"EMAIL": "电子邮件地址",
"WECHAT": "微信",
"QQ": "QQ",
"FAX": "传真",
"empty": "",
},
OrganizationType: { OrganizationType: {
"LEGAL": "法人", "LEGAL": "法人",
"OPERATIONUNIT": "运营单位", "OPERATIONUNIT": "运营单位",
......
app_PIM/src/locale/lanres/entities/hrlegal/hrlegal_en_US.ts
浏览文件 @ 4285b736
...@@ -141,20 +141,24 @@ export default { ...@@ -141,20 +141,24 @@ export default {
caption: "Save And Close", caption: "Save And Close",
tip: "Save And Close Window", tip: "Save And Close Window",
}, },
seperator1: {
caption: "",
tip: "",
},
tbitem2: { tbitem2: {
caption: "关闭", caption: "关闭",
tip: "关闭", tip: "关闭",
}, },
}, },
tabexpviewtoolbar_toolbar: { tabexpviewtoolbar_toolbar: {
tbitem1_ff_003_sep: {
caption: "",
tip: "",
},
tbitem1_ff_003: { tbitem1_ff_003: {
caption: "编辑", caption: "编辑",
tip: "编辑", tip: "编辑",
}, },
tbitem1_remove_sep: {
caption: "",
tip: "",
},
tbitem1_remove: { tbitem1_remove: {
caption: "删除并关闭", caption: "删除并关闭",
tip: "删除并关闭", tip: "删除并关闭",
......
app_PIM/src/locale/lanres/entities/hrlegal/hrlegal_zh_CN.ts
浏览文件 @ 4285b736
...@@ -140,20 +140,24 @@ export default { ...@@ -140,20 +140,24 @@ export default {
caption: "保存并关闭", caption: "保存并关闭",
tip: "保存并关闭", tip: "保存并关闭",
}, },
seperator1: {
caption: "",
tip: "",
},
tbitem2: { tbitem2: {
caption: "关闭", caption: "关闭",
tip: "关闭", tip: "关闭",
}, },
}, },
tabexpviewtoolbar_toolbar: { tabexpviewtoolbar_toolbar: {
tbitem1_ff_003_sep: {
caption: "",
tip: "",
},
tbitem1_ff_003: { tbitem1_ff_003: {
caption: "编辑", caption: "编辑",
tip: "编辑", tip: "编辑",
}, },
tbitem1_remove_sep: {
caption: "",
tip: "",
},
tbitem1_remove: { tbitem1_remove: {
caption: "删除并关闭", caption: "删除并关闭",
tip: "删除并关闭", tip: "删除并关闭",
......
app_PIM/src/locale/lanres/entities/hrorg-address/hrorg-address_en_US.ts
浏览文件 @ 4285b736
...@@ -26,8 +26,6 @@ export default { ...@@ -26,8 +26,6 @@ export default {
details: { details: {
group1: "组织地址基本信息", group1: "组织地址基本信息",
formpage1: "基本信息", formpage1: "基本信息",
group2: "操作信息",
formpage2: "其它",
srfupdatedate: "更新时间", srfupdatedate: "更新时间",
srforikey: "", srforikey: "",
srfkey: "组织地址标识", srfkey: "组织地址标识",
...@@ -37,10 +35,10 @@ export default { ...@@ -37,10 +35,10 @@ export default {
srfdeid: "", srfdeid: "",
srfsourcekey: "", srfsourcekey: "",
hrorgaddressname: "名称或描述", hrorgaddressname: "名称或描述",
createman: "建立人", address: "地址",
createdate: "建立时间", postcode: "邮政编码",
updateman: "更新人", uses: "用途",
updatedate: "更新时间", mainaddress: "主要",
hrorgaddressid: "组织地址标识", hrorgaddressid: "组织地址标识",
}, },
uiactions: { uiactions: {
...@@ -49,8 +47,9 @@ export default { ...@@ -49,8 +47,9 @@ export default {
main_grid: { main_grid: {
columns: { columns: {
hrorgaddressname: "名称或描述", hrorgaddressname: "名称或描述",
updateman: "更新人", address: "地址",
updatedate: "更新时间", uses: "用途",
mainaddress: "主要",
}, },
uiactions: { uiactions: {
}, },
......
app_PIM/src/locale/lanres/entities/hrorg-address/hrorg-address_zh_CN.ts
浏览文件 @ 4285b736
...@@ -25,8 +25,6 @@ export default { ...@@ -25,8 +25,6 @@ export default {
details: { details: {
group1: "组织地址基本信息", group1: "组织地址基本信息",
formpage1: "基本信息", formpage1: "基本信息",
group2: "操作信息",
formpage2: "其它",
srfupdatedate: "更新时间", srfupdatedate: "更新时间",
srforikey: "", srforikey: "",
srfkey: "组织地址标识", srfkey: "组织地址标识",
...@@ -36,10 +34,10 @@ export default { ...@@ -36,10 +34,10 @@ export default {
srfdeid: "", srfdeid: "",
srfsourcekey: "", srfsourcekey: "",
hrorgaddressname: "名称或描述", hrorgaddressname: "名称或描述",
createman: "建立人", address: "地址",
createdate: "建立时间", postcode: "邮政编码",
updateman: "更新人", uses: "用途",
updatedate: "更新时间", mainaddress: "主要",
hrorgaddressid: "组织地址标识", hrorgaddressid: "组织地址标识",
}, },
uiactions: { uiactions: {
...@@ -48,8 +46,9 @@ export default { ...@@ -48,8 +46,9 @@ export default {
main_grid: { main_grid: {
columns: { columns: {
hrorgaddressname: "名称或描述", hrorgaddressname: "名称或描述",
updateman: "更新人", address: "地址",
updatedate: "更新时间", uses: "用途",
mainaddress: "主要",
}, },
uiactions: { uiactions: {
}, },
......
app_PIM/src/locale/lanres/entities/hrorg-contact/hrorg-contact_en_US.ts
浏览文件 @ 4285b736
...@@ -25,8 +25,6 @@ export default { ...@@ -25,8 +25,6 @@ export default {
details: { details: {
group1: "组织联系信息基本信息", group1: "组织联系信息基本信息",
formpage1: "基本信息", formpage1: "基本信息",
group2: "操作信息",
formpage2: "其它",
srfupdatedate: "更新时间", srfupdatedate: "更新时间",
srforikey: "", srforikey: "",
srfkey: "组织联系信息标识", srfkey: "组织联系信息标识",
...@@ -36,10 +34,9 @@ export default { ...@@ -36,10 +34,9 @@ export default {
srfdeid: "", srfdeid: "",
srfsourcekey: "", srfsourcekey: "",
hrorgcontactname: "联系人", hrorgcontactname: "联系人",
createman: "建立人", contacttype: "类型",
createdate: "建立时间", contactinfo: "联系信息",
updateman: "更新人", maincontact: "主要",
updatedate: "更新时间",
hrorgcontactid: "组织联系信息标识", hrorgcontactid: "组织联系信息标识",
}, },
uiactions: { uiactions: {
...@@ -48,8 +45,9 @@ export default { ...@@ -48,8 +45,9 @@ export default {
main_grid: { main_grid: {
columns: { columns: {
hrorgcontactname: "联系人", hrorgcontactname: "联系人",
updateman: "更新人", contacttype: "类型",
updatedate: "更新时间", contactinfo: "联系信息",
maincontact: "主要",
}, },
uiactions: { uiactions: {
}, },
......
app_PIM/src/locale/lanres/entities/hrorg-contact/hrorg-contact_zh_CN.ts
浏览文件 @ 4285b736
...@@ -24,8 +24,6 @@ export default { ...@@ -24,8 +24,6 @@ export default {
details: { details: {
group1: "组织联系信息基本信息", group1: "组织联系信息基本信息",
formpage1: "基本信息", formpage1: "基本信息",
group2: "操作信息",
formpage2: "其它",
srfupdatedate: "更新时间", srfupdatedate: "更新时间",
srforikey: "", srforikey: "",
srfkey: "组织联系信息标识", srfkey: "组织联系信息标识",
...@@ -35,10 +33,9 @@ export default { ...@@ -35,10 +33,9 @@ export default {
srfdeid: "", srfdeid: "",
srfsourcekey: "", srfsourcekey: "",
hrorgcontactname: "联系人", hrorgcontactname: "联系人",
createman: "建立人", contacttype: "类型",
createdate: "建立时间", contactinfo: "联系信息",
updateman: "更新人", maincontact: "主要",
updatedate: "更新时间",
hrorgcontactid: "组织联系信息标识", hrorgcontactid: "组织联系信息标识",
}, },
uiactions: { uiactions: {
...@@ -47,8 +44,9 @@ export default { ...@@ -47,8 +44,9 @@ export default {
main_grid: { main_grid: {
columns: { columns: {
hrorgcontactname: "联系人", hrorgcontactname: "联系人",
updateman: "更新人", contacttype: "类型",
updatedate: "更新时间", contactinfo: "联系信息",
maincontact: "主要",
}, },
uiactions: { uiactions: {
}, },
......
app_PIM/src/mock/codelist/codelist.ts
浏览文件 @ 4285b736
...@@ -15,6 +15,33 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => { ...@@ -15,6 +15,33 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
"appdedataset":"", "appdedataset":"",
"items": [] "items": []
}, },
{
srfkey: "YesNo",
emptytext: "未定义",
"codelisttype":"static",
items: [
{
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: "CL_HR_0001", srfkey: "CL_HR_0001",
emptytext: "未定义", emptytext: "未定义",
...@@ -62,6 +89,220 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => { ...@@ -62,6 +89,220 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
}, },
] ]
}, },
{
srfkey: "CL_HR_0002",
emptytext: "未定义",
"codelisttype":"static",
items: [
{
id: "BUSINESS",
label: "业务",
text: "业务",
"data":"",
"codename":"Business",
value: "BUSINESS",
disabled: false,
},
{
id: "HOME",
label: "家庭住址",
text: "家庭住址",
"data":"",
"codename":"Home",
value: "HOME",
disabled: false,
},
{
id: "REALLOCATION",
label: "实际位置",
text: "实际位置",
"data":"",
"codename":"Reallocation",
value: "REALLOCATION",
disabled: false,
},
{
id: "RECRUIT",
label: "招聘",
text: "招聘",
"data":"",
"codename":"Recruit",
value: "RECRUIT",
disabled: false,
},
{
id: "SERVICE",
label: "服务",
text: "服务",
"data":"",
"codename":"Service",
value: "SERVICE",
disabled: false,
},
{
id: "HEADCOMPANY",
label: "总公司",
text: "总公司",
"data":"",
"codename":"Headcompany",
value: "HEADCOMPANY",
disabled: false,
},
{
id: "INVOICE",
label: "发票",
text: "发票",
"data":"",
"codename":"Invoice",
value: "INVOICE",
disabled: false,
},
{
id: "PAYMENT",
label: "付款",
text: "付款",
"data":"",
"codename":"Payment",
value: "PAYMENT",
disabled: false,
},
{
id: "REMIT",
label: "汇款至",
text: "汇款至",
"data":"",
"codename":"Remit",
value: "REMIT",
disabled: false,
},
{
id: "STATEMENT",
label: "对帐单",
text: "对帐单",
"data":"",
"codename":"Statement",
value: "STATEMENT",
disabled: false,
},
{
id: "CONSIGNMENT",
label: "托运",
text: "托运",
"data":"",
"codename":"Consignment",
value: "CONSIGNMENT",
disabled: false,
},
{
id: "DELIVERY",
label: "交货",
text: "交货",
"data":"",
"codename":"Delivery",
value: "DELIVERY",
disabled: false,
},
{
id: "LADING",
label: "装货",
text: "装货",
"data":"",
"codename":"Lading",
value: "LADING",
disabled: false,
},
{
id: "UNLADING",
label: "卸货",
text: "卸货",
"data":"",
"codename":"Unlading",
value: "UNLADING",
disabled: false,
},
{
id: "OTHER",
label: "其他",
text: "其他",
"data":"",
"codename":"Other",
value: "OTHER",
disabled: false,
},
]
},
{
srfkey: "CL_HR_0003",
emptytext: "未定义",
"codelisttype":"static",
items: [
{
id: "TEL",
label: "电话",
text: "电话",
"data":"",
"codename":"Tel",
value: "TEL",
disabled: false,
},
{
id: "EMAIL",
label: "电子邮件地址",
text: "电子邮件地址",
"data":"",
"codename":"Email",
value: "EMAIL",
disabled: false,
},
{
id: "WECHAT",
label: "微信",
text: "微信",
"data":"",
"codename":"Wechat",
value: "WECHAT",
disabled: false,
},
{
id: "QQ",
label: "QQ",
text: "QQ",
"data":"",
"codename":"Qq",
value: "QQ",
disabled: false,
},
{
id: "FAX",
label: "传真",
text: "传真",
"data":"",
"codename":"Fax",
value: "FAX",
disabled: false,
},
]
},
{ {
srfkey: "OrganizationType", srfkey: "OrganizationType",
emptytext: "未定义", emptytext: "未定义",
......
app_PIM/src/pages/base/hrlegal-edit-view/hrlegal-edit-view-base.tsx
浏览文件 @ 4285b736
...@@ -101,6 +101,7 @@ export class HRLegalEditViewBase extends EditViewBase { ...@@ -101,6 +101,7 @@ export class HRLegalEditViewBase extends EditViewBase {
public toolBarModels: any = { public toolBarModels: any = {
tbitem1: { name: 'tbitem1', caption: '保存并关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '保存并关闭', iconcls: 'fa fa-power-off', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '', class: '' } }, tbitem1: { name: 'tbitem1', caption: '保存并关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '保存并关闭', iconcls: 'fa fa-power-off', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '', class: '' } },
seperator1: { name: 'seperator1', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem2: { name: 'tbitem2', caption: '关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '关闭', iconcls: 'fa fa-sign-out', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Exit', target: '', class: '' } }, tbitem2: { name: 'tbitem2', caption: '关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '关闭', iconcls: 'fa fa-sign-out', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Exit', target: '', class: '' } },
}; };
......
app_PIM/src/pages/base/hrlegal-tab-exp-view/hrlegal-tab-exp-view-base.tsx
浏览文件 @ 4285b736
...@@ -99,9 +99,9 @@ export class HRLegalTabExpViewBase extends TabExpViewBase { ...@@ -99,9 +99,9 @@ export class HRLegalTabExpViewBase extends TabExpViewBase {
* @memberof HRLegalTabExpView * @memberof HRLegalTabExpView
*/ */
public toolBarModels: any = { public toolBarModels: any = {
tbitem1_ff_003_sep: { name: 'tbitem1_ff_003_sep', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem1_ff_003: { name: 'tbitem1_ff_003', caption: '编辑', 'isShowCaption': true, 'isShowIcon': true, tooltip: '编辑', iconcls: 'fa fa-edit', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FF_003', target: 'SINGLEKEY', class: '' } }, tbitem1_ff_003: { name: 'tbitem1_ff_003', caption: '编辑', 'isShowCaption': true, 'isShowIcon': true, tooltip: '编辑', iconcls: 'fa fa-edit', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FF_003', target: 'SINGLEKEY', class: '' } },
tbitem1_remove_sep: { name: 'tbitem1_remove_sep', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem1_remove: { name: 'tbitem1_remove', caption: '删除并关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'SINGLEKEY', class: '' } }, tbitem1_remove: { name: 'tbitem1_remove', caption: '删除并关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'SINGLEKEY', class: '' } },
tbitem2: { name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem2: { name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
......
app_PIM/src/pages/base/hrorg-address-grid-view/hrorg-address-grid-view-base.tsx
浏览文件 @ 4285b736
...@@ -701,16 +701,28 @@ export class HROrgAddressGridViewBase extends GridViewBase { ...@@ -701,16 +701,28 @@ export class HROrgAddressGridViewBase extends GridViewBase {
const deResParameters: any[] = []; const deResParameters: any[] = [];
const parameters: any[] = [ const parameters: any[] = [
{ pathName: 'hrorgaddresses', parameterName: 'hrorgaddress' }, { pathName: 'hrorgaddresses', parameterName: 'hrorgaddress' },
{ pathName: 'editview', parameterName: 'editview' },
]; ];
const _this: any = this; const _this: any = this;
const openIndexViewTab = (data: any) => { const openDrawer = (view: any, data: any) => {
const _data: any = { w: (new Date().getTime()) }; let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
Object.assign(_data, data); container.subscribe((result: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data); if (!result || !Object.is(result.ret, 'OK')) {
this.$router.push(routePath); return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
} }
openIndexViewTab(data); const view: any = {
viewname: 'hrorg-address-edit-view',
height: 0,
width: 800,
title: this.$t('entities.hrorgaddress.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
} }
...@@ -735,14 +747,28 @@ export class HROrgAddressGridViewBase extends GridViewBase { ...@@ -735,14 +747,28 @@ export class HROrgAddressGridViewBase extends GridViewBase {
const deResParameters: any[] = []; const deResParameters: any[] = [];
const parameters: any[] = [ const parameters: any[] = [
{ pathName: 'hrorgaddresses', parameterName: 'hrorgaddress' }, { pathName: 'hrorgaddresses', parameterName: 'hrorgaddress' },
{ pathName: 'editview', parameterName: 'editview' },
]; ];
const _this: any = this; const _this: any = this;
const openIndexViewTab = (data: any) => { const openDrawer = (view: any, data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data); let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
this.$router.push(routePath); container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
} }
openIndexViewTab(data); const view: any = {
viewname: 'hrorg-address-edit-view',
height: 0,
width: 800,
title: this.$t('entities.hrorgaddress.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
} }
......
app_PIM/src/pages/base/hrorg-address-grid-view/hrorg-address-grid-view.html
浏览文件 @ 4285b736
<studio-view-style2 viewName="hrorgaddressgridview" viewTitle="组织地址表格视图" class='degridview hrorg-address-grid-view'> <studio-view-style2 viewName="hrorgaddressgridview" viewTitle="组织地址表格视图" class='degridview hrorg-address-grid-view'>
<template slot='title'>
<span class='caption-info'>{{$t(model.srfTitle)}}</span>
</template>
<i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="名称或描述" search @on-search="onSearch($event)"/> <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="名称或描述" search @on-search="onSearch($event)"/>
<template slot="toolbar"> <template slot="toolbar">
<view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/> </template> <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/> </template>
......
app_PIM/src/pages/base/hrorg-contact-grid-view/hrorg-contact-grid-view-base.tsx
浏览文件 @ 4285b736
...@@ -701,16 +701,28 @@ export class HROrgContactGridViewBase extends GridViewBase { ...@@ -701,16 +701,28 @@ export class HROrgContactGridViewBase extends GridViewBase {
const deResParameters: any[] = []; const deResParameters: any[] = [];
const parameters: any[] = [ const parameters: any[] = [
{ pathName: 'hrorgcontacts', parameterName: 'hrorgcontact' }, { pathName: 'hrorgcontacts', parameterName: 'hrorgcontact' },
{ pathName: 'editview', parameterName: 'editview' },
]; ];
const _this: any = this; const _this: any = this;
const openIndexViewTab = (data: any) => { const openDrawer = (view: any, data: any) => {
const _data: any = { w: (new Date().getTime()) }; let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
Object.assign(_data, data); container.subscribe((result: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data); if (!result || !Object.is(result.ret, 'OK')) {
this.$router.push(routePath); return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
} }
openIndexViewTab(data); const view: any = {
viewname: 'hrorg-contact-edit-view',
height: 0,
width: 800,
title: this.$t('entities.hrorgcontact.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
} }
...@@ -735,14 +747,28 @@ export class HROrgContactGridViewBase extends GridViewBase { ...@@ -735,14 +747,28 @@ export class HROrgContactGridViewBase extends GridViewBase {
const deResParameters: any[] = []; const deResParameters: any[] = [];
const parameters: any[] = [ const parameters: any[] = [
{ pathName: 'hrorgcontacts', parameterName: 'hrorgcontact' }, { pathName: 'hrorgcontacts', parameterName: 'hrorgcontact' },
{ pathName: 'editview', parameterName: 'editview' },
]; ];
const _this: any = this; const _this: any = this;
const openIndexViewTab = (data: any) => { const openDrawer = (view: any, data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data); let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
this.$router.push(routePath); container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
} }
openIndexViewTab(data); const view: any = {
viewname: 'hrorg-contact-edit-view',
height: 0,
width: 800,
title: this.$t('entities.hrorgcontact.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
} }
......
app_PIM/src/pages/base/hrorg-contact-grid-view/hrorg-contact-grid-view.html
浏览文件 @ 4285b736
<studio-view-style2 viewName="hrorgcontactgridview" viewTitle="组织联系信息表格视图" class='degridview hrorg-contact-grid-view'> <studio-view-style2 viewName="hrorgcontactgridview" viewTitle="组织联系信息表格视图" class='degridview hrorg-contact-grid-view'>
<template slot='title'>
<span class='caption-info'>{{$t(model.srfTitle)}}</span>
</template>
<i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="联系人" search @on-search="onSearch($event)"/> <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="联系人" search @on-search="onSearch($event)"/>
<template slot="toolbar"> <template slot="toolbar">
<view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/> </template> <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/> </template>
......
app_PIM/src/widgets/hrorg-address/main-form/main-form-base.tsx
浏览文件 @ 4285b736
...@@ -74,10 +74,10 @@ export class MainEditFormBase extends EditFormControlBase { ...@@ -74,10 +74,10 @@ export class MainEditFormBase extends EditFormControlBase {
srfdeid: null, srfdeid: null,
srfsourcekey: null, srfsourcekey: null,
hrorgaddressname: null, hrorgaddressname: null,
createman: null, address: null,
createdate: null, postcode: null,
updateman: null, uses: null,
updatedate: null, mainaddress: null,
hrorgaddressid: null, hrorgaddressid: null,
hrorgaddress:null, hrorgaddress:null,
}; };
...@@ -107,14 +107,10 @@ export class MainEditFormBase extends EditFormControlBase { ...@@ -107,14 +107,10 @@ export class MainEditFormBase extends EditFormControlBase {
* @memberof MainEditFormBase * @memberof MainEditFormBase
*/ */
public detailsModel: any = { public detailsModel: any = {
group1: new FormGroupPanelModel({ caption: '组织地址基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hrorgaddress.main_form', extractMode: 'ITEM', details: [] } }), group1: new FormGroupPanelModel({ caption: '组织地址基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: false, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hrorgaddress.main_form', extractMode: 'ITEM', details: [] } }),
formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }), formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
group2: new FormGroupPanelModel({ caption: '操作信息', detailType: 'GROUPPANEL', name: 'group2', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hrorgaddress.main_form', extractMode: 'ITEM', details: [] } }),
formpage2: new FormPageModel({ caption: '其它', detailType: 'FORMPAGE', name: 'formpage2', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
srfupdatedate: new FormItemModel({ caption: '更新时间', detailType: 'FORMITEM', name: 'srfupdatedate', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), srfupdatedate: new FormItemModel({ caption: '更新时间', detailType: 'FORMITEM', name: 'srfupdatedate', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
...@@ -133,16 +129,15 @@ export class MainEditFormBase extends EditFormControlBase { ...@@ -133,16 +129,15 @@ export class MainEditFormBase extends EditFormControlBase {
hrorgaddressname: new FormItemModel({ caption: '名称或描述', detailType: 'FORMITEM', name: 'hrorgaddressname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), hrorgaddressname: new FormItemModel({ caption: '名称或描述', detailType: 'FORMITEM', name: 'hrorgaddressname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
createman: new FormItemModel({ caption: '建立人', detailType: 'FORMITEM', name: 'createman', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), address: new FormItemModel({ caption: '地址', detailType: 'FORMITEM', name: 'address', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
createdate: new FormItemModel({ caption: '建立时间', detailType: 'FORMITEM', name: 'createdate', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), postcode: new FormItemModel({ caption: '邮政编码', detailType: 'FORMITEM', name: 'postcode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
updateman: new FormItemModel({ caption: '更新人', detailType: 'FORMITEM', name: 'updateman', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), uses: new FormItemModel({ caption: '用途', detailType: 'FORMITEM', name: 'uses', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
updatedate: new FormItemModel({ caption: '更新时间', detailType: 'FORMITEM', name: 'updatedate', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), mainaddress: new FormItemModel({ caption: '主要', detailType: 'FORMITEM', name: 'mainaddress', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
hrorgaddressid: new FormItemModel({ caption: '组织地址标识', detailType: 'FORMITEM', name: 'hrorgaddressid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), hrorgaddressid: new FormItemModel({ caption: '组织地址标识', detailType: 'FORMITEM', name: 'hrorgaddressid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
form: new FormTabPanelModel({ caption: 'form', detailType: 'TABPANEL', name: 'form', visible: true, isShowCaption: true, form: this, tabPages: [{ name: 'formpage1', index: 0, visible: true }, { name: 'formpage2', index: 1, visible: true }] }),
}; };
} }
\ No newline at end of file
app_PIM/src/widgets/hrorg-address/main-form/main-form-model.ts
浏览文件 @ 4285b736
...@@ -61,24 +61,24 @@ export default class MainModel { ...@@ -61,24 +61,24 @@ export default class MainModel {
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
name: 'createman', name: 'address',
prop: 'createman', prop: 'address',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
name: 'createdate', name: 'postcode',
prop: 'createdate', prop: 'postcode',
dataType: 'DATETIME', dataType: 'TEXT',
}, },
{ {
name: 'updateman', name: 'uses',
prop: 'updateman', prop: 'uses',
dataType: 'TEXT', dataType: 'SSCODELIST',
}, },
{ {
name: 'updatedate', name: 'mainaddress',
prop: 'updatedate', prop: 'mainaddress',
dataType: 'DATETIME', dataType: 'YESNO',
}, },
{ {
name: 'hrorgaddressid', name: 'hrorgaddressid',
......
app_PIM/src/widgets/hrorg-address/main-form/main-form.html
浏览文件 @ 4285b736
<i-form :model="this.data" class='app-form' ref='form' id='hrorgaddress_main' style=""> <i-form :model="this.data" class='app-form' ref='form' id='hrorgaddress_main' style="">
<input style="display:none;" /> <input style="display:none;" />
<row > <row >
<tabs :animated="false" size="small" name='main' :value="detailsModel.form.activiedPage"
@on-click="detailsModel.form.clickPage($event)">
<tab-pane v-show="detailsModel.formpage1.visible" name='formpage1' :index="0" tab='main' class=''
:label="(h) =>{
return h('span',{
class:'caption'
},[
$t('entities.hrorgaddress.main_form.details.formpage1')
])
}">
<i-col class="form-layout-container" v-show="detailsModel.group1.visible" :style="{}" :lg="{ span: 24, offset: 0 }"> <i-col class="form-layout-container" v-show="detailsModel.group1.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-group :model="detailsModel.group1" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hrorgaddress.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" > <app-form-group :model="detailsModel.group1" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hrorgaddress.main_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
<app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.group1" :data="data" :context="context" :viewparams="viewparams"/> <app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.group1" :data="data" :context="context" :viewparams="viewparams"/>
<row> <row>
<i-col class="form-layout-container" v-show="detailsModel.hrorgaddressname.visible" :style="{}" :lg="{ span: 24, offset: 0 }"> <i-col class="form-layout-container" v-show="detailsModel.hrorgaddressname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
...@@ -30,64 +20,71 @@ ...@@ -30,64 +20,71 @@
</app-form-item> </app-form-item>
</i-col> </i-col>
<i-col class="form-layout-container" v-show="detailsModel.address.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
</row> <app-form-item name='address' :itemRules="this.rules.address" class='' :caption="$t('entities.hrorgaddress.main_form.details.address')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.address.error" :isEmptyCaption="false" labelPos="LEFT">
</app-form-group> <input-box
v-model="data.address"
</i-col> @enter="onEnter($event)"
unit=""
:disabled="detailsModel.address.disabled"
</tab-pane> type='text'
<tab-pane v-show="detailsModel.formpage2.visible" name='formpage2' :index="1" tab='main' class='' style="">
:label="(h) =>{ </input-box>
return h('span',{
class:'caption'
},[
$t('entities.hrorgaddress.main_form.details.formpage2')
])
}">
<i-col class="form-layout-container" v-show="detailsModel.group2.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-group :model="detailsModel.group2" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group2.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hrorgaddress.main_form.details.group2')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
<app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.group2" :data="data" :context="context" :viewparams="viewparams"/>
<row>
<i-col class="form-layout-container" v-show="detailsModel.createman.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='createman' :itemRules="this.rules.createman" class='' :caption="$t('entities.hrorgaddress.main_form.details.createman')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.createman.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='createman' :value="data.createman" dataType="TEXT" :precision="0"
tag='SysOperator' codelistType='DYNAMIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
</app-form-item> </app-form-item>
</i-col> </i-col>
<i-col class="form-layout-container" v-show="detailsModel.createdate.visible" :style="{}" :lg="{ span: 24, offset: 0 }"> <i-col class="form-layout-container" v-show="detailsModel.postcode.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='createdate' :itemRules="this.rules.createdate" class='' :caption="$t('entities.hrorgaddress.main_form.details.createdate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.createdate.error" :isEmptyCaption="false" labelPos="LEFT"> <app-form-item name='postcode' :itemRules="this.rules.postcode" class='' :caption="$t('entities.hrorgaddress.main_form.details.postcode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.postcode.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
<app-span name='createdate' :value="data.createdate" dataType="DATETIME" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS" :precision="0" v-model="data.postcode"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style=""> @enter="onEnter($event)"
</app-span> unit=""
:disabled="detailsModel.postcode.disabled"
type='text'
style="">
</input-box>
</app-form-item> </app-form-item>
</i-col> </i-col>
<i-col class="form-layout-container" v-show="detailsModel.updateman.visible" :style="{}" :lg="{ span: 24, offset: 0 }"> <i-col class="form-layout-container" v-show="detailsModel.uses.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='updateman' :itemRules="this.rules.updateman" class='' :caption="$t('entities.hrorgaddress.main_form.details.updateman')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.updateman.error" :isEmptyCaption="false" labelPos="LEFT"> <app-form-item name='uses' :itemRules="this.rules.uses" class='' :caption="$t('entities.hrorgaddress.main_form.details.uses')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.uses.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='updateman' :value="data.updateman" dataType="TEXT" :precision="0" <dropdown-list
tag='SysOperator' codelistType='DYNAMIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style=""> v-model="data.uses"
</app-span> :data="data"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.uses.disabled"
valueType="string"
tag='CL_HR_0002'
codelistType='STATIC'
placeholder='请选择...'
/>
</app-form-item> </app-form-item>
</i-col> </i-col>
<i-col class="form-layout-container" v-show="detailsModel.updatedate.visible" :style="{}" :lg="{ span: 24, offset: 0 }"> <i-col class="form-layout-container" v-show="detailsModel.mainaddress.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='updatedate' :itemRules="this.rules.updatedate" class='' :caption="$t('entities.hrorgaddress.main_form.details.updatedate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.updatedate.error" :isEmptyCaption="false" labelPos="LEFT"> <app-form-item name='mainaddress' :itemRules="this.rules.mainaddress" class='' :caption="$t('entities.hrorgaddress.main_form.details.mainaddress')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.mainaddress.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='updatedate' :value="data.updatedate" dataType="DATETIME" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS" :precision="0" <dropdown-list
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style=""> v-model="data.mainaddress"
</app-span> :data="data"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.mainaddress.disabled"
style="width:100px;width: 100px;"
valueType="number"
tag='YesNo'
codelistType='STATIC'
placeholder='请选择...'
/>
</app-form-item> </app-form-item>
</i-col> </i-col>
...@@ -98,7 +95,5 @@ tag='SysOperator' codelistType='DYNAMIC' :data="data" :context="context" :viewpa ...@@ -98,7 +95,5 @@ tag='SysOperator' codelistType='DYNAMIC' :data="data" :context="context" :viewpa
</i-col> </i-col>
</tab-pane>
</tabs>
</row> </row>
</i-form> </i-form>
\ No newline at end of file
app_PIM/src/widgets/hrorg-address/main-grid/main-grid-base.tsx
浏览文件 @ 4285b736
...@@ -92,17 +92,25 @@ export class MainGridBase extends GridControlBase { ...@@ -92,17 +92,25 @@ export class MainGridBase extends GridControlBase {
isEnableRowEdit: false, isEnableRowEdit: false,
}, },
{ {
name: 'updateman', name: 'address',
label: '更新人', label: '地址',
langtag: 'entities.hrorgaddress.main_grid.columns.updateman', langtag: 'entities.hrorgaddress.main_grid.columns.address',
show: true, show: true,
util: 'PX', util: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
}, },
{ {
name: 'updatedate', name: 'uses',
label: '更新时间', label: '用途',
langtag: 'entities.hrorgaddress.main_grid.columns.updatedate', langtag: 'entities.hrorgaddress.main_grid.columns.uses',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'mainaddress',
label: '主要',
langtag: 'entities.hrorgaddress.main_grid.columns.mainaddress',
show: true, show: true,
util: 'PX', util: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
...@@ -142,8 +150,9 @@ export class MainGridBase extends GridControlBase { ...@@ -142,8 +150,9 @@ export class MainGridBase extends GridControlBase {
*/ */
public hasRowEdit: any = { public hasRowEdit: any = {
'hrorgaddressname':false, 'hrorgaddressname':false,
'updateman':false, 'address':false,
'updatedate':false, 'uses':false,
'mainaddress':false,
}; };
/** /**
...@@ -170,9 +179,17 @@ export class MainGridBase extends GridControlBase { ...@@ -170,9 +179,17 @@ export class MainGridBase extends GridControlBase {
public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> { public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
return super.formatExcelData(filterVal, jsonData, [ return super.formatExcelData(filterVal, jsonData, [
{ {
name: 'updateman', name: 'uses',
srfkey: 'SysOperator', srfkey: 'CL_HR_0002',
codelistType : 'DYNAMIC', codelistType : 'STATIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
{
name: 'mainaddress',
srfkey: 'YesNo',
codelistType : 'STATIC',
renderMode: 'other', renderMode: 'other',
textSeparator: '、', textSeparator: '、',
valueSeparator: ',', valueSeparator: ',',
......
app_PIM/src/widgets/hrorg-address/main-grid/main-grid-model.ts
浏览文件 @ 4285b736
...@@ -26,20 +26,25 @@ export default class MainModel { ...@@ -26,20 +26,25 @@ export default class MainModel {
] ]
}else{ }else{
return [ return [
{
name: 'address',
prop: 'address',
dataType: 'TEXT',
},
{ {
name: 'hrorgaddressname', name: 'hrorgaddressname',
prop: 'hrorgaddressname', prop: 'hrorgaddressname',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
name: 'updateman', name: 'mainaddress',
prop: 'updateman', prop: 'mainaddress',
dataType: 'TEXT', dataType: 'YESNO',
}, },
{ {
name: 'updatedate', name: 'uses',
prop: 'updatedate', prop: 'uses',
dataType: 'DATETIME', dataType: 'SSCODELIST',
}, },
{ {
name: 'srfmajortext', name: 'srfmajortext',
......
app_PIM/src/widgets/hrorg-address/main-grid/main-grid.html
浏览文件 @ 4285b736
...@@ -35,29 +35,43 @@ ...@@ -35,29 +35,43 @@
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('updateman')"> <template v-if="getColumnState('address')">
<el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.hrorgaddress.main_grid.columns.updateman')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'address'" :label="$t('entities.hrorgaddress.main_grid.columns.address')" :width="300" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}"> <template v-slot:header="{column}">
<span class="column-header "> <span class="column-header ">
{{$t('entities.hrorgaddress.main_grid.columns.updateman')}} {{$t('entities.hrorgaddress.main_grid.columns.address')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.address}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('uses')">
<el-table-column show-overflow-tooltip :prop="'uses'" :label="$t('entities.hrorgaddress.main_grid.columns.uses')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrorgaddress.main_grid.columns.uses')}}
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<template > <template >
<codelist :value="row.updateman" tag='SysOperator' codelistType='DYNAMIC' ></codelist> <codelist :value="row.uses" tag='CL_HR_0002' codelistType='STATIC' ></codelist>
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('updatedate')"> <template v-if="getColumnState('mainaddress')">
<el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.hrorgaddress.main_grid.columns.updatedate')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'mainaddress'" :label="$t('entities.hrorgaddress.main_grid.columns.mainaddress')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}"> <template v-slot:header="{column}">
<span class="column-header "> <span class="column-header ">
{{$t('entities.hrorgaddress.main_grid.columns.updatedate')}} {{$t('entities.hrorgaddress.main_grid.columns.mainaddress')}}
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<app-format-data format="YYYY-MM-DD HH:mm:ss" :data="row.updatedate"></app-format-data> <template >
<codelist :value="row.mainaddress" tag='YesNo' codelistType='STATIC' ></codelist>
</template>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
......
app_PIM/src/widgets/hrorg-contact/main-form/main-form-base.tsx
浏览文件 @ 4285b736
...@@ -74,10 +74,9 @@ export class MainEditFormBase extends EditFormControlBase { ...@@ -74,10 +74,9 @@ export class MainEditFormBase extends EditFormControlBase {
srfdeid: null, srfdeid: null,
srfsourcekey: null, srfsourcekey: null,
hrorgcontactname: null, hrorgcontactname: null,
createman: null, contacttype: null,
createdate: null, contactinfo: null,
updateman: null, maincontact: null,
updatedate: null,
hrorgcontactid: null, hrorgcontactid: null,
hrorgcontact:null, hrorgcontact:null,
}; };
...@@ -107,14 +106,10 @@ export class MainEditFormBase extends EditFormControlBase { ...@@ -107,14 +106,10 @@ export class MainEditFormBase extends EditFormControlBase {
* @memberof MainEditFormBase * @memberof MainEditFormBase
*/ */
public detailsModel: any = { public detailsModel: any = {
group1: new FormGroupPanelModel({ caption: '组织联系信息基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hrorgcontact.main_form', extractMode: 'ITEM', details: [] } }), group1: new FormGroupPanelModel({ caption: '组织联系信息基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: false, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hrorgcontact.main_form', extractMode: 'ITEM', details: [] } }),
formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }), formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
group2: new FormGroupPanelModel({ caption: '操作信息', detailType: 'GROUPPANEL', name: 'group2', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hrorgcontact.main_form', extractMode: 'ITEM', details: [] } }),
formpage2: new FormPageModel({ caption: '其它', detailType: 'FORMPAGE', name: 'formpage2', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
srfupdatedate: new FormItemModel({ caption: '更新时间', detailType: 'FORMITEM', name: 'srfupdatedate', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), srfupdatedate: new FormItemModel({ caption: '更新时间', detailType: 'FORMITEM', name: 'srfupdatedate', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
...@@ -133,16 +128,13 @@ export class MainEditFormBase extends EditFormControlBase { ...@@ -133,16 +128,13 @@ export class MainEditFormBase extends EditFormControlBase {
hrorgcontactname: new FormItemModel({ caption: '联系人', detailType: 'FORMITEM', name: 'hrorgcontactname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), hrorgcontactname: new FormItemModel({ caption: '联系人', detailType: 'FORMITEM', name: 'hrorgcontactname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
createman: new FormItemModel({ caption: '建立人', detailType: 'FORMITEM', name: 'createman', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), contacttype: new FormItemModel({ caption: '类型', detailType: 'FORMITEM', name: 'contacttype', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
createdate: new FormItemModel({ caption: '建立时间', detailType: 'FORMITEM', name: 'createdate', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
updateman: new FormItemModel({ caption: '更新人', detailType: 'FORMITEM', name: 'updateman', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), contactinfo: new FormItemModel({ caption: '联系信息', detailType: 'FORMITEM', name: 'contactinfo', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
updatedate: new FormItemModel({ caption: '更新时间', detailType: 'FORMITEM', name: 'updatedate', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), maincontact: new FormItemModel({ caption: '主要', detailType: 'FORMITEM', name: 'maincontact', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
hrorgcontactid: new FormItemModel({ caption: '组织联系信息标识', detailType: 'FORMITEM', name: 'hrorgcontactid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), hrorgcontactid: new FormItemModel({ caption: '组织联系信息标识', detailType: 'FORMITEM', name: 'hrorgcontactid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
form: new FormTabPanelModel({ caption: 'form', detailType: 'TABPANEL', name: 'form', visible: true, isShowCaption: true, form: this, tabPages: [{ name: 'formpage1', index: 0, visible: true }, { name: 'formpage2', index: 1, visible: true }] }),
}; };
} }
\ No newline at end of file
app_PIM/src/widgets/hrorg-contact/main-form/main-form-model.ts
浏览文件 @ 4285b736
...@@ -61,24 +61,19 @@ export default class MainModel { ...@@ -61,24 +61,19 @@ export default class MainModel {
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
name: 'createman', name: 'contacttype',
prop: 'createman', prop: 'contacttype',
dataType: 'TEXT', dataType: 'SSCODELIST',
},
{
name: 'createdate',
prop: 'createdate',
dataType: 'DATETIME',
}, },
{ {
name: 'updateman', name: 'contactinfo',
prop: 'updateman', prop: 'contactinfo',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
name: 'updatedate', name: 'maincontact',
prop: 'updatedate', prop: 'maincontact',
dataType: 'DATETIME', dataType: 'YESNO',
}, },
{ {
name: 'hrorgcontactid', name: 'hrorgcontactid',
......
app_PIM/src/widgets/hrorg-contact/main-form/main-form.html
浏览文件 @ 4285b736
<i-form :model="this.data" class='app-form' ref='form' id='hrorgcontact_main' style=""> <i-form :model="this.data" class='app-form' ref='form' id='hrorgcontact_main' style="">
<input style="display:none;" /> <input style="display:none;" />
<row > <row >
<tabs :animated="false" size="small" name='main' :value="detailsModel.form.activiedPage"
@on-click="detailsModel.form.clickPage($event)">
<tab-pane v-show="detailsModel.formpage1.visible" name='formpage1' :index="0" tab='main' class=''
:label="(h) =>{
return h('span',{
class:'caption'
},[
$t('entities.hrorgcontact.main_form.details.formpage1')
])
}">
<i-col class="form-layout-container" v-show="detailsModel.group1.visible" :style="{}" :lg="{ span: 24, offset: 0 }"> <i-col class="form-layout-container" v-show="detailsModel.group1.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-group :model="detailsModel.group1" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hrorgcontact.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" > <app-form-group :model="detailsModel.group1" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hrorgcontact.main_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
<app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.group1" :data="data" :context="context" :viewparams="viewparams"/> <app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.group1" :data="data" :context="context" :viewparams="viewparams"/>
<row> <row>
<i-col class="form-layout-container" v-show="detailsModel.hrorgcontactname.visible" :style="{}" :lg="{ span: 24, offset: 0 }"> <i-col class="form-layout-container" v-show="detailsModel.hrorgcontactname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
...@@ -30,64 +20,57 @@ ...@@ -30,64 +20,57 @@
</app-form-item> </app-form-item>
</i-col> </i-col>
<i-col class="form-layout-container" v-show="detailsModel.contacttype.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='contacttype' :itemRules="this.rules.contacttype" class='' :caption="$t('entities.hrorgcontact.main_form.details.contacttype')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.contacttype.error" :isEmptyCaption="false" labelPos="LEFT">
</row> <dropdown-list
</app-form-group> v-model="data.contacttype"
:data="data"
</i-col> :context="context"
:viewparams="viewparams"
:localContext ='{ }'
</tab-pane> :localParam ='{ }'
<tab-pane v-show="detailsModel.formpage2.visible" name='formpage2' :index="1" tab='main' class='' :disabled="detailsModel.contacttype.disabled"
:label="(h) =>{ valueType="string"
return h('span',{ tag='CL_HR_0003'
class:'caption' codelistType='STATIC'
},[ placeholder='请选择...'
$t('entities.hrorgcontact.main_form.details.formpage2')
])
}">
<i-col class="form-layout-container" v-show="detailsModel.group2.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-group :model="detailsModel.group2" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group2.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hrorgcontact.main_form.details.group2')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
<app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.group2" :data="data" :context="context" :viewparams="viewparams"/>
<row>
<i-col class="form-layout-container" v-show="detailsModel.createman.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='createman' :itemRules="this.rules.createman" class='' :caption="$t('entities.hrorgcontact.main_form.details.createman')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.createman.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='createman' :value="data.createman" dataType="TEXT" :precision="0" />
tag='SysOperator' codelistType='DYNAMIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
</app-form-item> </app-form-item>
</i-col> </i-col>
<i-col class="form-layout-container" v-show="detailsModel.createdate.visible" :style="{}" :lg="{ span: 24, offset: 0 }"> <i-col class="form-layout-container" v-show="detailsModel.contactinfo.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='createdate' :itemRules="this.rules.createdate" class='' :caption="$t('entities.hrorgcontact.main_form.details.createdate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.createdate.error" :isEmptyCaption="false" labelPos="LEFT"> <app-form-item name='contactinfo' :itemRules="this.rules.contactinfo" class='' :caption="$t('entities.hrorgcontact.main_form.details.contactinfo')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.contactinfo.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
<app-span name='createdate' :value="data.createdate" dataType="DATETIME" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS" :precision="0" v-model="data.contactinfo"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style=""> @enter="onEnter($event)"
</app-span> unit=""
:disabled="detailsModel.contactinfo.disabled"
</app-form-item> type='text'
style="">
</i-col> </input-box>
<i-col class="form-layout-container" v-show="detailsModel.updateman.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='updateman' :itemRules="this.rules.updateman" class='' :caption="$t('entities.hrorgcontact.main_form.details.updateman')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.updateman.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='updateman' :value="data.updateman" dataType="TEXT" :precision="0"
tag='SysOperator' codelistType='DYNAMIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
</app-form-item> </app-form-item>
</i-col> </i-col>
<i-col class="form-layout-container" v-show="detailsModel.updatedate.visible" :style="{}" :lg="{ span: 24, offset: 0 }"> <i-col class="form-layout-container" v-show="detailsModel.maincontact.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='updatedate' :itemRules="this.rules.updatedate" class='' :caption="$t('entities.hrorgcontact.main_form.details.updatedate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.updatedate.error" :isEmptyCaption="false" labelPos="LEFT"> <app-form-item name='maincontact' :itemRules="this.rules.maincontact" class='' :caption="$t('entities.hrorgcontact.main_form.details.maincontact')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.maincontact.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='updatedate' :value="data.updatedate" dataType="DATETIME" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS" :precision="0" <dropdown-list
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style=""> v-model="data.maincontact"
</app-span> :data="data"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.maincontact.disabled"
style="width:100px;width: 100px;"
valueType="number"
tag='YesNo'
codelistType='STATIC'
placeholder='请选择...'
/>
</app-form-item> </app-form-item>
</i-col> </i-col>
...@@ -98,7 +81,5 @@ tag='SysOperator' codelistType='DYNAMIC' :data="data" :context="context" :viewpa ...@@ -98,7 +81,5 @@ tag='SysOperator' codelistType='DYNAMIC' :data="data" :context="context" :viewpa
</i-col> </i-col>
</tab-pane>
</tabs>
</row> </row>
</i-form> </i-form>
\ No newline at end of file
app_PIM/src/widgets/hrorg-contact/main-grid/main-grid-base.tsx
浏览文件 @ 4285b736
...@@ -92,17 +92,25 @@ export class MainGridBase extends GridControlBase { ...@@ -92,17 +92,25 @@ export class MainGridBase extends GridControlBase {
isEnableRowEdit: false, isEnableRowEdit: false,
}, },
{ {
name: 'updateman', name: 'contacttype',
label: '更新人', label: '类型',
langtag: 'entities.hrorgcontact.main_grid.columns.updateman', langtag: 'entities.hrorgcontact.main_grid.columns.contacttype',
show: true, show: true,
util: 'PX', util: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
}, },
{ {
name: 'updatedate', name: 'contactinfo',
label: '更新时间', label: '联系信息',
langtag: 'entities.hrorgcontact.main_grid.columns.updatedate', langtag: 'entities.hrorgcontact.main_grid.columns.contactinfo',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'maincontact',
label: '主要',
langtag: 'entities.hrorgcontact.main_grid.columns.maincontact',
show: true, show: true,
util: 'PX', util: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
...@@ -142,8 +150,9 @@ export class MainGridBase extends GridControlBase { ...@@ -142,8 +150,9 @@ export class MainGridBase extends GridControlBase {
*/ */
public hasRowEdit: any = { public hasRowEdit: any = {
'hrorgcontactname':false, 'hrorgcontactname':false,
'updateman':false, 'contacttype':false,
'updatedate':false, 'contactinfo':false,
'maincontact':false,
}; };
/** /**
...@@ -170,9 +179,17 @@ export class MainGridBase extends GridControlBase { ...@@ -170,9 +179,17 @@ export class MainGridBase extends GridControlBase {
public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> { public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
return super.formatExcelData(filterVal, jsonData, [ return super.formatExcelData(filterVal, jsonData, [
{ {
name: 'updateman', name: 'contacttype',
srfkey: 'SysOperator', srfkey: 'CL_HR_0003',
codelistType : 'DYNAMIC', codelistType : 'STATIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
{
name: 'maincontact',
srfkey: 'YesNo',
codelistType : 'STATIC',
renderMode: 'other', renderMode: 'other',
textSeparator: '、', textSeparator: '、',
valueSeparator: ',', valueSeparator: ',',
......
app_PIM/src/widgets/hrorg-contact/main-grid/main-grid-model.ts
浏览文件 @ 4285b736
...@@ -27,19 +27,24 @@ export default class MainModel { ...@@ -27,19 +27,24 @@ export default class MainModel {
}else{ }else{
return [ return [
{ {
name: 'hrorgcontactname', name: 'maincontact',
prop: 'hrorgcontactname', prop: 'maincontact',
dataType: 'TEXT', dataType: 'YESNO',
}, },
{ {
name: 'updateman', name: 'contactinfo',
prop: 'updateman', prop: 'contactinfo',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
name: 'updatedate', name: 'contacttype',
prop: 'updatedate', prop: 'contacttype',
dataType: 'DATETIME', dataType: 'SSCODELIST',
},
{
name: 'hrorgcontactname',
prop: 'hrorgcontactname',
dataType: 'TEXT',
}, },
{ {
name: 'srfmajortext', name: 'srfmajortext',
......
app_PIM/src/widgets/hrorg-contact/main-grid/main-grid.html
浏览文件 @ 4285b736
...@@ -35,29 +35,43 @@ ...@@ -35,29 +35,43 @@
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('updateman')"> <template v-if="getColumnState('contacttype')">
<el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.hrorgcontact.main_grid.columns.updateman')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'contacttype'" :label="$t('entities.hrorgcontact.main_grid.columns.contacttype')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}"> <template v-slot:header="{column}">
<span class="column-header "> <span class="column-header ">
{{$t('entities.hrorgcontact.main_grid.columns.updateman')}} {{$t('entities.hrorgcontact.main_grid.columns.contacttype')}}
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<template > <template >
<codelist :value="row.updateman" tag='SysOperator' codelistType='DYNAMIC' ></codelist> <codelist :value="row.contacttype" tag='CL_HR_0003' codelistType='STATIC' ></codelist>
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('updatedate')"> <template v-if="getColumnState('contactinfo')">
<el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.hrorgcontact.main_grid.columns.updatedate')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'contactinfo'" :label="$t('entities.hrorgcontact.main_grid.columns.contactinfo')" :width="300" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}"> <template v-slot:header="{column}">
<span class="column-header "> <span class="column-header ">
{{$t('entities.hrorgcontact.main_grid.columns.updatedate')}} {{$t('entities.hrorgcontact.main_grid.columns.contactinfo')}}
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<app-format-data format="YYYY-MM-DD HH:mm:ss" :data="row.updatedate"></app-format-data> <span>{{row.contactinfo}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('maincontact')">
<el-table-column show-overflow-tooltip :prop="'maincontact'" :label="$t('entities.hrorgcontact.main_grid.columns.maincontact')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrorgcontact.main_grid.columns.maincontact')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template >
<codelist :value="row.maincontact" tag='YesNo' codelistType='STATIC' ></codelist>
</template>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
......
humanresource-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 4285b736
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<!--输出实体[HRLEGAL]数据结构 --> <!--输出实体[HRLEGAL]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrlegal-51-4"> <changeSet author="a_LAB01_e85d8801c" id="tab-hrlegal-61-4">
<createTable tableName="LEGAL"> <createTable tableName="LEGAL">
<column name="LEGALNAME" remarks="" type="VARCHAR(200)"> <column name="LEGALNAME" remarks="" type="VARCHAR(200)">
</column> </column>
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
<!--输出实体[HRORGADDRESS]数据结构 --> <!--输出实体[HRORGADDRESS]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrorgaddress-16-10"> <changeSet author="a_LAB01_e85d8801c" id="tab-hrorgaddress-21-10">
<createTable tableName="T_HRORGADDRESS"> <createTable tableName="T_HRORGADDRESS">
<column name="HRORGADDRESSNAME" remarks="" type="VARCHAR(200)"> <column name="HRORGADDRESSNAME" remarks="" type="VARCHAR(200)">
</column> </column>
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
<!--输出实体[HRORGCONTACT]数据结构 --> <!--输出实体[HRORGCONTACT]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrorgcontact-11-11"> <changeSet author="a_LAB01_e85d8801c" id="tab-hrorgcontact-16-11">
<createTable tableName="T_HRORGCONTACT"> <createTable tableName="T_HRORGCONTACT">
<column name="CREATEMAN" remarks="" type="VARCHAR(60)"> <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
</column> </column>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或