From 8523b5930fa601c1937368ac5af34d133eddbbf4 Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Sun, 27 Jul 2025 19:17:31 +0800 Subject: [PATCH] =?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 --- .../models/inherit_maintenance_equipment.py | 15 ++- yuthon_maintain/security/ir.model.access.csv | 3 +- .../views/maintenance_equipment_views.xml | 13 +++ .../models/yuthon_resource_mgmt_config.py | 1 + .../yuthon_resource_mgmt_config_views.xml | 1 + yuthon_work_brand/__manifest__.py | 5 +- .../static/description/purchase.png | Bin 0 -> 2311 bytes yuthon_work_brand/views/purchase_menus.xml | 93 ++++++++++++++++++ 8 files changed, 127 insertions(+), 4 deletions(-) create mode 100644 yuthon_work_brand/static/description/purchase.png create mode 100644 yuthon_work_brand/views/purchase_menus.xml diff --git a/yuthon_maintain/models/inherit_maintenance_equipment.py b/yuthon_maintain/models/inherit_maintenance_equipment.py index 283642701..e56b3493d 100644 --- a/yuthon_maintain/models/inherit_maintenance_equipment.py +++ b/yuthon_maintain/models/inherit_maintenance_equipment.py @@ -7,4 +7,17 @@ class InheritMaintenanceEquipment(models.Model): _inherit = 'maintenance.equipment' image_1920 = fields.Image(string="图片") - documents_ids = fields.Many2many('ir.attachment', string="附件") \ No newline at end of file + documents_ids = fields.Many2many('ir.attachment', string="附件") + equipment_approval_line_ids = fields.One2many('maintenance.equipment.line', 'maintenance_equipment_id', + string='关联流程') + + +class MaintenanceEquipmentLine(models.Model): + _name = 'maintenance.equipment.line' + _description = '关联流程' + + maintenance_equipment_id = fields.Many2one('maintenance.equipment', string="关联产品") + workflow_record_id = fields.Many2one('soong.workflow.record', string="标题") + code = fields.Char(string="流程编号") + approval_type = fields.Many2one(related="workflow_record_id.workflow_id", string="类型") + approval_date = fields.Datetime(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 17e2c1f82..de3e8b4cd 100644 --- a/yuthon_maintain/security/ir.model.access.csv +++ b/yuthon_maintain/security/ir.model.access.csv @@ -8,4 +8,5 @@ access_maintain_service_setting,maintain_service_setting,model_maintain_service_ access_maintain_desktop_setting,maintain_desktop_setting,model_maintain_desktop_setting,base.group_user,1,1,1,1 access_yuthon_maintain_service,yuthon_maintain_service,model_yuthon_maintain_service,base.group_user,1,1,1,1 access_yuthon_maintain_desktop,yuthon_maintain_desktop,model_yuthon_maintain_desktop,base.group_user,1,1,1,1 -access_property_device_line,property_device_line,model_property_device_line,base.group_user,1,1,1,1 \ No newline at end of file +access_property_device_line,property_device_line,model_property_device_line,base.group_user,1,1,1,1 +access_maintenance_equipment_line,maintenance_equipment_line,model_maintenance_equipment_line,base.group_user,1,1,1,1 \ No newline at end of file diff --git a/yuthon_maintain/views/maintenance_equipment_views.xml b/yuthon_maintain/views/maintenance_equipment_views.xml index 5648dce85..d98815902 100644 --- a/yuthon_maintain/views/maintenance_equipment_views.xml +++ b/yuthon_maintain/views/maintenance_equipment_views.xml @@ -10,6 +10,19 @@ 管理员 + + + + + + + + + + + + +
diff --git a/yuthon_property/models/yuthon_resource_mgmt_config.py b/yuthon_property/models/yuthon_resource_mgmt_config.py index 6b4f41612..58d713f10 100644 --- a/yuthon_property/models/yuthon_resource_mgmt_config.py +++ b/yuthon_property/models/yuthon_resource_mgmt_config.py @@ -218,6 +218,7 @@ class PropertyFloorSetting(models.Model): _rec_name = 'show_name' name = fields.Char('名称') + sequence = fields.Integer(string="顺序") show_name = fields.Char('名称', required=True) parent_id = fields.Many2one('property.floor.setting', string='父级') child_ids = fields.One2many('property.floor.setting', 'parent_id', string='子级') diff --git a/yuthon_property/views/yuthon_resource_mgmt_config_views.xml b/yuthon_property/views/yuthon_resource_mgmt_config_views.xml index 4b4dc5b27..3f509b142 100644 --- a/yuthon_property/views/yuthon_resource_mgmt_config_views.xml +++ b/yuthon_property/views/yuthon_resource_mgmt_config_views.xml @@ -346,6 +346,7 @@ property.floor.setting + diff --git a/yuthon_work_brand/__manifest__.py b/yuthon_work_brand/__manifest__.py index ccafad9ed..f95c94714 100644 --- a/yuthon_work_brand/__manifest__.py +++ b/yuthon_work_brand/__manifest__.py @@ -6,13 +6,14 @@ 'hr', 'yuthon_holiday', 'hr_attendance', 'hr_holidays', 'hr_payroll', 'yuthon_hr_attendance', 'website', 'yuthon_hr_employee', - 'yuthon_salary', 'yuthon_sps_approval', 'yuthon_property', 'yuthon_property_approval', 'yuthon_performance', - 'resource', 'yuthon_hr_employee_approval', 'planning', 'yuthon_maintain', 'maintenance', 'yuthon_trade', 'attendance_iot' + 'yuthon_salary', 'yuthon_sps_approval', 'yuthon_property', 'yuthon_property_approval', 'yuthon_performance', 'purchase', 'yuthon_purchase', + 'resource', 'yuthon_hr_employee_approval', 'planning', 'yuthon_maintain', 'maintenance', 'yuthon_trade', 'attendance_iot', 'account', 'uom', 'product' ], 'data': [ 'security/ir.model.access.csv', 'views/yuthon_none_views.xml', 'views/hr_menus.xml', + 'views/purchase_menus.xml', 'views/executive_manage.xml', ], 'application': True, diff --git a/yuthon_work_brand/static/description/purchase.png b/yuthon_work_brand/static/description/purchase.png new file mode 100644 index 0000000000000000000000000000000000000000..949de53f7c85a099e25aace68050921c46ca3a05 GIT binary patch literal 2311 zcmcImYfuwe7QX2ONTMVmAv`o{OBzI;f;@s|hXjLk2AybBMt2~HurMyD1T7u{(jXv@ z0o#ZoPgi8o5kZ9+WKconsXP?5bQlCe1QZmJmk1(kyH)#pwrXpC^gZ{SKJ}e*zf-rq zo4V~g4_*2)Isiadib~{!ZTb39wTZQCcX=UUNQdPfZlJt_Hw*yvo>U^<8L1fUi49xs z&T8u4H3*pxfg$AFaY@4(T0YWLo8m%q0dC%~>29m$rmFCxK}Wx-`J8RB5Z{$kFjH{J zsRF;9^Jx==ggV9RcHw}QF9UEsgS{ICFptRw)F6y9!B*2$*~`Dzk^)$q7MK@B1Bk72 zIb8)r3Ht3$lWc%04tjGD5=L2@dtk^E;J05^Tc8l2$sM}eJOLc_n{pRU0qo)*t8%h| zXd>*@6_~(4J44pnlCXinrd?tJ125_dR6yWCYes1T0&v*9vi&v%{9g+{AGlKgdd%ih z#8`RNtuI?oYwa1>1p(u!ZTX?|%9=aD_|#fD92@5AJ*}15d;=bS%oS}&to>!cmAxjfjf-o!WjwW#82HCGI|`h)Bx$= z0+73?wFM&ijZN6jr8ieI@SP)i@R@{N_m!>(GH0GDCzZJ+p8aJLnYY%NKUjyMa=8&d zhVxty&mE>r{Qu|=WS zpkgwSj6|Uz%*^?uKvc1kChBczThG9+Zh~;bDEGT0whJ2*wpy?mcnb~&vUW&#u#`_~ znQshX)@}VbZWvgyBd_F;?}(Xkh~Lt_Thrm5{qfkV;l0>^qw2Bf?)aPt8(7Rq)Pgc6 zvLAPSGHS3j?P_Ct&`6A?&QBfnY)@@z5+dQUwo{ zlFgcBRKZlJ#9d=RSfxawVN(So{VB-}D_Eh=n)PU@mazKA6MQ<`S#-B^r3VGE!LW;~ z7-MJ~ndA}2D?D{h8_HCMM!N4K0GjIi^-`s<+Q{&PGctr>{xQ5l{2T-^HVSUTc4P|g zV`!vkA4C&XEESpDH-JzI4F z!}tt_C7MivG9v|6urYz4(HO0eM!;&&+=A9XBprdmY~3F>A4ZTNMrgk0UIg*M0@R-> zdPd{aXrok}IFQZVSlj#lqqAjGda{#_D&D`hr9J#+oxx~|*oG~5sffuh8J>LDewn|Y zj&O8DUWIIC{rdQ}AHH{gvJ@pTut>qU<;*r9;YvAhk^odpghm-Ds1jZ2ayVkl)%tAs zOYf~u9TpG2XI>Kv^XItHEK(QG(6`}`>-_ZFG}Aub9~5-NjCs>=GX2J^yRk^_r!_mq zhP!)e=Vr@lv0@oOZym~^T&Y?2ZN)mo#Gm}qA0+MAV_XXlr^wJL$ zy%Xl<6jR-DTjC1wqbW%&2(DMY5;geuE9Ly#% zaL0IqOzzb7>icoolO{g7MgL%7X#Gy3HE%Zgaj}$5UqO_)gJfBsblQJ*%aZjWPIU)d z=W~wQ{&U0{HG4e?tFnwZP9!X`tT4lq4N?%(ro^oP_A3o~rJ?{6X{wzc2cW-?bX60= zfXer6`JGUJs-sRego>!LmS&uq*BB>_B7N1|7^V04fe)U-^Cnvi0X>Y;<8yr7vbB1RG&nSA%na?ue>kaDoFCy1PKPz!XnSAGrwon-*7i3&fj3)gUW zlT2od?0W(>7g&#r`K$4_4Ihs!%%u018#Ezt?`$Gh4Fu+v^cg-s=X(9uPlJbVGwnxK zk4F2ZpC3F6q${j4WRY}iXWxm* zEW??eeuxY=>NVvNjTbP-{S`gdjfF(}U&s>YNAD|1lA93rW~eLH347xO{)~&ZAuAFl zu*@2LWA-&Sr+p6ulwRiDoy0(DqU`f3DL`{|Th+xpKu{Rq6hs3JdoF}{IFpDH4?;SK z=~cRQWgdhGHcxlun*vr)QpJiM3c>uEN*6-FJLrGgSVIF6XIbFkvp|&3eHea(^K}US cYvE5iGPVo + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file