From 60beedde39138a363ef95c664542f45ea409bcdb Mon Sep 17 00:00:00 2001
From: ljmwkx <1340053001@qq.com>
Date: Sat, 18 Jan 2025 21:34:11 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=BB=E9=A2=98=20=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controllers/__init__.py | 1 -
.../controllers/login.py | 72 --------
.../views/login_layout.xml | 167 +++++-------------
3 files changed, 42 insertions(+), 198 deletions(-)
delete mode 100644 sh_backmate_theme_adv_enterprise/controllers/login.py
diff --git a/sh_backmate_theme_adv_enterprise/controllers/__init__.py b/sh_backmate_theme_adv_enterprise/controllers/__init__.py
index 932bd3816..eed18c782 100644
--- a/sh_backmate_theme_adv_enterprise/controllers/__init__.py
+++ b/sh_backmate_theme_adv_enterprise/controllers/__init__.py
@@ -2,4 +2,3 @@
from . import main
from . import sh_firebase_notification
from . import home
-from . import login
\ No newline at end of file
diff --git a/sh_backmate_theme_adv_enterprise/controllers/login.py b/sh_backmate_theme_adv_enterprise/controllers/login.py
deleted file mode 100644
index 683b3e6a3..000000000
--- a/sh_backmate_theme_adv_enterprise/controllers/login.py
+++ /dev/null
@@ -1,72 +0,0 @@
-# -*- encoding: utf-8 -*-
-import hashlib
-import odoo
-from odoo import http
-from odoo.tools import pycompat
-from odoo.tools.translate import _
-from odoo.http import request
-from odoo.addons.web.controllers.home import Home as WebHome
-from odoo.addons.web.controllers.utils import ensure_db, _get_login_redirect_url
-
-# Shared parameters for all login/signup flows
-SIGN_UP_REQUEST_PARAMS = {'db', 'login', 'debug', 'token', 'message', 'error',
- 'scope', 'mode', 'redirect', 'redirect_hostname',
- 'email', 'name', 'partner_id', 'password',
- 'confirm_password', 'city', 'country_id', 'lang'}
-
-
-class Home(WebHome):
- @http.route(route='/web/login', type='http', auth="none")
- def web_login(self, redirect=None, **kw):
- """Override web_login function to add features of this module."""
- ensure_db()
- request.params['login_success'] = False
- if request.httprequest.method == 'GET' and redirect and request.session.uid:
- return request.redirect(redirect)
- if not request.uid:
- request.update_env(user=odoo.SUPERUSER_ID)
- values = {val: item for val, item in request.params.items() if
- val in SIGN_UP_REQUEST_PARAMS}
- try:
- values['databases'] = http.db_list()
- except odoo.exceptions.AccessDenied:
- values['databases'] = None
-
- if request.httprequest.method == 'POST':
- old_uid = request.update_env(user=request.session.uid)
-
- try:
- uid = request.session.authenticate(request.session.db,
- request.params['login'],
- request.params['password'])
- request.params['login_success'] = True
- return request.redirect(
- self._login_redirect(uid, redirect=redirect))
- except odoo.exceptions.AccessDenied as e:
- request.update_env = old_uid
- if e.args == odoo.exceptions.AccessDenied().args:
- values['error'] = _("错误的用户名和密码!")
- else:
- values['error'] = e.args[0]
- else:
- if 'error' in request.params and request.params.get(
- 'error') == 'access':
- values['error'] = _("只有员工才能访问此数据库。请联系管理员。")
- if 'login' not in values and request.session.get('auth_login'):
- values['login'] = request.session.get('auth_login')
- if not odoo.tools.config['list_db']:
- values['disable_database_manager'] = True
-
- response = request.render('sh_backmate_theme_adv_enterprise.sh_backmate_theme_web_login_main_template', values)
-
- response.headers['X-Frame-Options'] = 'DENY'
- return response
-
-
-
-class Website(Home):
-
- # override
- @http.route(website=True, auth="public", sitemap=False)
- def web_login(self, *args, **kw):
- return super().web_login(*args, **kw)
\ No newline at end of file
diff --git a/sh_backmate_theme_adv_enterprise/views/login_layout.xml b/sh_backmate_theme_adv_enterprise/views/login_layout.xml
index 02e7dec47..76d065c94 100644
--- a/sh_backmate_theme_adv_enterprise/views/login_layout.xml
+++ b/sh_backmate_theme_adv_enterprise/views/login_layout.xml
@@ -1,90 +1,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
![Logo]()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -105,9 +22,9 @@
@@ -129,9 +46,9 @@
@@ -157,13 +74,13 @@
@@ -187,9 +104,9 @@
@@ -205,9 +122,9 @@
@@ -215,7 +132,7 @@
-
+
@@ -229,7 +146,7 @@
- 选择
+ Select
@@ -265,18 +182,18 @@
-
+
@@ -290,22 +207,22 @@
-
+
-
+
@@ -317,13 +234,13 @@
-
+
-
+
@@ -341,7 +258,7 @@
@@ -376,11 +293,11 @@
-
+
@@ -393,11 +310,11 @@
@@ -433,15 +350,15 @@
-
+
@@ -455,22 +372,22 @@
-
+
-
+
@@ -482,9 +399,9 @@
-
+
-
+
From 1b0e297c167598d7d5abe61825c52bd27da1983a Mon Sep 17 00:00:00 2001
From: ljmwkx <1340053001@qq.com>
Date: Sun, 19 Jan 2025 11:54:00 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
soong_workflow/models/soong_workflow_mixin.py | 23 +++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py
index 5a758d07f..fae3063d5 100644
--- a/soong_workflow/models/soong_workflow_mixin.py
+++ b/soong_workflow/models/soong_workflow_mixin.py
@@ -153,6 +153,29 @@ class SoongWorkflowMixin(models.AbstractModel):
auto_join=True,
)
+ @api.model_create_multi
+ def create(self, vals_list):
+ res = super().create(vals_list)
+ for record in res:
+ button_ids = record.workflow_id.node_ids.button_ids
+ for button_id in button_ids:
+ # 不自动匹配
+ if not button_id.is_automatic:
+ employee_ids = record.env['hr.employee'].search(
+ ['|', ('user_role_id', '=', button_id.users_role_id.id),
+ ('user_role_ids', 'in', button_id.users_role_id.id)])
+ else:
+ # 自动匹配
+ employee_ids = record.env['hr.employee'].search(
+ ['|', ('user_role_id', '=', button_id.users_role_id.id),
+ ('user_role_ids', 'in', button_id.users_role_id.id),
+ '|', ('department_id', '=', record.env.user.employee_id.department_id.id), ('department_ids', 'in', record.env.user.employee_id.department_id.id),
+ ('yuthon_company', '=', record.env.user.employee_id.yuthon_company)])
+ # 判断当前用户是否是 当前节点的员工
+ if record.env.user.employee_id.id in employee_ids.ids:
+ record.state = button_id.node_id.node_name
+ return res
+
def _create_update_logs(self, btn_rec):
log_obj = self.env["soong.workflow.log"]
if btn_rec.name in ['退回']:
From ab45b8a51526fb1422aa83827e440979c3371bb2 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Sun, 19 Jan 2025 16:59:45 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
yuthon_maintain/__manifest__.py | 4 +
yuthon_maintain/models/__init__.py | 4 +-
.../models/lessee_service_setting.py | 46 +++++++++
.../models/property_report_repair.py | 58 ++++++++++++
.../models/yuthon_maintain_desktop.py | 24 +++++
.../models/yuthon_maintain_service.py | 19 ++++
yuthon_maintain/security/ir.model.access.csv | 7 ++
yuthon_maintain/views/all_menu.xml | 59 ++++++++++++
.../views/lessee_service_setting_views.xml | 86 +++++++++++++++++
.../views/property_report_repair.xml | 94 +++++++++++++++++++
.../views/yuthon_maintain_desktop_views.xml | 59 ++++++++++++
.../views/yuthon_maintain_service_views.xml | 51 ++++++++++
.../models/yuthon_care_condolences.py | 2 +-
.../models/yuthon_work_condolences.py | 2 +-
.../views/yuthon_care_condolences_views.xml | 50 +++++-----
.../views/yuthon_work_condolences_views.xml | 32 +++----
16 files changed, 547 insertions(+), 50 deletions(-)
create mode 100644 yuthon_maintain/models/lessee_service_setting.py
create mode 100644 yuthon_maintain/models/property_report_repair.py
create mode 100644 yuthon_maintain/models/yuthon_maintain_desktop.py
create mode 100644 yuthon_maintain/models/yuthon_maintain_service.py
create mode 100644 yuthon_maintain/views/all_menu.xml
create mode 100644 yuthon_maintain/views/lessee_service_setting_views.xml
create mode 100644 yuthon_maintain/views/property_report_repair.xml
create mode 100644 yuthon_maintain/views/yuthon_maintain_desktop_views.xml
create mode 100644 yuthon_maintain/views/yuthon_maintain_service_views.xml
diff --git a/yuthon_maintain/__manifest__.py b/yuthon_maintain/__manifest__.py
index 570a44b82..a6fb88d82 100644
--- a/yuthon_maintain/__manifest__.py
+++ b/yuthon_maintain/__manifest__.py
@@ -13,7 +13,11 @@
'depends': ['documents'],
'data': [
'security/ir.model.access.csv',
+ 'views/lessee_service_setting_views.xml',
+ 'views/property_report_repair.xml',
+ 'views/yuthon_maintain_service_views.xml',
'views/maintenance_equipment_views.xml',
+ 'views/all_menu.xml',
],
'installable': True,
'application': True,
diff --git a/yuthon_maintain/models/__init__.py b/yuthon_maintain/models/__init__.py
index 2d9a5c23a..61e410f2c 100644
--- a/yuthon_maintain/models/__init__.py
+++ b/yuthon_maintain/models/__init__.py
@@ -1,5 +1,7 @@
# -*- coding: utf-8 -*-
-
from . import inherit_maintenance_equipment
+from . import lessee_service_setting
+from . import property_report_repair
+from . import yuthon_maintain_service
diff --git a/yuthon_maintain/models/lessee_service_setting.py b/yuthon_maintain/models/lessee_service_setting.py
new file mode 100644
index 000000000..ec07b3a50
--- /dev/null
+++ b/yuthon_maintain/models/lessee_service_setting.py
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import models, fields, api, exceptions, _
+
+
+class SoftwareIssuesSetting(models.Model):
+ _name = 'software.issues.setting'
+ _description = '软件问题'
+
+ name = fields.Char(string='软件问题')
+
+
+class HardwareIssuesSetting(models.Model):
+ _name = 'hardware.issues.setting'
+ _description = '硬件问题'
+
+ name = fields.Char(string='硬件问题')
+
+
+class SoftwareIssuesProcessing(models.Model):
+ _name = 'software.issues.processing'
+ _description = '软件处理类型'
+
+ name = fields.Char(string='软件处理方式')
+
+
+class HardwareIssuesProcessing(models.Model):
+ _name = 'hardware.issues.processing'
+ _description = '硬件处理类型'
+
+ name = fields.Char(string='硬件处理方式')
+
+
+class MaintainServiceSetting(models.Model):
+ _name = 'maintain.service.setting'
+ _description = '服务器类型'
+
+ name = fields.Char(string='服务器类型')
+
+
+class MaintainDesktopSetting(models.Model):
+ _name = 'maintain.desktop.setting'
+ _description = '桌面类型'
+
+ name = fields.Char(string='桌面类型')
diff --git a/yuthon_maintain/models/property_report_repair.py b/yuthon_maintain/models/property_report_repair.py
new file mode 100644
index 000000000..7e6ebc77a
--- /dev/null
+++ b/yuthon_maintain/models/property_report_repair.py
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import models, fields, api, exceptions, _
+
+class PropertyRentRelief(models.Model):
+ _name = 'property.report.repair'
+ _description = '报事报修审批'
+ _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin']
+ _rec_name = 'name'
+
+ name = fields.Char(string='标题')
+ code = fields.Char(string="报修编号",
+ default=lambda self: self.env['ir.sequence'].next_by_code('property_report_repair_code'))
+ users_id = fields.Many2one('res.users', string="报修人", default=lambda self: self.env.user.id)
+ repairer_date = fields.Date(string="报修时间")
+ department_id = fields.Many2one(related='users_id.employee_id.department_id', string="报修部门")
+ repairer_address = fields.Char(string="报修人地址")
+ fault = fields.Text(string="故障信息")
+
+ dispatch_date = fields.Date(string="派单时间")
+ dispatch_head_id = fields.Many2one('hr.employee', string="派单人负责人")
+ team_ids = fields.Many2many('hr.employee', string="维修团队")
+ completion_time = fields.Datetime(string="预计完成时间")
+ dispatch_notes = fields.Text(string="派单备注")
+
+ urgency = fields.Selection([('low', '低'), ('middle', '中'), ('high', '高')], string="紧急程度")
+ possible_causes = fields.Selection([('software', '软件问题'), ('hardware', '硬件问题')], string="可能原因")
+ software_id = fields.Many2one('software.issues.setting', string="具体软件问题")
+ hardware_id = fields.Many2one('hardware.issues.setting', string="具体硬件问题")
+ specific_reasons = fields.Text(string="具体原因")
+ software_processing_id = fields.Many2one('software.issues.processing', string="处理类型")
+ hardware_processing_id = fields.Many2one('hardware.issues.processing', string="处理类型")
+ resolution = fields.Text(string="解决方法")
+ documents_ids = fields.Many2many('ir.attachment', string="附件")
+ fees = fields.Float(string="费用")
+ repair_company = fields.Char(string="维修人/公司")
+ list_quotations = fields.Many2one('ir.attachment', string="报价清单")
+ invoice_id = fields.Many2one('ir.attachment', string="发票附件")
+
+ hardware_parts = fields.Char(string="更换部件")
+ hardware_fee = fields.Float(string="部件费用")
+
+ software_parts = fields.Char(string="软件名称/版本")
+ software_fee = fields.Float(string="软件费用")
+
+ duration_service = fields.Float(string="服务时长")
+ service_fee = fields.Float(string="服务费")
+ service_fee_total = fields.Float(string="总费用")
+ service_fee_remark = fields.Text(string="费用备注")
+ situation = fields.Char(string="现场说明情况")
+ is_fee = fields.Boolean(string="是否产生费用")
+ labor_costs = fields.Float(string="人工费")
+ confirmation_repairer = fields.Char(string="报修人确认")
+ warehouse_management = fields.Char(string="库管")
+ total = fields.Float(string="总价")
+
+ remake = fields.Text(string="备注")
diff --git a/yuthon_maintain/models/yuthon_maintain_desktop.py b/yuthon_maintain/models/yuthon_maintain_desktop.py
new file mode 100644
index 000000000..9bfc687ab
--- /dev/null
+++ b/yuthon_maintain/models/yuthon_maintain_desktop.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import models, fields, api, exceptions, _
+
+
+class YuthonMaintainDesktop(models.Model):
+ _name = 'yuthon.maintain.desktop'
+ _description = '桌面设置'
+
+ name = fields.Char(string='名称')
+ desktop_id = fields.Many2one('maintain.desktop.setting', string='类型')
+ mac_address = fields.Char(string='MAC地址')
+ ip_address = fields.Char(string='IP地址')
+ cpu = fields.Char(string='CPU')
+ memory = fields.Char(string='内存')
+ hard_disk = fields.Char(string='硬盘')
+ account = fields.Char(string='账号')
+ password = fields.Char(string='密码')
+ desktop_type = fields.Char(string='类型')
+ purchase_date = fields.Date(string='购买日期')
+ users_id = fields.Many2one('res.users', string='使用人')
+ remake = fields.Text(string='备注日志')
+ qr_Image = fields.Image(string='二维码')
diff --git a/yuthon_maintain/models/yuthon_maintain_service.py b/yuthon_maintain/models/yuthon_maintain_service.py
new file mode 100644
index 000000000..240262f37
--- /dev/null
+++ b/yuthon_maintain/models/yuthon_maintain_service.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import models, fields, api, exceptions, _
+
+
+class YuthonMaintainService(models.Model):
+ _name = 'yuthon.maintain.service'
+ _description = '服务器类'
+
+ name = fields.Char(string='名称', required=True)
+ service_type_id = fields.Many2one('maintain.service.setting', string='服务器类型')
+ mac_address = fields.Char(string='MAC地址')
+ ip_address = fields.Char(string='IP地址')
+ time_purchase = fields.Date(string='购买时间')
+ service_state = fields.Char(string='状态')
+ remake = fields.Text(string='备注日志')
+ updated = fields.Datetime(string='更新时间')
+ qr_Image = fields.Image(string='二维码')
\ No newline at end of file
diff --git a/yuthon_maintain/security/ir.model.access.csv b/yuthon_maintain/security/ir.model.access.csv
index 08145a00f..f7c6c012a 100644
--- a/yuthon_maintain/security/ir.model.access.csv
+++ b/yuthon_maintain/security/ir.model.access.csv
@@ -1,2 +1,9 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_property_report_repair,property_report_repair,model_property_report_repair,base.group_user,1,1,1,1
+access_software_issues_setting,software_issues_setting,model_software_issues_setting,base.group_user,1,1,1,1
+access_hardware_issues_setting,hardware_issues_setting,model_hardware_issues_setting,base.group_user,1,1,1,1
+access_software_issues_processing,software_issues_processing,model_software_issues_processing,base.group_user,1,1,1,1
+access_hardware_issues_processing,hardware_issues_processing,model_hardware_issues_processing,base.group_user,1,1,1,1
+access_maintain_service_setting,maintain_service_setting,model_maintain_service_setting,base.group_user,1,1,1,1
+access_maintain_desktop_setting,maintain_desktop_setting,model_maintain_desktop_setting,base.group_user,1,1,1,1
diff --git a/yuthon_maintain/views/all_menu.xml b/yuthon_maintain/views/all_menu.xml
new file mode 100644
index 000000000..20bb13580
--- /dev/null
+++ b/yuthon_maintain/views/all_menu.xml
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yuthon_maintain/views/lessee_service_setting_views.xml b/yuthon_maintain/views/lessee_service_setting_views.xml
new file mode 100644
index 000000000..53fed75a4
--- /dev/null
+++ b/yuthon_maintain/views/lessee_service_setting_views.xml
@@ -0,0 +1,86 @@
+
+
+ software issues setting
+ software.issues.setting
+
+
+
+
+
+
+
+ 软件问题
+ software.issues.setting
+ tree
+
+
+ hardware issues setting
+ hardware.issues.setting
+
+
+
+
+
+
+
+ 硬件问题
+ hardware.issues.setting
+ tree
+
+
+ software issues processing
+ software.issues.processing
+
+
+
+
+
+
+
+ 软件处理类型
+ software.issues.processing
+ tree
+
+
+ hardware issues processing
+ hardware.issues.processing
+
+
+
+
+
+
+
+ 硬件处理类型
+ hardware.issues.processing
+ tree
+
+
+ maintain.desktop.setting
+ maintain.desktop.setting
+
+
+
+
+
+
+
+ 桌面类型设置
+ _setting
+ tree
+
+
+ maintain.service.setting
+ maintain.service.setting
+
+
+
+
+
+
+
+ 服务类型设置
+ maintain.service.setting
+ tree
+
+
diff --git a/yuthon_maintain/views/property_report_repair.xml b/yuthon_maintain/views/property_report_repair.xml
new file mode 100644
index 000000000..ac9452b19
--- /dev/null
+++ b/yuthon_maintain/views/property_report_repair.xml
@@ -0,0 +1,94 @@
+
+
+
+ property.report.repair.tree
+ property.report.repair
+
+
+
+
+
+
+
+
+ property.report.repair.form
+ property.report.repair
+
+
+
+
+
+ 报事报修审批
+ property.report.repair
+ tree,form
+
+
\ No newline at end of file
diff --git a/yuthon_maintain/views/yuthon_maintain_desktop_views.xml b/yuthon_maintain/views/yuthon_maintain_desktop_views.xml
new file mode 100644
index 000000000..64dff6082
--- /dev/null
+++ b/yuthon_maintain/views/yuthon_maintain_desktop_views.xml
@@ -0,0 +1,59 @@
+
+
+ yuthon.maintain.desktop.tree
+ yuthon.maintain.desktop
+
+
+
+
+
+
+
+
+
+
+
+ yuthon.maintain.desktop.form
+ yuthon.maintain.desktop
+
+
+
+
+
+ 桌面
+ yuthon.maintain.desktop
+ tree,form
+
+
+
+
diff --git a/yuthon_maintain/views/yuthon_maintain_service_views.xml b/yuthon_maintain/views/yuthon_maintain_service_views.xml
new file mode 100644
index 000000000..1b9dfe8c8
--- /dev/null
+++ b/yuthon_maintain/views/yuthon_maintain_service_views.xml
@@ -0,0 +1,51 @@
+
+
+ yuthon.maintain.service.tree
+ yuthon.maintain.service
+
+
+
+
+
+
+
+
+ 、
+
+
+ yuthon.maintain.service.form
+ yuthon.maintain.service
+
+
+
+
+
+ 服务器类
+ yuthon.maintain.service
+ tree,form
+
+
\ No newline at end of file
diff --git a/yuthon_trade/models/yuthon_care_condolences.py b/yuthon_trade/models/yuthon_care_condolences.py
index e688e2eef..ec610528b 100644
--- a/yuthon_trade/models/yuthon_care_condolences.py
+++ b/yuthon_trade/models/yuthon_care_condolences.py
@@ -6,7 +6,7 @@ class YuthonCareCondolences(models.Model):
_description = '关怀慰问'
_inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin']
- name = fields.Char(string='名称')
+ name = fields.Char(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="部门")
care_type_id = fields.Many2one('yuthon.care.setting', string='类型')
diff --git a/yuthon_trade/models/yuthon_work_condolences.py b/yuthon_trade/models/yuthon_work_condolences.py
index 9e478d6a0..34442e0e4 100644
--- a/yuthon_trade/models/yuthon_work_condolences.py
+++ b/yuthon_trade/models/yuthon_work_condolences.py
@@ -6,7 +6,7 @@ class YuthonWorkCondolences(models.Model):
_description = '关怀慰问'
_inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin']
- name = fields.Char(string='名称')
+ name = fields.Char(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="部门")
work_type_id = fields.Many2one('yuthon.work.setting', string='类型')
diff --git a/yuthon_trade/views/yuthon_care_condolences_views.xml b/yuthon_trade/views/yuthon_care_condolences_views.xml
index cd9544d13..4d0ea1d26 100644
--- a/yuthon_trade/views/yuthon_care_condolences_views.xml
+++ b/yuthon_trade/views/yuthon_care_condolences_views.xml
@@ -20,36 +20,30 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/yuthon_trade/views/yuthon_work_condolences_views.xml b/yuthon_trade/views/yuthon_work_condolences_views.xml
index 7c95afead..141a90100 100644
--- a/yuthon_trade/views/yuthon_work_condolences_views.xml
+++ b/yuthon_trade/views/yuthon_work_condolences_views.xml
@@ -20,25 +20,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
From bf0bd00e74cfc817f9545fd0e7eeb5a1d85e941f Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Sun, 19 Jan 2025 17:05:48 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
yuthon_maintain/views/lessee_service_setting_views.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/yuthon_maintain/views/lessee_service_setting_views.xml b/yuthon_maintain/views/lessee_service_setting_views.xml
index 53fed75a4..38e197ed9 100644
--- a/yuthon_maintain/views/lessee_service_setting_views.xml
+++ b/yuthon_maintain/views/lessee_service_setting_views.xml
@@ -66,7 +66,7 @@
桌面类型设置
- _setting
+ maintain.desktop.setting
tree