!8555 !8554 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen…

Merge pull request !8555 from 李鹏宇/dev

yuthon_issue/models/inherit_room_booking.py

@@ -117,7 +117,10 @@ class IssueMeetingLine(models.Model):
     def _onchange_decision_results(self):
         if not self.meeting_booking_id.meeting_type_id:
             return
+
         meeting_type_name = str(self.meeting_booking_id.meeting_type_id.name).strip()
+        suffix_list = ['(通过)', '(未通过)']
+
         if self.decision_results == 'agree':
             is_agree = 'pass'
             agree_name = '(通过)'
@@ -126,18 +129,37 @@ class IssueMeetingLine(models.Model):
             is_agree = 'reject'
             agree_name = '(未通过)'
             issue_state = 'will'
+
         self.issue_library_id.issue_state = issue_state
+
+        # 2. 党委会相关：先清理旧后缀，再拼接新后缀
         if '党' in meeting_type_name:
             self.issue_library_id.is_party_passed = is_agree
             original_party_char = self.issue_library_id.party_char or ""
-            self.issue_library_id.party_char = original_party_char + agree_name
+            # 清理原有后缀（避免重复拼接）
+            clean_party_char = original_party_char
+            for suffix in suffix_list:
+                clean_party_char = clean_party_char.removesuffix(suffix)
+            self.issue_library_id.party_char = clean_party_char + agree_name
 
+        # 3. 班子会相关：先清理旧后缀，再拼接新后缀
         if '班子' in meeting_type_name:
             self.issue_library_id.is_class_passed = is_agree
             original_class_char = self.issue_library_id.class_char or ""
-            self.issue_library_id.class_char = original_class_char + agree_name
+            # 清理原有后缀
+            clean_class_char = original_class_char
+            for suffix in suffix_list:
+                clean_class_char = clean_class_char.removesuffix(suffix)
+            # 拼接新后缀
+            self.issue_library_id.class_char = clean_class_char + agree_name
 
+        # 4. 董事会相关：先清理旧后缀，再拼接新后缀
         if '董事' in meeting_type_name:
             self.issue_library_id.is_boss_passed = is_agree
             original_boss_char = self.issue_library_id.boss_char or ""
-            self.issue_library_id.boss_char = original_boss_char + agree_name
+            # 清理原有后缀
+            clean_boss_char = original_boss_char
+            for suffix in suffix_list:
+                clean_boss_char = clean_boss_char.removesuffix(suffix)
+            # 拼接新后缀
+            self.issue_library_id.boss_char = clean_boss_char + agree_name

yuthon_trade/report/seal_approval_templates.xml

@@ -59,20 +59,11 @@
                             </tr>
 
                             <tr>
-                                <td class="header-cell"><strong>用章范围</strong></td>
-                                <td colspan="3">
-                                    <t t-if="doc.scope_chapter_ids">
-                                        <t t-foreach="doc.scope_chapter_ids" t-as="scope">
-                                            <span t-esc="scope.name"/><t t-if="not scope_last">、</t>
-                                        </t>
-                                    </t>
-                                    <t t-else="">未指定</t>
-                                </td>
                                 <td class="header-cell"><strong>用章类型</strong></td>
-                                <td colspan="2">
+                                <td colspan="6">
                                     <t t-if="doc.type_stamp_ids">
                                         <t t-foreach="doc.type_stamp_ids" t-as="type_stamp">
-                                            <span t-esc="type_stamp.name"/><t t-if="not type_stamp_last">、</t>
+                                            <span t-esc="type_stamp.display_name"/><t t-if="not type_stamp_last">、</t>
                                         </t>
                                     </t>
                                     <t t-else="">未指定</t>

yuthon_trade/views/yuthon_seals_approval_views.xml

@@ -38,19 +38,24 @@
                             <field name="name_title" readonly="1"/>
                         </h1>
                     </div>
-                    <group string="审批事项">
+                    <group string="审批事项" col="2">
                         <group>
                             <field name="is_back" invisible="1"/>
                             <field name="work_end" invisible="1"/>
                             <field name="name"/>
-                            <field name="users_id"  options="{'no_create': True}"/>
-                            <field name="type_stamp_ids" widget="many2many_tags" options="{'no_create': True, 'no_open': True}" context="{'search_default_group_by_scope': 1, 'search_default_filter_effective': 1}"/>
+                            <field name="users_id" options="{'no_create': True}"/>
+                            <!--<field name="type_stamp_ids" widget="many2many_tags" options="{'no_create': True, 'no_open': True}" context="{'search_default_group_by_scope': 1, 'search_default_filter_effective': 1}"/>-->
+                        </group>
+                        <group>
                             <field name="approval_unit"/>
-                            <field name="remake"/>
-                            <field name="document_ids" widget="preview_many2many"/>
+                            <field name="type_stamp_ids" widget="many2many_tags" options="{'no_create': True, 'no_open': True}" context="{'search_default_group_by_scope': 1, 'search_default_filter_effective': 1}"/>
                             <field name="department_id" invisible="1"/>
                         </group>
                     </group>
+                    <group>
+                        <field name="remake"/>
+                        <field name="document_ids" widget="preview_many2many"/>
+                    </group>
                 </sheet>
             </form>
         </field>