Accept Merge Request #499: (feature/修改机床参数bug -> develop)

Merge Request: 制造标准改成执行标准

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/499?initial=true

sf_base/models/common.py

@@ -68,7 +68,7 @@ class MrsMaterialModel(models.Model):
     density = fields.Float("密度(kg/m³)")
     materials_id = fields.Many2one('sf.production.materials', "材料名")
     tensile_strength = fields.Char("拉伸强度(n/mm²)")
-    standards_id = fields.Many2one('sf.international.standards', '制造标准')
+    standards_id = fields.Many2one('sf.international.standards', '执行标准')
     alloy_code = fields.Char('合金牌号')
     price = fields.Float('单价/kg')
     apply = fields.Many2many('material.apply', string='材料应用')

sf_base/views/common_view.xml

@@ -269,6 +269,7 @@
                     <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
                     <searchpanel class="account_root">
                         <field name="materials_id" icon="fa-filter"/>
+                        <field name="standards_id" icon="fa-filter"/>
                     </searchpanel>
                 </search>
             </field>