!5799 !5798 添加功能

Merge pull request !5799 from 李鹏宇/dev

yuthon_hr_attendance/controllers/applet_attendance.py

@@ -794,6 +794,8 @@ class AppletAttendance(Controller):
                 state = electric.state
                 electric_value = {
                     'id': electric.id,
+                    'current_meter': electric.current_meter or 0,
+                    'current_read': electric.current_read or 0,
                     'code': electric.archives_id.name or '',
                     'last_dosage': electric.last_dosage or 0,
                     'mater_data': str(electric.meter_date) if electric.meter_date else '',
@@ -853,6 +855,8 @@ class AppletAttendance(Controller):
                 state = water.state
                 water_value = {
                     'id': water.id,
+                    'current_meter': water.current_meter or 0,
+                    'current_read': water.current_read or 0,
                     'code': water.water_id.name,
                     'last_dosage': water.last_dosage or 0,
                     'mater_data': str(water.meter_date) if water.meter_date else '',

yuthon_property_approval/views/inherit_yuthon_property_views.xml

@@ -38,7 +38,7 @@
         <xpath expr="//field[@name='archives_id']" position="before">
             <field name="archives_id"
                    string="综合搜索"
-                   filter_domain="['|', '|', '|', '|',
+                   filter_domain="['|', '|', '|',
                        ('archives_id.name', 'ilike', self),
                        ('unit_number', 'ilike', self),
                        ('lessee_id.name', 'ilike', self),