Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/自建模块日志警告信息处理

sf_base/models/base.py

@@ -35,7 +35,7 @@ class MachineBrand(models.Model):
     code = fields.Char('编码')
     name = fields.Char('名称')
     tag_ids = fields.Many2many('sf.machine.brand.tags', 'rel_machine_brand_tags', string='类别')
-    image_brand = fields.Image("品牌图片")
+    image_brand = fields.Image("图片")
     remark = fields.Text('备注')
     active = fields.Boolean('有效', default=True)
 

sf_base/static/src/scss/test.scss

@@ -120,3 +120,21 @@ td.o_required_modifier {
   font-family: '华文中宋';
   //font-weight: bold;
 }
+
+.o_list_table th > div > i {
+  display: none !important;
+}
+
+body .o_list_table th:nth-child(4) {
+  width: 100px !important;
+}
+
+//body .o_list_table th:nth-child(5) {
+//  width: 500px !important;
+//}
+
+.o_list_renderer .o_list_table tbody > tr > td:not(.o_list_record_selector):not(.o_handle_cell):not(.o_list_button):not(.o_list_record_remove).o_list_text {
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}

sf_maintenance/views/maintenance_views.xml

@@ -171,12 +171,7 @@
 
 
                     </page>
-                    <page string="其他" attrs="{'invisible': [('type_id', '=', False)]}">
+
-                        <group string="其他">
-                            <field name="remark"/>
-                        </group>
-                        <button type="object" class="oe_highlight" name='enroll_machine_tool' string="机床注册"/>
-                    </page>
 
 
                 </xpath>
@@ -206,6 +201,23 @@
                     <field name='equipment_maintenance_standards_ids' widget="many2many_tags" invisible="1"/>
 
                 </xpath>
+                <xpath expr="//page[@name='description']" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </xpath>
+
+                <xpath expr="//page[@name='product_information']" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </xpath>
+
+                <xpath expr="//page[@name='maintenance']" position="after">
+                     <page string="其他" attrs="{'invisible': [('type_id', '=', False)]}">
+                        <group string="其他">
+                            <field name="remark"/>
+                        </group>
+                        <button type="object" class="oe_highlight" name='enroll_machine_tool' string="机床注册"/>
+                    </page>
+                </xpath>
+
             </data>
         </field>
     </record>
@@ -286,7 +298,7 @@
             </xpath>
 
 
-          <xpath expr="//templates" position="inside">
+            <xpath expr="//templates" position="inside">
                 <t t-name="kanban-box">
                     <div t-attf-class="oe_kanban_global_click o_kanban_record_has_image_fill o_hr_kanban_record oe_kanban_card oe_kanban_global_click">
 
@@ -303,7 +315,7 @@
                             <div class="o_kanban_record_bottom state_zc">
                                 <field name="state_zc"/>
                             </div>
-                              <div class="o_kanban_record_bottom state_zc">
+                            <div class="o_kanban_record_bottom state_zc">
                                 <field name="technician_user_id"/>
                             </div>
                             <div class="o_kanban_record_bottom state_zc"