!6180 添加功能

Merge pull request !6180 from 李鹏宇/dev_zhou

yuthon_maintain/models/processing_order_approval.py

@@ -61,6 +61,7 @@ class ProcessingOrderApproval(models.Model):
     fee_description = fields.Text(string="费用说明")
 
     follow_up = fields.Text(string="后续情况")
+    create_time = fields.Date(string="创建日期", default=fields.Datetime.now)
 
     def _get_default_name_title(self):
         return self._description if self._description else self._name

yuthon_maintain/models/property_device_repair.py

@@ -20,6 +20,7 @@ class PropertyDeviceRelief(models.Model):
     start_date = fields.Date(string="开始日期")
     remake = fields.Text(string="备注")
     report_state = fields.Selection([('to', '待处理'), ('done', '已处理')], string='状态', default='to')
+    create_time = fields.Date(string="创建日期", default=fields.Datetime.now)
     urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度',
                                      default='normal')
     documents_ids = fields.Many2many('ir.attachment', string="附件")

yuthon_maintain/models/property_report_repair.py

@@ -20,7 +20,6 @@ class PropertyRentRelief(models.Model):
     contact = fields.Char(string="联系人")
     phone = fields.Char( string="联系电话")
     leader_id = fields.Many2one('res.users', string="负责人")
-    start_date = fields.Date(string="开始日期")
     types_repairs = fields.Selection([('hydropower', '水电维修'), ('building', '门窗维修'), ('other', '其他维修')], string='维修类型')
     problem_description = fields.Text(string="问题描述")
     remake = fields.Text(string="备注")
@@ -32,6 +31,7 @@ class PropertyRentRelief(models.Model):
     work_end = fields.Boolean(string="结束")
     self_users_ids = fields.Many2many('res.users', string="当前经办人",
                                       default=lambda self: [(6, 0, [self.env.user.id])])
+    create_time = fields.Date(string="创建日期", default=fields.Datetime.now)
     def _get_default_name_title(self):
         return self._description if self._description else self._name
 

yuthon_maintain/views/processing_order_approval_views.xml

@@ -10,6 +10,8 @@
                 </header>
                 <field name="name"/>
                 <field name="users_id"/>
+                <field name="processing_results"/>
+                <field name="create_time"/>
             </tree>
         </field>
     </record>

yuthon_maintain/views/property_device_repair_views.xml

@@ -6,8 +6,11 @@
         <field name="arch" type="xml">
             <tree string="报事报修（办公设备）">
                 <field name="name"/>
+                <field name="code"/>
                 <field name="software_processing_id"/>
-                <button name="pull_order" type="object" string="处理" class="btn-primary"/>
+                <field name="report_state"/>
+                <field name="create_time"/>
+                <button name="pull_order" type="object" string="处理" class="btn-primary" invisible="report_state != to"/>
             </tree>
         </field>
     </record>

yuthon_maintain/views/property_report_repair.xml

@@ -6,10 +6,13 @@
         <field name="arch" type="xml">
             <tree string="报事报修（物业）">
                 <field name="name"/>
+                <field name="code"/>
                 <field name="property_id"/>
+                <field name="types_repairs"/>
                 <field name="leader_id"/>
                 <field name="report_state"/>
-                <button name="pull_order" type="object" string="处理" class="btn-primary"/>
+                <field name="create_time"/>
+                <button name="pull_order" type="object" string="处理" class="btn-primary" invisible="report_state != to"/>
             </tree>
         </field>
     </record>
@@ -58,7 +61,6 @@
                             <field name="phone"/>
                         </group>
                         <group>
-                            <field name="start_date"/>
                             <field name="report_state"/>
                             <field name="problem_description"/>
                         </group>