Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/产品模板优化

sf_base/views/base_view.xml

@@ -95,8 +95,8 @@
                 <field name="name" string="名称"/>
                 <field name="machine_tool_category"/>
                 <field name="brand_id"/>
-                <field name="remark"/>
                 <field name="machine_tool_picture" widget="image"/>
+                <field name="remark"/>
             </tree>
         </field>
     </record>

sf_maintenance/models/sf_equipment_maintenance_standards.py

@@ -58,6 +58,14 @@ class SfSaintenanceStandards(models.Model):
     maintenance_standards = fields.Char('维保标准')
     equipment_maintenance_standards_id = fields.Many2one('equipment.maintenance.standards', string='设备维保标准')
     maintenance_request_id = fields.Many2one('maintenance.request', string='设备维保计划')
+    images = fields.One2many('maintenance.standard.image', 'standard_id', string='反馈图片')
+
+
+class MaintenanceStandardImage(models.Model):
+    _name = 'maintenance.standard.image'
+
+    image = fields.Binary(string='维保图片')
+    standard_id = fields.Many2one('maintenance.standards', string='Standard')
 
 
 

sf_maintenance/models/sf_maintenance_requests.py

@@ -25,7 +25,7 @@ class SfMaintenanceEquipmentCategory(models.Model):
             if not record.equipment_maintenance_id:
                 record.equipment_maintenance_id = False
 
-    maintenance_standards = fields.One2many('maintenance.standards','maintenance_request_id', string='维保标准')
+    maintenance_standards = fields.One2many('maintenance.standards', 'maintenance_request_id', string='维保标准')
 
     @api.constrains('equipment_maintenance_id')
     def _check_equipment_maintenance_id(self):

sf_maintenance/security/ir.model.access.csv

@@ -3,7 +3,7 @@ access_equipment_maintenance_standards,equipment_maintenance_standards,model_equ
 access_sf_maintenance_logs,sf_maintenance_logs,model_sf_maintenance_logs,base.group_user,1,1,1,1
 access_maintenance_equipment,maintenance_equipment,model_maintenance_equipment,base.group_user,1,1,1,1
 access_maintenance_standards,maintenance_standards,model_maintenance_standards,base.group_user,1,1,1,1
-
+access_maintenance_standard_image,maintenance_standard_image,model_maintenance_standard_image,base.group_user,1,1,1,1
 
 
 

sf_maintenance/views/maintenance_request_views.xml

@@ -8,8 +8,10 @@
         <field name="inherit_id" ref="maintenance.hr_equipment_request_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//button[@name='archive_equipment_request']" position="before">
-                <button name="confirm_maintenance" string="确认维保计划" type="object" class="btn-primary" attrs="{'invisible': [('stage_id', '!=', 1)]}" />
+                <button name="confirm_maintenance" string="确认维保计划" type="object" class="btn-primary"
-                <button name="confirm_maintenance_done" string="标记已完成" type="object" class="btn-primary" attrs="{'invisible': [('stage_id', '!=', 2)]}" />
+                        attrs="{'invisible': [('stage_id', '!=', 1)]}"/>
+                <button name="confirm_maintenance_done" string="标记已完成" type="object" class="btn-primary"
+                        attrs="{'invisible': [('stage_id', '!=', 2)]}"/>
             </xpath>
             <xpath expr="//field[@name='maintenance_type']" position="replace">
                 <field name="sf_maintenance_type" widget="radio"/>
@@ -20,12 +22,13 @@
 
                 <notebook>
                     <page string="维保标准" attrs="{'invisible': [('equipment_maintenance_id', '=', False)]}">
-                            <field name="maintenance_standards" widget="ony2many">
+                        <field name="maintenance_standards" widget="ony2many">
-                                <tree editable="bottom">
+                            <tree>
-                                    <field name="name"/>
+                                <field name="name"/>
-                                    <field name="maintenance_standards"/>
+                                <field name="maintenance_standards"/>
-                                </tree>
+                                <field name="images"/>
-                            </field>
+                            </tree>
+                        </field>
 
                     </page>
                 </notebook>
@@ -45,7 +48,7 @@
         <field name="context">{'default_user_id': uid}</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
-               添加维保计划
+                添加维保计划
             </p>
             <p>
                 跟进请求的处理，并且和合作者沟通。
@@ -66,5 +69,32 @@
         <field name="active" eval="False"/>
     </record>
 
+    <!--    维保项目表单视图-->
+
+    <record id="view_maintenance_standards_form" model="ir.ui.view">
+        <field name="name">maintenance.standards.form</field>
+        <field name="model">maintenance.standards</field>
+        <field name="arch" type="xml">
+            <form string="设备维保项目">
+                <sheet>
+                    <group>
+                        <field name="name"/>
+                        <field name="maintenance_standards"/>
+                    </group>
+                    <notebook>
+                        <page string="上传图片">
+                             <field name="images" widget="one2many">
+                        <tree editable="bottom">
+                            <field name="image" widget="image" options="{'size': [100, 100], 'click enlarge': True}"/>
+                        </tree>
+                    </field>
+                        </page>
+                    </notebook>
+
+                </sheet>
+            </form>
+        </field>
+    </record>
+
 
 </odoo>