添加功能

This commit is contained in:
zhou
2025-01-19 20:08:48 +08:00
parent b51f320dba
commit 35bfe16a4f
33 changed files with 126 additions and 127 deletions
@@ -96,6 +96,7 @@ class HrLeaveAllocation(models.Model):
'default_users_id': self.employee_id.user_id.id,
'default_leave_id': self.id,
'default_now_type': now_type,
'default_holiday_status_id': self.holiday_status_id.id,
'default_original_days': self.number_of_days_display,
'default_original_hours': self.number_of_days_display,
}
@@ -16,6 +16,7 @@ class YuthonFixesApproval(models.Model):
now_type = fields.Selection([('days', '按天'), ('hours', '按小时')], string="修正类型")
now_days = fields.Float(string="现休假时长(天)")
now_hours = fields.Float(string="现休假时长(小时)")
holiday_status_id = fields.Many2one('hr.leave.type', string="休假类型")
department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
is_issues = fields.Boolean(string='是否上会')
related_issues_id = fields.Many2one('issue.library', string="关联议题")
@@ -18,21 +18,28 @@
<field name="arch" type="xml">
<form string="假期修正审批">
<sheet>
<button name="bottom_allocation" string="修正申请" type="object"/>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<group string="个人信息" col="2">
<group>
<field name="users_id"/>
<field name="is_issues" invisible="1"/>
<field name="related_issues_id" invisible="not is_issues"/>
</group>
<group string="审批事项">
<group>
<field name="name"/>
<field name="holiday_status_id"/>
<field name="original_days" invisible="now_type != 'days'"/>
<field name="now_days" invisible="now_type != 'days'"/>
<field name="original_hours" invisible="now_type != 'hours'"/>
<field name="now_hours" invisible="now_type != 'hours'"/>
<field name="reason_application"/>
<field name="documents_ids" widget="preview_many2many"/>
</group>
</group>
<group>
<group>
<field name="users_id" invisible="1"/>
<field name="is_issues" invisible="1"/>
<field name="related_issues_id" invisible="not is_issues"/>
</group>
<group>
<field name="remarks" invisible="1"/>
<field name="yuthon_company" invisible="1"/>
<field name="department_id" invisible="1"/>
@@ -40,14 +47,6 @@
<field name="leave_id" invisible="1"/>
</group>
</group>
<group string="审批事项">
<group>
<field name="name"/>
<field name="code"/>
<field name="reason_application"/>
<field name="documents_ids" widget="preview_many2many"/>
</group>
</group>
</sheet>
</form>
</field>
+5 -9
View File
@@ -21,11 +21,11 @@
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<div class="col-12 text-center">
<h1>
<field name="name" required="1" placeholder="请输入标题"/>
</h1>
</div>
<group string="审批事项">
<field name="name"/>
<field name="reason_application"/>
<field name="documents_ids" widget="preview_many2many"/>
</group>
<group string="个人信息" col="4">
<group>
<field name="users_id"/>
@@ -42,10 +42,6 @@
<field name="shift_name"/>
</group>
</group>
<group string="审批事项">
<field name="reason_application"/>
<field name="documents_ids" widget="preview_many2many"/>
</group>
</sheet>
</form>
</field>
@@ -30,6 +30,12 @@
<field name="name" required="1" placeholder="请输入标题"/>
</h1>
</div>
<group string="审批事项">
<field name="reason_application"/>
<field name="documents_ids" widget="preview_many2many"/>
<field name="is_issues"/>
<field name="related_issues_id" invisible="not is_issues"/>
</group>
<group>
<group>
<field name="users_id"/>
@@ -46,12 +52,6 @@
<field name="overtime_hours"/>
</group>
</group>
<group string="审批事项">
<field name="reason_application"/>
<field name="documents_ids" widget="preview_many2many"/>
<field name="is_issues"/>
<field name="related_issues_id" invisible="not is_issues"/>
</group>
</sheet>
</form>
</field>
@@ -21,6 +21,13 @@
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<group string="审批事项">
<group>
<field name="name"/>
<field name="reason_application"/>
<field name="documents_ids" widget="preview_many2many"/>
</group>
</group>
<group string="个人信息" col="2">
<group>
<field name="users_id"/>
@@ -32,13 +39,6 @@
<field name="department_id"/>
</group>
</group>
<group string="审批事项">
<group>
<field name="name"/>
<field name="reason_application"/>
<field name="documents_ids" widget="preview_many2many"/>
</group>
</group>
</sheet>
</form>
</field>
@@ -21,6 +21,13 @@
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<group string="审批事项">
<group>
<field name="name"/>
<field name="reason_application"/>
<field name="documents_ids" widget="preview_many2many"/>
</group>
</group>
<group string="个人信息" col="2">
<group>
<field name="users_id"/>
@@ -33,13 +40,6 @@
<field name="department_id"/>
</group>
</group>
<group string="审批事项">
<group>
<field name="name"/>
<field name="reason_application"/>
<field name="documents_ids" widget="preview_many2many"/>
</group>
</group>
</sheet>
</form>
</field>
@@ -19,12 +19,11 @@
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<div class="oe_title">
<label for="name"/>
<h1>
<field name="name" required="1"/>
</h1>
</div>
<group string="审批事项">
<field name="name"/>
<field name="reason_application"/>
<field name="documents_ids" widget="preview_many2many"/>
</group>
<group string="个人信息" col="2">
<group>
<field name="users_id"/>
@@ -37,10 +36,6 @@
<field name="department_id" invisible="1"/>
</group>
</group>
<group string="审批事项">
<field name="reason_application"/>
<field name="documents_ids" widget="preview_many2many"/>
</group>
</sheet>
</form>
</field>
@@ -59,5 +59,5 @@ class YuthonAppointmentResultIsDetailed(models.Model):
is_other = fields.Boolean(string="新增其他专业职称")
cert_code = fields.Char(string="证书编号")
notice_documents_ids = fields.Many2many('documents.document', string="附件")
notice_documents_ids = fields.Many2many('ir.attachment', string="附件")
remarks = fields.Char(string="备注")
@@ -25,7 +25,7 @@ class YuthonLeavingApproval(models.Model):
use_user_type = fields.Selection(related="users_id.employee_id.use_user_type", string="聘用形式")
type_resignation = fields.Selection([('1', '个人辞职'), ('2', '被动离职')], string="辞职类型")
application_data = fields.Date(string="申请日期")
notice_documents_ids= fields.Many2many('documents.document', string="辞职申请")
notice_documents_ids= fields.Many2many('ir.attachment', string="辞职申请")
resignation_reason = fields.Text(string="辞职原因")
is_issues = fields.Boolean(string='是否上会')
related_issues_id = fields.Many2one('issue.library', string="关联议题")
@@ -35,7 +35,7 @@ class YuthonReassignmentApproval(models.Model):
handover_date = fields.Date(string="移交日期")
handover_person_id = fields.Many2one("hr.employee", string="工作接交人")
notification_change_id = fields.Many2one("hr.employee", string="异动告知人员")
notice_documents_ids = fields.Many2many('documents.document', string="附件")
notice_documents_ids = fields.Many2many('ir.attachment', string="附件")
change_parent_id = fields.Many2one("hr.employee", string="直线上级")
change_business_superior_id = fields.Many2one("hr.employee", string="业务上级")
change_duties = fields.Char(string="职务")
@@ -33,7 +33,7 @@ class YuthonRegularizationPrepareApproval(models.Model):
self_evaluation = fields.Text(string="自我评价")
employee_pros = fields.Text(string="员工优点")
improvements = fields.Text(string="需改进事项")
notice_documents_ids = fields.Many2many('documents.document', string="考核文档")
notice_documents_ids = fields.Many2many('ir.attachment', string="考核文档")
#转正结果
positive_results = fields.Char(string="转正结果")
positive_date = fields.Date(string="转正日期")
@@ -18,7 +18,7 @@ class YuthonRewardApproval(models.Model):
department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
entrant_date = fields.Date(string="录入日期")
entrant_illustrate = fields.Text(string="录入说明")
notice_documents_ids = fields.Many2many('documents.document', string="附件")
notice_documents_ids = fields.Many2many('ir.attachment', string="附件")
is_issues = fields.Boolean(string='是否上会')
related_issues_id = fields.Many2one('issue.library', string="关联议题")
reward_results_ids = fields.One2many('yuthon.reward.punishment.details', 'reward_punishment_id', string="奖罚明细")
@@ -13,7 +13,7 @@ class YuthonServiceApproval(models.Model):
service_type = fields.Selection([('done', '在职证明'), ('leaving', '离职证明'), ('income', '收入类型')], string="服务类型")
users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
tenant_user_card = fields.Char(string="身份证")
tenant_user_card = fields.Many2one('ir.attachment', string="身份证")
onboarding_time = fields.Date(string="入职时间")
job_id = fields.Many2one('hr.job', string="岗位")
reason_issuance = fields.Char(string="开证原因")
@@ -27,7 +27,8 @@ class YutransferApproval(models.Model):
handover_person_id = fields.Many2one("hr.employee", string="工作接交人")
notification_change_id = fields.Many2one("hr.employee", string="告知人员")
handover_reason = fields.Text(string="移交原因")
notice_documents_ids = fields.Many2many('documents.document', string="附件")
notice_documents_ids = fields.Many2many('ir.attachment', string="附件")
reason = fields.Html(string="正文")
is_issues = fields.Boolean(string='是否上会')
related_issues_id = fields.Many2one('issue.library', string="关联议题")
transfer_ids = fields.One2many('yuthon.transfer.infor.detail.lines', 'transfer_id')
@@ -55,7 +55,7 @@
<field name="appointment_name"/>
<field name="grade"/>
<field name="remarks"/>
<field name="notice_documents_ids"/>
<field name="notice_documents_ids" widget="preview_many2many"/>
</tree>
</field>
</page>
@@ -54,7 +54,7 @@
<field name="application_data"/>
</group>
<group>
<field name="notice_documents_ids" widget="many2many_tags"/>
<field name="notice_documents_ids" widget="preview_many2many"/>
</group>
<group>
<field name="resignation_reason"/>
@@ -82,7 +82,7 @@
<field name="notification_change_id"/>
</group>
<group>
<field name="notice_documents_ids" widget="many2many_tags"/>
<field name="notice_documents_ids" widget="preview_many2many"/>
</group>
</group>
<notebook>
@@ -20,6 +20,11 @@
<group>
<field name="code" string="流水号" readonly="1"/>
</group>
<group string="审批事项">
<field name="name" required="1"/>
<field name="reason"/>
<field name="notice_documents_ids" widget="preview_many2many"/>
</group>
<group col="2" string="个人信息">
<group>
<field name="users_id" readonly="1"/>
@@ -31,11 +36,6 @@
<field name="related_issues_id" invisible="not is_issues"/>
</group>
</group>
<group string="审批事项">
<field name="name" required="1"/>
<field name="reason"/>
<field name="notice_documents_ids" widget="preview_many2many"/>
</group>
<notebook>
<page string="岗位">
<field name="recruitment_ids" string=" ">
@@ -58,7 +58,7 @@
</group>
<group>
<field name="scoring_system"/>
<field name="notice_documents_ids" widget="many2many_tags"/>
<field name="notice_documents_ids" widget="preview_many2many"/>
</group>
<group>
<field name="appraisal_total"/>
@@ -23,6 +23,10 @@
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<group string="审批事项">
<field name="name"/>
<field name="notice_documents_ids" widget="preview_many2many" string="议题附件"/>
</group>
<group string="基础信息" col="3">
<group>
<field name="yuthon_company" invisible="1"/>
@@ -38,10 +42,6 @@
<field name="related_issues_id" invisible="not is_issues"/>
</group>
</group>
<group string="审批事项">
<field name="name"/>
<field name="notice_documents_ids" widget="many2many_tags" string="议题附件"/>
</group>
<notebook>
<page string="奖励结果">
<field name="reward_results_ids" string=" ">
@@ -23,27 +23,27 @@
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<group string="审批事项">
<field name="name" required="1"/>
<field name="issue_text"/>
</group>
<group col="3" string="个人信息">
<group>
<field name="service_type"/>
<field name="reason_issuance"/>
<field name="is_issues"/>
<field name="related_issues_id" invisible="not is_issues"/>
</group>
<group>
<field name="users_id"/>
<field name="job_id"/>
<field name="is_issues"/>
<field name="related_issues_id" invisible="not is_issues"/>
<field name="tenant_user_card" widget="preview_many2one"/>
</group>
<group>
<field name="department_id"/>
<field name="tenant_user_card"/>
<field name="onboarding_time"/>
</group>
</group>
<group string="审批事项">
<field name="name" required="1"/>
<field name="issue_text"/>
</group>
</sheet>
</form>
</field>
@@ -23,6 +23,12 @@
<sheet>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<group string="审批事项">
<field name="name" required="1"/>
<field name="reason" required="1"/>
<field name="issue_text"/>
<field name="notice_documents_ids" widget="preview_many2many"/>
</group>
<group col="4" string="员工信息">
<group>
@@ -57,11 +63,6 @@
<field name="notification_change_id"/>
</group>
</group>
<group string="审批事项">
<field name="name" required="1"/>
<field name="issue_text"/>
<field name="notice_documents_ids" widget="many2many_tags"/>
</group>
<notebook>
<page string="移交事项">
<field name="transfer_ids">
+5 -5
View File
@@ -25,6 +25,11 @@
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<group string="审批事项">
<field name="name" required="1"/>
<field name="issue_text"/>
<field name="notice_documents_ids" widget="preview_many2many"/>
</group>
<group col="4" string="个人信息">
<group>
<field name="employee_id"/>
@@ -40,11 +45,6 @@
<field name="department_id"/>
</group>
</group>
<group string="审批事项">
<field name="name" required="1"/>
<field name="issue_text"/>
<field name="notice_documents_ids" widget="preview_many2many"/>
</group>
<group>
<field name="issue_display" widget="json_template" invisible="1"/>
<field name="decision_display" widget="json_template" invisible="1"/>
@@ -23,7 +23,7 @@ class YuthonLesseeNotice(models.Model):
end_date = fields.Date(string="终止日期")
sequence = fields.Integer(string="顺序", default=1, compute='_compute_sequence')
notice_state = fields.Selection([('no', '未发布'), ('yes', '已发布'), ('stop', '已终止')], default='no', string="公告状态")
notice_documents_ids = fields.Many2many('documents.document', string="附件")
notice_documents_ids = fields.Many2many('ir.attachment', string="附件")
is_notice_roger = fields.Selection([('yes', '已读'), ('no', '未读')], default='no', string="确认状态")
is_change_notice = fields.Boolean(string="是否发送通知", default=True)
attn_notice = fields.Html(string="经办人意见")
@@ -50,7 +50,7 @@
<group>
<field name="name"/>
<field name="notice_text" widget="tinymce"/>
<field name="notice_documents_ids" widget="many2many_tags"/>
<field name="notice_documents_ids" widget="preview_many2many"/>
</group>
<group col="3">
<group>
@@ -16,6 +16,14 @@
<field name="arch" type="xml">
<form string="承租资格审批">
<sheet>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<group string="审批事项">
<field name="name" required="1"/>
<field name="reason"/>
<field name="notice_documents_ids" widget="preview_many2many"/>
</group>
<group col="2" string="个人信息">
<group>
<field name="users_id"/>
@@ -24,16 +32,10 @@
<field name="yuthon_company" invisible="1"/>
</group>
<group>
<field name="code"/>
<field name="is_issues"/>
<field name="related_issues_id" invisible="not is_issues"/>
</group>
</group>
<group string="审批事项">
<field name="name" required="1"/>
<field name="reason"/>
<field name="notice_documents_ids" widget="preview_many2many"/>
</group>
<notebook>
<page string="承租方列表">
<field name="eligibility_ids">
@@ -23,20 +23,15 @@
<header>
<button name="put_property_record" type="object" string="提交备案申请" class="oe_highlight"/>
</header>
<group col="2">
<group>
<field name="code"/>
</group>
<group>
<field name="is_meet" invisible="1"/>
<field name="is_experts"/>
</group>
</group>
<group string="审批事项">
<field name="name" required="1"/>
<field name="main_text"/>
<field name="notice_documents_ids" widget="preview_many2many"/>
</group>
<group>
<field name="is_meet" invisible="1"/>
<field name="is_experts"/>
</group>
<notebook>
<page string="评估项目详情">
<field name="evaluate_application_ids">
@@ -17,6 +17,14 @@
<field name="arch" type="xml">
<form>
<sheet>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<group string="审批事项">
<field name="name" required="1"/>
<field name="reason"/>
<field name="notice_documents_ids" widget="preview_many2many"/>
</group>
<group col="2" string="个人信息">
<group>
<field name="users_id"/>
@@ -24,15 +32,9 @@
<field name="yuthon_company" invisible="1"/>
</group>
<group>
<field name="code"/>
<field name="is_issues"/>
<field name="related_issues_id" invisible="not is_issues"/>
</group>
</group>
<group string="审批事项">
<field name="name" required="1"/>
<field name="reason"/>
<field name="notice_documents_ids" widget="preview_many2many"/>
</group>
<notebook>
<page string="意向客户信息">
@@ -22,9 +22,11 @@
<header>
<button name="put_merge_message" type="object" string="按钮" class="oe_highlight"/>
</header>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<group string="审批事项">
<field name="name"/>
<field name="code"/>
<field name="reason"/>
<field name="is_issues" invisible="1"/>
<field name="notice_documents_ids" widget="preview_many2many"/>
@@ -22,9 +22,11 @@
<header>
<button name="put_split_message" type="object" string="按钮" class="oe_highlight"/>
</header>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<group string="审批事项">
<field name="name"/>
<field name="code"/>
<field name="reason"/>
<field name="is_issues" invisible="1"/>
<field name="notice_documents_ids" widget="preview_many2many"/>
@@ -17,6 +17,11 @@
<field name="arch" type="xml">
<form string="物业移交">
<sheet>
<group string="审批事项">
<field name="name" required="1"/>
<field name="reason"/>
<field name="notice_documents_ids" widget="preview_many2many"/>
</group>
<group col="2" string="个人信息">
<group>
<field name="users_id"/>
@@ -29,11 +34,6 @@
<field name="is_issues"/>
<field name="related_issues_id" invisible="not is_issues"/>
</group>
</group>
<group string="审批事项">
<field name="name" required="1"/>
<field name="reason"/>
<field name="notice_documents_ids" widget="preview_many2many"/>
</group>
<group string="物业信息">
<group>
@@ -20,10 +20,17 @@
<field name="arch" type="xml">
<form string="办公用品申请">
<sheet>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<group string="审批事项">
<field name="name"/>
<field name="date"/>
<field name="reason_application"/>
</group>
<group string="申请人信息" col="3">
<group>
<field name="users_id"/>
<field name="code"/>
<field name="is_issues"/>
<field name="related_issues_id" invisible="not is_issues"/>
</group>
@@ -35,11 +42,6 @@
<field name="yuthon_company"/>
</group>
</group>
<group string="审批事项">
<field name="name"/>
<field name="date"/>
<field name="reason_application"/>
</group>
<notebook>
<page string="办公用品申请明细">
<field name="office_supplies_ids">