!538 zhou

Merge pull request !538 from 李鹏宇/dev_zhou

yuthon_issue/models/issue_approval_decision.py

@@ -13,7 +13,7 @@ class IssueApprovalDecision(models.Model):
     specifics = fields.Text(string='具体事项')
     council = fields.Selection([('approval', '审'), ('decide', '决')], string='党总委员会')
     team_meet = fields.Selection([('approval', '审'), ('decide', '决')], string='经营班子会')
-    board_meet = fields.Selection([('approval', '审'), ('decide', '决'), ('commission', '授权投决会')], string='董事会', compute='_compute_board_meet')
+    board_meet = fields.Selection([('approval', '审'), ('decide', '决'), ('commission', '授权投决会')], string='董事会', compute='_compute_board_meet', readonly=False)
     district_bureau = fields.Selection([('record', '备案'), ('approved', '核准'), ('record_approved', '备案、核准')], string='上级单位')
     yuthon_company = fields.Selection([('thtz', '天河投资集团'), ('thwg', '天河物管'),
                                        ('thlc', '天河粮储'), ('tctj', '天投城建')], string="所属公司")
@@ -36,9 +36,9 @@ class IssueApprovalDecision(models.Model):
             if seq.decision_type_id.decision_type_id:
                 seq.decision_type_on_id = seq.decision_type_id.decision_type_id
 
-    @api.depends('board_meet')
+    @api.depends('team_meet')
     def _compute_board_meet(self):
         for record in self:
-            if record.board_meet:
-                record.team_meet = 'approval'
+            if record.team_meet:
+                record.board_meet = 'approval'
 

yuthon_issue/views/issue_approval_decision_views.xml

@@ -6,9 +6,9 @@
         <field name="arch" type="xml">
             <tree string="决策清单">
                 <field name="sequence"/>
+                <field name="specifics" required="1"/>
                 <field name="decision_type_id"/>
                 <field name="decision_type_on_id"/>
-                <field name="specifics" required="1"/>
                 <field name="council"/>
                 <field name="team_meet"/>
                 <field name="board_meet"/>