Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev_zhou

Signed-off-by: 李鹏宇 <9664676+pengyuthon@user.noreply.gitee.com>

yuthon_issue/models/issue_approval_decision.py

@@ -18,6 +18,26 @@ class IssueApprovalDecision(models.Model):
     district_bureau = fields.Char(string='区政府、区财政局')
     remarks = fields.Char(string='备注')
 
+    @api.onchange('sequence', 'decision_id')
+    def _onchange_department_code(self):
+        for code in self:
+            if code.sequence and code.decision_id:
+                code.sequence = code.decision_id.sequence + ('.' + code.sequence if code.sequence else '')
+            else:
+                code.sequence = code.sequence
+            code._update_child_sequences()
+
+    def _update_child_sequences(self):
+        def recursive_update(parent, parent_sequence):
+            # 遍历每个子记录
+            for child in parent.child_ids:
+                # 使用父级的 sequence 更新子级的 sequence
+                new_sequence = parent_sequence + ('.' + child.sequence.split('.')[-1] if child.sequence else '')
+                self.env['issue.approval.decision'].search([('id', '=', child.id.origin)]).write({'sequence': new_sequence})
+                # 递归处理孙级
+                recursive_update(child, new_sequence)
+        # 从当前记录开始递归更新所有子孙级别
+        recursive_update(self, self.sequence)
 
 
 

yuthon_issue/views/issue_approval_decision_views.xml

@@ -33,6 +33,7 @@
                     <group col="2">
                         <group>
                             <field name="decision_id"/>
+                            <field name="child_ids" force_save="1" invisible="1"/>
                             <field name="sequence"/>
                             <field name="council"/>
                         </group>
@@ -55,19 +56,6 @@
         </field>
     </record>
 
-    <record id="view_issue_approval_decision_search" model="ir.ui.view">
-        <field name="name">issue.approval.decision.form</field>
-        <field name="model">issue.approval.decision</field>
-        <field name="arch" type="xml">
-            <search>
-                <field name="name"/>
-                <searchpanel>
-                    <field name="decision_id"/>
-                </searchpanel>
-            </search>
-        </field>
-    </record>
-
     <record id="issue_approval_decision_action" model="ir.actions.act_window">
         <field name="name">决策清单</field>
         <field name="res_model">issue.approval.decision</field>