Skip to content

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

jackwang 部署微服务应用

上级 a137abec
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 5772 行增加 和 1798 行删除
app_PIM/public/assets/json/view-config.json
浏览文件 @ 3c562804
......@@ -899,6 +899,16 @@
"viewtag": "b4ef4b87eb87fc3a2a8479027d62ac4c",
"memo": "系统自动添加"
},
"hrcontractv_005": {
"title": "合同信息",
"caption": "合同信息",
"viewtype": "DEOPTVIEW",
"viewmodule": "HumanResource",
"viewname": "HRContractV_005",
"viewfilename": "hrcontract-v-005",
"viewtag": "b748e4bd87b9d77bfc24835a2e5e96c9",
"memo": ""
},
"hrtransferapplyv_006": {
"title": "调动申请编辑视图",
"caption": "调动预览",
......
app_PIM/src/interface/entity/hrcontract.ts
浏览文件 @ 3c562804
......@@ -181,4 +181,12 @@ export interface HRContract {
* @memberof HRContract
*/
contractsignnum?: any;
/**
* 附件
*
* @returns {*}
* @memberof HRContract
*/
attachment?: any;
}
\ No newline at end of file
app_PIM/src/locale/lanres/codelist/codelist_en_US.ts
浏览文件 @ 3c562804
export default {
CL_HR_0021: {
"CONTRACT": "劳动合同",
"LABOR": "劳务派遣合同",
"AGREEMENT": "协议",
"OTHER": "其他",
"empty": ""
},
CL_HR_0011: {
"SINGLE": "未婚",
"MARRIED": "已婚",
"WIDOWED": "丧偶",
"DIVORCED": "离异",
"OTHER": "其他",
"empty": ""
},
CL_HR_0003: {
"TEL": "电话",
"EMAIL": "电子邮件地址",
"WECHAT": "微信",
"QQ": "QQ",
"FAX": "传真",
"empty": ""
},
CL_HR_0007: {
"A": "A",
"B": "B",
"AB": "AB",
"O": "O",
"其他": "其他",
"empty": ""
},
CL_HR_0014: {
"10": "博士后",
"20": "硕士研究生",
"30": "大学本科",
"40": "中等专科",
"50": "职业高中",
"60": "技工学校",
"70": "普通高中",
"80": "初中",
"90": "小学",
"100": "其他",
"empty": ""
},
CL_HR_0002: {
"BUSINESS": "业务",
"HOME": "家庭住址",
"REALLOCATION": "实际位置",
"RECRUIT": "招聘",
"SERVICE": "服务",
"HEADCOMPANY": "总公司",
"INVOICE": "发票",
"PAYMENT": "付款",
"REMIT": "汇款至",
"STATEMENT": "对帐单",
"CONSIGNMENT": "托运",
"DELIVERY": "交货",
"LADING": "装货",
"UNLADING": "卸货",
"OTHER": "其他",
"empty": ""
},
CL_HR_0016: {
"empty": "",
},
CL_HR_0013: {
"10": "中共党员",
"30": "共青团员",
"40": "群众",
"50": "民进会员",
"60": "民革会员",
"70": "民盟会员",
"80": "民建会员",
"90": "农工党党员",
"100": "致公党党员",
"110": "台盟盟员",
"120": "九三学社社员",
"130": "无党派民主人士",
"140": "其他",
"empty": ""
},
SysOperator: {
"empty": "",
},
......@@ -8,19 +89,17 @@ export default {
"OTHER": "其他",
"empty": ""
},
CL_HR_0021: {
"CONTRACT": "劳动合同",
"LABOR": "劳务派遣合同",
"AGREEMENT": "协议",
"OTHER": "其他",
"empty": ""
},
CL_HR_0012: {
"FARM": "农业户口",
"NONFARM": "非农业户口",
"OTHER": "其他",
"empty": ""
},
CL_HR_0020: {
"FIRST": "初签",
"SECOND": "续签",
"empty": ""
},
WFStates: {
"0": "未启动",
"1": "流程中",
......@@ -44,14 +123,6 @@ export default {
"0": "否",
"empty": ""
},
CL_HR_0011: {
"SINGLE": "未婚",
"MARRIED": "已婚",
"WIDOWED": "丧偶",
"DIVORCED": "离异",
"OTHER": "其他",
"empty": ""
},
CL_HR_0004: {
"FULLTIME": "全职",
"PARTTIME": "兼职",
......@@ -64,14 +135,6 @@ export default {
"COMMERCIAL": "商业渠道",
"empty": ""
},
CL_HR_0003: {
"TEL": "电话",
"EMAIL": "电子邮件地址",
"WECHAT": "微信",
"QQ": "QQ",
"FAX": "传真",
"empty": ""
},
OrganizationType: {
"LEGAL": "法人",
"OPERATIONUNIT": "运营单位",
......@@ -97,27 +160,6 @@ export default {
"FEMALE": "女",
"empty": ""
},
CL_HR_0007: {
"A": "A",
"B": "B",
"AB": "AB",
"O": "O",
"其他": "其他",
"empty": ""
},
CL_HR_0014: {
"10": "博士后",
"20": "硕士研究生",
"30": "大学本科",
"40": "中等专科",
"50": "职业高中",
"60": "技工学校",
"70": "普通高中",
"80": "初中",
"90": "小学",
"100": "其他",
"empty": ""
},
CL_HR_0005: {
"HIGH": "高",
"MID": "中",
......@@ -128,27 +170,6 @@ export default {
"汉": "汉",
"empty": ""
},
CL_HR_0002: {
"BUSINESS": "业务",
"HOME": "家庭住址",
"REALLOCATION": "实际位置",
"RECRUIT": "招聘",
"SERVICE": "服务",
"HEADCOMPANY": "总公司",
"INVOICE": "发票",
"PAYMENT": "付款",
"REMIT": "汇款至",
"STATEMENT": "对帐单",
"CONSIGNMENT": "托运",
"DELIVERY": "交货",
"LADING": "装货",
"UNLADING": "卸货",
"OTHER": "其他",
"empty": ""
},
CL_HR_0016: {
"empty": "",
},
CL_HR_0015: {
"10": "校园招聘",
"20": "社会招聘",
......@@ -166,20 +187,4 @@ export default {
"60": "总部审核",
"empty": ""
},
CL_HR_0013: {
"10": "中共党员",
"30": "共青团员",
"40": "群众",
"50": "民进会员",
"60": "民革会员",
"70": "民盟会员",
"80": "民建会员",
"90": "农工党党员",
"100": "致公党党员",
"110": "台盟盟员",
"120": "九三学社社员",
"130": "无党派民主人士",
"140": "其他",
"empty": ""
},
};
\ No newline at end of file
app_PIM/src/locale/lanres/codelist/codelist_zh_CN.ts
浏览文件 @ 3c562804
export default {
CL_HR_0021: {
"CONTRACT": "劳动合同",
"LABOR": "劳务派遣合同",
"AGREEMENT": "协议",
"OTHER": "其他",
"empty": "",
},
CL_HR_0011: {
"SINGLE": "未婚",
"MARRIED": "已婚",
"WIDOWED": "丧偶",
"DIVORCED": "离异",
"OTHER": "其他",
"empty": "",
},
CL_HR_0003: {
"TEL": "电话",
"EMAIL": "电子邮件地址",
"WECHAT": "微信",
"QQ": "QQ",
"FAX": "传真",
"empty": "",
},
CL_HR_0007: {
"A": "A",
"B": "B",
"AB": "AB",
"O": "O",
"其他": "其他",
"empty": "",
},
CL_HR_0014: {
"10": "博士后",
"20": "硕士研究生",
"30": "大学本科",
"40": "中等专科",
"50": "职业高中",
"60": "技工学校",
"70": "普通高中",
"80": "初中",
"90": "小学",
"100": "其他",
"empty": "",
},
CL_HR_0002: {
"BUSINESS": "业务",
"HOME": "家庭住址",
"REALLOCATION": "实际位置",
"RECRUIT": "招聘",
"SERVICE": "服务",
"HEADCOMPANY": "总公司",
"INVOICE": "发票",
"PAYMENT": "付款",
"REMIT": "汇款至",
"STATEMENT": "对帐单",
"CONSIGNMENT": "托运",
"DELIVERY": "交货",
"LADING": "装货",
"UNLADING": "卸货",
"OTHER": "其他",
"empty": "",
},
CL_HR_0016: {
"empty": "",
},
CL_HR_0013: {
"10": "中共党员",
"30": "共青团员",
"40": "群众",
"50": "民进会员",
"60": "民革会员",
"70": "民盟会员",
"80": "民建会员",
"90": "农工党党员",
"100": "致公党党员",
"110": "台盟盟员",
"120": "九三学社社员",
"130": "无党派民主人士",
"140": "其他",
"empty": "",
},
SysOperator: {
"empty": "",
},
......@@ -8,19 +89,17 @@ export default {
"OTHER": "其他",
"empty": "",
},
CL_HR_0021: {
"CONTRACT": "劳动合同",
"LABOR": "劳务派遣合同",
"AGREEMENT": "协议",
"OTHER": "其他",
"empty": "",
},
CL_HR_0012: {
"FARM": "农业户口",
"NONFARM": "非农业户口",
"OTHER": "其他",
"empty": "",
},
CL_HR_0020: {
"FIRST": "初签",
"SECOND": "续签",
"empty": "",
},
WFStates: {
"0": "未启动",
"1": "流程中",
......@@ -44,14 +123,6 @@ export default {
"0": "否",
"empty": "",
},
CL_HR_0011: {
"SINGLE": "未婚",
"MARRIED": "已婚",
"WIDOWED": "丧偶",
"DIVORCED": "离异",
"OTHER": "其他",
"empty": "",
},
CL_HR_0004: {
"FULLTIME": "全职",
"PARTTIME": "兼职",
......@@ -64,14 +135,6 @@ export default {
"COMMERCIAL": "商业渠道",
"empty": "",
},
CL_HR_0003: {
"TEL": "电话",
"EMAIL": "电子邮件地址",
"WECHAT": "微信",
"QQ": "QQ",
"FAX": "传真",
"empty": "",
},
OrganizationType: {
"LEGAL": "法人",
"OPERATIONUNIT": "运营单位",
......@@ -97,27 +160,6 @@ export default {
"FEMALE": "女",
"empty": "",
},
CL_HR_0007: {
"A": "A",
"B": "B",
"AB": "AB",
"O": "O",
"其他": "其他",
"empty": "",
},
CL_HR_0014: {
"10": "博士后",
"20": "硕士研究生",
"30": "大学本科",
"40": "中等专科",
"50": "职业高中",
"60": "技工学校",
"70": "普通高中",
"80": "初中",
"90": "小学",
"100": "其他",
"empty": "",
},
CL_HR_0005: {
"HIGH": "高",
"MID": "中",
......@@ -128,27 +170,6 @@ export default {
"汉": "汉",
"empty": "",
},
CL_HR_0002: {
"BUSINESS": "业务",
"HOME": "家庭住址",
"REALLOCATION": "实际位置",
"RECRUIT": "招聘",
"SERVICE": "服务",
"HEADCOMPANY": "总公司",
"INVOICE": "发票",
"PAYMENT": "付款",
"REMIT": "汇款至",
"STATEMENT": "对帐单",
"CONSIGNMENT": "托运",
"DELIVERY": "交货",
"LADING": "装货",
"UNLADING": "卸货",
"OTHER": "其他",
"empty": "",
},
CL_HR_0016: {
"empty": "",
},
CL_HR_0015: {
"10": "校园招聘",
"20": "社会招聘",
......@@ -166,20 +187,4 @@ export default {
"60": "总部审核",
"empty": "",
},
CL_HR_0013: {
"10": "中共党员",
"30": "共青团员",
"40": "群众",
"50": "民进会员",
"60": "民革会员",
"70": "民盟会员",
"80": "民建会员",
"90": "农工党党员",
"100": "致公党党员",
"110": "台盟盟员",
"120": "九三学社社员",
"130": "无党派民主人士",
"140": "其他",
"empty": "",
},
};
\ No newline at end of file
app_PIM/src/locale/lanres/entities/hrcontract/hrcontract_en_US.ts
浏览文件 @ 3c562804
......@@ -23,6 +23,7 @@ export default {
contractsigntype: "签订类型",
memo: "备注",
contractsignnum: "合同签订次数",
attachment: "附件",
},
views: {
gridview: {
......@@ -45,6 +46,10 @@ export default {
caption: "合同信息",
title: "合同表格（全部合同）",
},
v_005: {
caption: "合同信息",
title: "合同信息",
},
v_003: {
caption: "合同信息",
title: "合同表格（全部合同）",
......@@ -56,10 +61,8 @@ export default {
},
main_form: {
details: {
group1: "合同信息基本信息",
group1: "合同信息",
formpage1: "基本信息",
group2: "操作信息",
formpage2: "其它",
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "合同信息标识",
......@@ -68,11 +71,22 @@ export default {
srfuf: "",
srfdeid: "",
srfsourcekey: "",
hrcontractname: "合同信息名称",
createman: "建立人",
createdate: "建立时间",
updateman: "更新人",
updatedate: "更新时间",
hremployeename: "员工姓名",
contractcode: "合同编号",
contractmode: "合同类别",
contracttype: "合同类型",
begintime: "开始日期",
endtime: "结束日期",
mgrorganizationname: "合同管理单位",
signorganizationname: "合同签约单位",
contractsigntype: "签订类型",
contractstate: "合同状态",
probationtime: "试用期",
attachment: "附件",
memo: "备注",
signorganizationid: "合同签约单位ID",
hremployeeid: "员工标识",
mgrorganizationid: "合同管理单位ID",
hrcontractid: "合同信息标识",
},
uiactions: {
......@@ -106,6 +120,55 @@ export default {
uiactions: {
},
},
waitsign_grid: {
columns: {
contractcode: "合同编号",
contractmode: "合同类别",
contracttype: "合同类型",
begintime: "开始日期",
endtime: "结束日期",
mgrorganizationname: "合同管理单位",
signorganizationname: "合同签约单位",
contractstate: "合同状态",
uagridcolumn1: "操作",
},
uiactions: {
hrcontract_sign: "续签",
hrcontract_stop: "终止",
},
},
waitstop_grid: {
columns: {
contractcode: "合同编号",
contractmode: "合同类别",
contracttype: "合同类型",
begintime: "开始日期",
endtime: "结束日期",
mgrorganizationname: "合同管理单位",
signorganizationname: "合同签约单位",
contractstate: "合同状态",
uagridcolumn1: "操作",
},
uiactions: {
hrcontract_stop: "终止",
},
},
active_grid: {
columns: {
contractcode: "合同编号",
contractmode: "合同类别",
contracttype: "合同类型",
begintime: "开始日期",
endtime: "结束日期",
mgrorganizationname: "合同管理单位",
signorganizationname: "合同签约单位",
contractstate: "合同状态",
uagridcolumn1: "操作",
},
uiactions: {
hrcontract_stop: "终止",
},
},
default_searchform: {
details: {
formpage1: "常规条件",
......
app_PIM/src/locale/lanres/entities/hrcontract/hrcontract_zh_CN.ts
浏览文件 @ 3c562804
......@@ -22,6 +22,7 @@ export default {
contractsigntype: "签订类型",
memo: "备注",
contractsignnum: "合同签订次数",
attachment: "附件",
},
views: {
gridview: {
......@@ -44,6 +45,10 @@ export default {
caption: "合同信息",
title: "合同表格（全部合同）",
},
v_005: {
caption: "合同信息",
title: "合同信息",
},
v_003: {
caption: "合同信息",
title: "合同表格（全部合同）",
......@@ -55,10 +60,8 @@ export default {
},
main_form: {
details: {
group1: "合同信息基本信息",
group1: "合同信息",
formpage1: "基本信息",
group2: "操作信息",
formpage2: "其它",
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "合同信息标识",
......@@ -67,11 +70,22 @@ export default {
srfuf: "",
srfdeid: "",
srfsourcekey: "",
hrcontractname: "合同信息名称",
createman: "建立人",
createdate: "建立时间",
updateman: "更新人",
updatedate: "更新时间",
hremployeename: "员工姓名",
contractcode: "合同编号",
contractmode: "合同类别",
contracttype: "合同类型",
begintime: "开始日期",
endtime: "结束日期",
mgrorganizationname: "合同管理单位",
signorganizationname: "合同签约单位",
contractsigntype: "签订类型",
contractstate: "合同状态",
probationtime: "试用期",
attachment: "附件",
memo: "备注",
signorganizationid: "合同签约单位ID",
hremployeeid: "员工标识",
mgrorganizationid: "合同管理单位ID",
hrcontractid: "合同信息标识",
},
uiactions: {
......@@ -105,6 +119,55 @@ export default {
uiactions: {
},
},
waitsign_grid: {
columns: {
contractcode: "合同编号",
contractmode: "合同类别",
contracttype: "合同类型",
begintime: "开始日期",
endtime: "结束日期",
mgrorganizationname: "合同管理单位",
signorganizationname: "合同签约单位",
contractstate: "合同状态",
uagridcolumn1: "操作",
},
uiactions: {
hrcontract_sign: "续签",
hrcontract_stop: "终止",
},
},
waitstop_grid: {
columns: {
contractcode: "合同编号",
contractmode: "合同类别",
contracttype: "合同类型",
begintime: "开始日期",
endtime: "结束日期",
mgrorganizationname: "合同管理单位",
signorganizationname: "合同签约单位",
contractstate: "合同状态",
uagridcolumn1: "操作",
},
uiactions: {
hrcontract_stop: "终止",
},
},
active_grid: {
columns: {
contractcode: "合同编号",
contractmode: "合同类别",
contracttype: "合同类型",
begintime: "开始日期",
endtime: "结束日期",
mgrorganizationname: "合同管理单位",
signorganizationname: "合同签约单位",
contractstate: "合同状态",
uagridcolumn1: "操作",
},
uiactions: {
hrcontract_stop: "终止",
},
},
default_searchform: {
details: {
formpage1: "常规条件",
......
app_PIM/src/locale/lanres/entities/hremployee/hremployee_en_US.ts
浏览文件 @ 3c562804
......@@ -234,7 +234,7 @@ export default {
uiactions: {
},
},
grid_001_grid: {
main_grid: {
columns: {
employeecode: "员工编号",
employeename: "员工姓名",
......@@ -247,13 +247,11 @@ export default {
mobile: "移动电话",
email: "电子邮箱",
empstate: "员工状态",
uagridcolumn1: "操作",
},
uiactions: {
hremployee_signcontract: "新签",
},
},
main_grid: {
grid_001_grid: {
columns: {
employeecode: "员工编号",
employeename: "员工姓名",
......@@ -266,8 +264,10 @@ export default {
mobile: "移动电话",
email: "电子邮箱",
empstate: "员工状态",
uagridcolumn1: "操作",
},
uiactions: {
hremployee_signcontract: "新签",
},
},
default_searchform: {
......@@ -277,6 +277,20 @@ export default {
uiactions: {
},
},
v_007toolbar_toolbar: {
tbitem13: {
caption: "Export",
tip: "Export {0} Data To Excel",
},
tbitem12: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "Filter",
tip: "Filter",
},
},
editviewtoolbar_toolbar: {
tbitem1: {
caption: "Save And Close",
......@@ -313,28 +327,6 @@ export default {
tip: "关闭",
},
},
v_007toolbar_toolbar: {
tbitem1_ff_002: {
caption: "新建",
tip: "新建",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "Export",
tip: "Export {0} Data To Excel",
},
tbitem12: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "Filter",
tip: "Filter",
},
},
v_006toolbar_toolbar: {
tbitem1_ff_002: {
caption: "新建",
......
app_PIM/src/locale/lanres/entities/hremployee/hremployee_zh_CN.ts
浏览文件 @ 3c562804
......@@ -233,7 +233,7 @@ export default {
uiactions: {
},
},
grid_001_grid: {
main_grid: {
columns: {
employeecode: "员工编号",
employeename: "员工姓名",
......@@ -246,13 +246,11 @@ export default {
mobile: "移动电话",
email: "电子邮箱",
empstate: "员工状态",
uagridcolumn1: "操作",
},
uiactions: {
hremployee_signcontract: "新签",
},
},
main_grid: {
grid_001_grid: {
columns: {
employeecode: "员工编号",
employeename: "员工姓名",
......@@ -265,8 +263,10 @@ export default {
mobile: "移动电话",
email: "电子邮箱",
empstate: "员工状态",
uagridcolumn1: "操作",
},
uiactions: {
hremployee_signcontract: "新签",
},
},
default_searchform: {
......@@ -276,6 +276,20 @@ export default {
uiactions: {
},
},
v_007toolbar_toolbar: {
tbitem13: {
caption: "导出",
tip: "导出",
},
tbitem12: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "过滤",
tip: "过滤",
},
},
editviewtoolbar_toolbar: {
tbitem1: {
caption: "保存并关闭",
......@@ -312,28 +326,6 @@ export default {
tip: "关闭",
},
},
v_007toolbar_toolbar: {
tbitem1_ff_002: {
caption: "新建",
tip: "新建",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "导出",
tip: "导出",
},
tbitem12: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "过滤",
tip: "过滤",
},
},
v_006toolbar_toolbar: {
tbitem1_ff_002: {
caption: "新建",
......
app_PIM/src/mock/viewconfig/viewconfig.ts
浏览文件 @ 3c562804
......@@ -727,6 +727,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "HROrganizationEditView",
"viewtag": "b4ef4b87eb87fc3a2a8479027d62ac4c"
},
"hrcontractv_005": {
"title": "合同信息",
"caption": "合同信息",
"viewtype": "DEOPTVIEW",
"viewmodule": "HumanResource",
"viewname": "HRContractV_005",
"viewtag": "b748e4bd87b9d77bfc24835a2e5e96c9"
},
"hrtransferapplyv_006": {
"title": "调动申请编辑视图",
"caption": "调动预览",
......
app_PIM/src/pages/human-resource/hrcontract-grid-view/hrcontract-grid-view-base.tsx
浏览文件 @ 3c562804
......@@ -569,16 +569,28 @@ export class HRContractGridViewBase extends GridViewBase {
}
const parameters: any[] = [
{ pathName: 'hrcontracts', parameterName: 'hrcontract' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const _data: any = { w: (new Date().getTime()) };
Object.assign(_data, data);
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
this.$router.push(routePath);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
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: 'hrcontract-v-005',
height: 0,
width: 1024,
title: this.$t('entities.hrcontract.views.v_005.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......@@ -608,14 +620,28 @@ export class HRContractGridViewBase extends GridViewBase {
}
const parameters: any[] = [
{ pathName: 'hrcontracts', parameterName: 'hrcontract' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
this.$router.push(routePath);
}
openIndexViewTab(data);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
const view: any = {
viewname: 'hrcontract-v-005',
height: 0,
width: 1024,
title: this.$t('entities.hrcontract.views.v_005.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......
app_PIM/src/pages/human-resource/hrcontract-v-002/hrcontract-v-002-base.tsx
浏览文件 @ 3c562804
......@@ -344,16 +344,28 @@ export class HRContractV_002Base extends GridViewBase {
}
const parameters: any[] = [
{ pathName: 'hrcontracts', parameterName: 'hrcontract' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const _data: any = { w: (new Date().getTime()) };
Object.assign(_data, data);
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
this.$router.push(routePath);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
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: 'hrcontract-v-005',
height: 0,
width: 1024,
title: this.$t('entities.hrcontract.views.v_005.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......@@ -383,14 +395,28 @@ export class HRContractV_002Base extends GridViewBase {
}
const parameters: any[] = [
{ pathName: 'hrcontracts', parameterName: 'hrcontract' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
this.$router.push(routePath);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
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: 'hrcontract-v-005',
height: 0,
width: 1024,
title: this.$t('entities.hrcontract.views.v_005.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......
app_PIM/src/pages/human-resource/hrcontract-v-002/hrcontract-v-002.vue
浏览文件 @ 3c562804
......@@ -3,7 +3,7 @@
import { Component } from 'vue-property-decorator';
import { VueLifeCycleProcessing } from '@/studio-core';
import { HRContractV_002Base } from './hrcontract-v-002-base';
import view_grid from '@widgets/hrcontract/main-grid/main-grid.vue';
import view_grid from '@widgets/hrcontract/wait-sign-grid/wait-sign-grid.vue';
import view_searchform from '@widgets/hrcontract/default-searchform/default-searchform.vue';
/**
......
app_PIM/src/pages/human-resource/hrcontract-v-003/hrcontract-v-003-base.tsx
浏览文件 @ 3c562804
......@@ -344,16 +344,28 @@ export class HRContractV_003Base extends GridViewBase {
}
const parameters: any[] = [
{ pathName: 'hrcontracts', parameterName: 'hrcontract' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const _data: any = { w: (new Date().getTime()) };
Object.assign(_data, data);
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
this.$router.push(routePath);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
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: 'hrcontract-v-005',
height: 0,
width: 1024,
title: this.$t('entities.hrcontract.views.v_005.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......@@ -383,14 +395,28 @@ export class HRContractV_003Base extends GridViewBase {
}
const parameters: any[] = [
{ pathName: 'hrcontracts', parameterName: 'hrcontract' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
this.$router.push(routePath);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
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: 'hrcontract-v-005',
height: 0,
width: 1024,
title: this.$t('entities.hrcontract.views.v_005.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......
app_PIM/src/pages/human-resource/hrcontract-v-003/hrcontract-v-003.vue
浏览文件 @ 3c562804
......@@ -3,7 +3,7 @@
import { Component } from 'vue-property-decorator';
import { VueLifeCycleProcessing } from '@/studio-core';
import { HRContractV_003Base } from './hrcontract-v-003-base';
import view_grid from '@widgets/hrcontract/main-grid/main-grid.vue';
import view_grid from '@widgets/hrcontract/wait-stop-grid/wait-stop-grid.vue';
import view_searchform from '@widgets/hrcontract/default-searchform/default-searchform.vue';
/**
......
app_PIM/src/pages/human-resource/hrcontract-v-004/hrcontract-v-004-base.tsx
浏览文件 @ 3c562804
......@@ -344,16 +344,28 @@ export class HRContractV_004Base extends GridViewBase {
}
const parameters: any[] = [
{ pathName: 'hrcontracts', parameterName: 'hrcontract' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const _data: any = { w: (new Date().getTime()) };
Object.assign(_data, data);
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
this.$router.push(routePath);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
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: 'hrcontract-v-005',
height: 0,
width: 1024,
title: this.$t('entities.hrcontract.views.v_005.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......@@ -383,14 +395,28 @@ export class HRContractV_004Base extends GridViewBase {
}
const parameters: any[] = [
{ pathName: 'hrcontracts', parameterName: 'hrcontract' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
this.$router.push(routePath);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
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: 'hrcontract-v-005',
height: 0,
width: 1024,
title: this.$t('entities.hrcontract.views.v_005.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......
app_PIM/src/pages/human-resource/hrcontract-v-004/hrcontract-v-004.vue
浏览文件 @ 3c562804
......@@ -3,7 +3,7 @@
import { Component } from 'vue-property-decorator';
import { VueLifeCycleProcessing } from '@/studio-core';
import { HRContractV_004Base } from './hrcontract-v-004-base';
import view_grid from '@widgets/hrcontract/main-grid/main-grid.vue';
import view_grid from '@widgets/hrcontract/active-grid/active-grid.vue';
import view_searchform from '@widgets/hrcontract/default-searchform/default-searchform.vue';
/**
......
app_PIM/src/pages/human-resource/hrcontract-v-005/hrcontract-v-005.html 0 → 100644
浏览文件 @ 3c562804
<studio-view-style2 viewName="hrcontractv_005" viewTitle="合同信息" class='deoptview hrcontract-v-005'>
<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>
&nbsp;&nbsp;
<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_PIM/src/pages/human-resource/hrcontract-v-005/hrcontract-v-005.vue 0 → 100644
浏览文件 @ 3c562804
<template src="./hrcontract-v-005.html"/>
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import { VueLifeCycleProcessing } from '@/studio-core';
import { HRContractV_005Base } from './hrcontract-v-005-base';
import view_form from '@widgets/hrcontract/main-form/main-form.vue';
/**
* 合同信息视图
*
* @export
* @class HRContractV_005
* @extends {HRContractV_005Base}
*/
@Component({
components: {
view_form,
}
})
@VueLifeCycleProcessing()
export default class HRContractV_005 extends HRContractV_005Base { }
</script>
app_PIM/src/pages/human-resource/hremployee-v-007/hremployee-v-007-base.tsx
浏览文件 @ 3c562804
......@@ -103,9 +103,6 @@ export class HREmployeeV_007Base extends GridViewBase {
* @memberof HREmployeeV_007
*/
public toolBarModels: any = {
tbitem1_ff_002: { name: 'tbitem1_ff_002', caption: '新建', 'isShowCaption': true, 'isShowIcon': true, tooltip: '新建', iconcls: 'fa fa-user-plus', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FF_002', target: 'NONE', class: '' } },
tbitem9: { name: 'tbitem9', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem13: { name: 'tbitem13', caption: '导出', 'isShowCaption': true, 'isShowIcon': true, tooltip: '导出', iconcls: 'fa fa-file-excel-o', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'ExportExcel', target: '' }, MaxRowCount: 1000, class: '' },
tbitem12: { name: 'tbitem12', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
......@@ -165,9 +162,6 @@ export class HREmployeeV_007Base extends GridViewBase {
* @memberof HREmployeeV_007Base
*/
public toolbar_click($event: any, $event2?: any): void {
if (Object.is($event.tag, 'tbitem1_ff_002')) {
this.toolbar_tbitem1_ff_002_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem13')) {
this.toolbar_tbitem13_click(null, '', $event2);
}
......@@ -264,35 +258,6 @@ export class HREmployeeV_007Base extends GridViewBase {
this.engine.onCtrlEvent('searchform', 'load', $event);
}
/**
* 逻辑事件
*
* @param {*} [params={}]
* @param {*} [tag]
* @param {*} [$event]
* @memberof
*/
public toolbar_tbitem1_ff_002_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
let xData: any = null;
// _this 指向容器对象
const _this: any = this;
let paramJO:any = {};
let contextJO:any = {};
xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
const curUIService:HREmployeeUIService = new HREmployeeUIService();
curUIService.HREmployee_FF_002(datas,contextJO, paramJO, $event, xData,this,"HREmployee");
}
/**
* 逻辑事件
*
......
app_PIM/src/pages/ungroup/pim/page-register.ts
浏览文件 @ 3c562804
......@@ -15,8 +15,8 @@ export const PageComponents = {
Vue.component('hremployee-pickup-grid-view', () => import('@pages/human-resource/hremployee-pickup-grid-view/hremployee-pickup-grid-view.vue'));
Vue.component('hrcontract-grid-view', () => import('@pages/human-resource/hrcontract-grid-view/hrcontract-grid-view.vue'));
Vue.component('hromhierarchy-tree-exp-view', () => import('@pages/base/hromhierarchy-tree-exp-view/hromhierarchy-tree-exp-view.vue'));
Vue.component('hrpost-v-006', () => import('@pages/human-resource/hrpost-v-006/hrpost-v-006.vue'));
Vue.component('hrlegal-grid-view', () => import('@pages/base/hrlegal-grid-view/hrlegal-grid-view.vue'));
Vue.component('hrpost-v-006', () => import('@pages/human-resource/hrpost-v-006/hrpost-v-006.vue'));
Vue.component('hrlegal-v-002', () => import('@pages/base/hrlegal-v-002/hrlegal-v-002.vue'));
Vue.component('hrcontract-tab-exp-view', () => import('@pages/human-resource/hrcontract-tab-exp-view/hrcontract-tab-exp-view.vue'));
Vue.component('hremployee-v-003', () => import('@pages/human-resource/hremployee-v-003/hremployee-v-003.vue'));
......@@ -60,6 +60,7 @@ export const PageComponents = {
Vue.component('hrpost-grid-view', () => import('@pages/human-resource/hrpost-grid-view/hrpost-grid-view.vue'));
Vue.component('hrwork-record-edit-view', () => import('@pages/human-resource/hrwork-record-edit-view/hrwork-record-edit-view.vue'));
Vue.component('hremployee-v-004', () => import('@pages/human-resource/hremployee-v-004/hremployee-v-004.vue'));
Vue.component('hrcontract-v-005', () => import('@pages/human-resource/hrcontract-v-005/hrcontract-v-005.vue'));
Vue.component('hrpost-v-002', () => import('@pages/human-resource/hrpost-v-002/hrpost-v-002.vue'));
Vue.component('hremployee-v-005', () => import('@pages/human-resource/hremployee-v-005/hremployee-v-005.vue'));
Vue.component('hrdistribution-edit-view', () => import('@pages/human-resource/hrdistribution-edit-view/hrdistribution-edit-view.vue'));
......
config.xml
浏览文件 @ 3c562804
此差异已折叠。
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或