pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
李鹏宇
2025-04-20 21:48:09 +08:00
parent 2ca47cfb1d
commit ac01e4516d
5 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soong_workflow/i18n/zh_CN.po
+6 -6
View File
@@ -419,12 +419,12 @@ msgid "Last Updated by"
msgstr "最后更新人"
#. module: soong_workflow
#: model:ir.model.fields,field_description:soong_workflow.field_soong_workflow__write_date
#: model:ir.model.fields,field_description:soong_workflow.field_soong_workflow_link__write_date
#: model:ir.model.fields,field_description:soong_workflow.field_soong_workflow_node__write_date
#: model:ir.model.fields,field_description:soong_workflow.field_soong_workflow_node_button__write_date
#: model:ir.model.fields,field_description:soong_workflow.field_soong_workflow_node_field__write_date
#: model:ir.model.fields,field_description:soong_workflow.field_soong_workflow_record__write_date
#: model:ir.model.fields,field_description:soong_workflow.field_soong_workflow__write_date2
#: model:ir.model.fields,field_description:soong_workflow.field_soong_workflow_link__write_date2
#: model:ir.model.fields,field_description:soong_workflow.field_soong_workflow_node__write_date2
#: model:ir.model.fields,field_description:soong_workflow.field_soong_workflow_node_button__write_date2
#: model:ir.model.fields,field_description:soong_workflow.field_soong_workflow_node_field__write_date2
#: model:ir.model.fields,field_description:soong_workflow.field_soong_workflow_record__write_date2
msgid "Last Updated on"
msgstr "最后更新日期"
soong_workflow/models/soong_workflow_mixin.py
+7 -6
View File
@@ -322,13 +322,14 @@ class SoongWorkflowMixin(models.AbstractModel):
"done_by": self.env.uid,
"users_ids": [(4, current_user_id)],
"employee_ids": self.env.user.employee_id,
"write_date": fields.Datetime.now(),
"write_date2": fields.Datetime.now(),
})
record_obj.update({"workflow_id": rec.workflow_id.id,
"node_id": rec.node_id.id,
"done_by": self.env.uid,
"write_date": fields.Datetime.now(),
})
if record_obj:
record_obj.update({"workflow_id": rec.workflow_id.id,
"node_id": rec.node_id.id,
"done_by": self.env.uid,
"write_date2": fields.Datetime.now(),
})
def unlink(self):
self.mapped("log_ids").unlink()
soong_workflow/models/soong_workflow_record.py
+2 -2
View File
@@ -10,7 +10,7 @@ _logger = logging.getLogger(__name__)
class SoongWorkflowRecord(models.Model):
_name = "soong.workflow.record"
_description = "工作流记录"
_order = 'write_date'
_order = 'write_date2'
def get_no_read_count(self):
return self.search_count([('approve_state', '=', 'pending'), ('employee_ids', 'in', [self.env.user.employee_id.id])])
@@ -25,7 +25,7 @@ class SoongWorkflowRecord(models.Model):
name = fields.Char(string="名称")
code = fields.Char(string="流水号")
write_date = fields.Datetime(string="最后更新日期", readoly="1")
write_date2 = fields.Datetime(string="最后更新日期", readoly="1")
res_model = fields.Char(string="Res Model", required=True)
res_id = fields.Integer(string="Res ID", required=True)
users_ids = fields.Many2many('res.users', string="用户")
soong_workflow/views/soong_workflow_record.xml
+6 -7
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>entrust
<odoo>
<data>
<record id="soong_workflow_record_search" model="ir.ui.view">
<field name="name">soong.workflow.record.search</field>
@@ -21,7 +21,7 @@
<field name="arch" type="xml">
<tree string="流程查询" action="open_record" delete="false" type="object"
decoration-muted="approve_state == 'end'"
create="false" default_order="write_date desc">
create="false" default_order="write_date2 desc">
<field name="code"/>
<field name="name"/>
<field name="workflow_id" string="审批类型"/>
@@ -31,9 +31,8 @@
<field name="approve_state" string="审批状态" decoration-danger="approve_state == 'end'" class="list_ids_width"/>
<field name="users_ids" string="用户" widget="many2many_tags" optional="hide"/>
<field name="employee_ids" widget="many2many_tags" string="当前经办人" class="list_ids_width"/>
<!-- <field name="done_by"/>-->
<field name="create_uid"/>
<field name="write_date"/>
<field name="write_date2"/>
<field name="reclaim_state" column_invisible="1"/>
<button name="delete_record" type="object" string="删除" class="btn-primary" confirm="你确定要删除吗?"/>
<button name="reminders_record" type="object" string="催办" class="btn-primary"
@@ -45,7 +44,7 @@
<field name="name">soong.workflow.record.kanban</field>
<field name="model">soong.workflow.record</field>
<field name="arch" type="xml">
<kanban class="kk_kanban_row" default_order="write_date desc">
<kanban class="kk_kanban_row" default_order="write_date2 desc">
<templates>
<t t-name="kanban-box">
<div class="oe_kanban_card oe_kanban_global_click">
@@ -65,7 +64,7 @@
</div>
<div>
<span>最后更新日期:</span>
<field name="write_date"/>
<field name="write_date2"/>
</div>
</div>
<div class="o_kanban_record_bottom">
@@ -93,7 +92,7 @@
<field name="node_id" string="当前节点"/>
<field name="approve_state" string="审批状态"/>
<field name="users_ids" string="审批人" widget="many2many_tags"/>
<field name="write_date"/>
<field name="write_date2"/>
<field name="reclaim_state" column_invisible="1"/>
<button name="restore_record" type="object" string="还原" class="btn-primary"
groups="soong_workflow.group_soong_workflow_manager"/>
yuthon_hr_attendance/models/hr_attendance_detail_wechat.py
+1 -1
View File
@@ -287,7 +287,7 @@ class HrAttendanceDetail(models.Model):
for user in user_obj:
# 判断是否是微信用户
if user.oauth_uid and user.employee_id.contract_id:
_logger.info("梳理ing:{} id:{}，总:{}，剩:{}，司{}".format(user.name, user.id, total_users,remaining_users, user.employee_id.company_id.name))
_logger.info("梳理ing:{} id:{}，总:{}，剩:{}，司{}".format(user.name, user.id, total_users, remaining_users, user.employee_id.company_id.name))
remaining_users -= 1
for current_date in self.sudo().divide_time_range_fixed(start_time, now_time):
self.sudo()._do_save_wx_attendance_data(user, current_date)