!972 结束

Merge pull request !972 from 李鹏宇/dev_zhou

yuthon_property/models/property_meter_water.py

@@ -5,7 +5,8 @@ class PropertyMeterWater(models.Model):
     _name = 'property.meter.water'
     _description = '仪表档案(水）'
 
-    name = fields.Char(string='标题')
+    name = fields.Char(string='仪表编号')
+    unit_number = fields.Char(string='单元编号')
     meter_properties = fields.Selection([('household_tables','户表'),('virtual_tables','虚拟表')], string='仪表性质')
     installation_location = fields.Char(string='安装位置')
     device_number = fields.Char(string='设备编号')
@@ -16,7 +17,8 @@ class PropertyMeterWater(models.Model):
     meter_gateways = fields.Char(string='仪表网关') #选择字段 后续优化
     is_state = fields.Boolean(string='是否启用')
     gauge_type = fields.Char(string='仪表类型', default='水表')
-    gauge_coding = fields.Char(string='仪表编码')
+    other = fields.Char(string='其他')
+    type = fields.Selection([('public', '公共'), ('fees', '收费')], string='类型')
     gauge_magnification = fields.Float(string='仪表倍率')
     maximum_count = fields.Float(string='最大计数')
     other_encoding = fields.Char(string='其他编码')

yuthon_property/views/property_meter_water_views.xml

@@ -10,6 +10,7 @@
                 <field name="gauge_model"/>
                 <field name="gauge_magnification"/>
                 <field name="maximum_count"/>
+                <field name="type"/>
                 <field name="last_reading_time"/>
                 <field name="pre_existing_balances"/>
             </tree>
@@ -42,7 +43,8 @@
                         </group>
                         <group>
                             <field name="gauge_type" readonly="1"/>
-                            <field name="gauge_coding"/>
+                            <field name="other"/>
+                            <field name="type"/>
                             <field name="gauge_magnification"/>
                             <field name="maximum_count"/>
                             <field name="other_encoding"/>