Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面优化

2023-09-14 18:04:41 +08:00
parent 5fa9d1e16e c45c45607f
commit b966bdd8da
4 changed files with 320 additions and 240 deletions
--- a/jikimo_frontend/static/src/scss/custom_style.scss
+++ b/jikimo_frontend/static/src/scss/custom_style.scss
@@ -49,24 +49,29 @@ td.o_required_modifier {
  display: flex;
  flex-direction: column;
  position: absolute;
-  top: 0;
+  top: 28px;
  bottom: 0;
-  right: 8px;
+  right: 18px;
  margin: auto;
-  height: 34px;
+  //height: 34px;
+  height: unset !important;
+  align-items: center;
 }

 .show_state > div {
-  width: 12px;
+  width: 20px;
  height: 12px;
  border: 1px solid #000
 }

-.show_state > div:nth-child(2) {
-  border-top: none;
+.show_state > div:nth-child(1) {
  border-bottom: none;
 }

+.show_state > div:nth-child(2) {
+  border-top: 1px solid black !important;
+}
+
 .oe_kanban_card.kanban_color_2 {
  background-color: #FF4343 !important;
  color: #fff;
@@ -83,6 +88,11 @@ td.o_required_modifier {
  color: #fff;
 }

+.my-image div {
+  width: 122px !important;
+  height: 122px !important;
+}
+
 .my-image img {
  width: 100%;
  height: 100%;
@@ -149,3 +159,61 @@ td.o_required_modifier {
 }

 //-----------------------------------------------------------
+div[class="o_content o_component_with_search_panel"] .oe_kanban_color_0 {
+  position: relative;
+  padding: 0 !important;
+}
+
+div[class="o_content o_component_with_search_panel"] img[name="equipment_image"] {
+  width: 150px !important;
+}
+
+div[class="o_content o_component_with_search_panel"] .o_kanban_card_content button {
+  position: absolute;
+  top: -52px;
+  left: -55px;
+  width: 80px;
+}
+
+div[class="o_content o_component_with_search_panel"] .o_primary > span:nth-of-type(1) {
+  position: absolute;
+  top: 10px;
+  left: 168px;
+}
+
+div[class="o_content o_component_with_search_panel"] .o_primary > span:nth-of-type(2) {
+  margin-left: 18px;
+}
+
+div[class="o_content o_component_with_search_panel"] .o_kanban_dashboard:not(.o_legacy_kanban_view) .o_kanban_record > div .o_kanban_manage_toggle_button {
+  top: 10px !important;
+  right: 17px !important;
+}
+
+div[class="o_content o_component_with_search_panel"] .o_kanban_record_headings .ml8 {
+  margin-left: 0px !important;
+}
+
+div[class="o_content o_component_with_search_panel"] .o_kanban_dashboard:not(.o_legacy_kanban_view) .o_kanban_record > div .o_kanban_card_content {
+  min-height: 0 !important;
+  height: 0 !important;
+}
+
+div[class="o_content o_component_with_search_panel"] .o_kanban_dashboard:not(.o_legacy_kanban_view) .o_kanban_record > div .o_kanban_card_header + .container.o_kanban_card_content {
+  margin-top: -5px !important;
+}
+
+div[class="o_content o_component_with_search_panel"] .o_kanban_primary_left {
+  right: 10px;
+  padding: 0 !important;
+}
+
+div[class="o_content o_component_with_search_panel"] .show_state {
+  right: 10px !important;
+  top: 45px !important;
+}
+
+div[class="o_content o_component_with_search_panel"] .show_state span {
+  margin-top: 10px;
+  font-size: 12px;
+}
--- a/sf_maintenance/models/sf_equipment_maintenance_standards.py
+++ b/sf_maintenance/models/sf_equipment_maintenance_standards.py
@@ -62,7 +62,6 @@ class SfSaintenanceStandards(models.Model):
    fault_type = fields.Selection(
        [('电气类', '电气类'), ('机械类', '机械类'), ('程序类', '程序类'), ('系统类', '系统类')], string='类别')
    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='反馈图片')
    Period = fields.Integer('周期/频次(天)')
    remark = fields.Char('备注说明')
--- a/sf_maintenance/models/sf_maintenance_requests.py
+++ b/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.Many2many('maintenance.standards', string='维保标准')

    @api.constrains('equipment_maintenance_id')
    def _check_equipment_maintenance_id(self):
--- a/sf_manufacturing/views/mrp_workcenter_views.xml
+++ b/sf_manufacturing/views/mrp_workcenter_views.xml
@@ -30,25 +30,37 @@
        <field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/>
        <field name="arch" type="xml">
            <!-- Desktop view -->
-                <xpath expr='(//field[@name="name"])[1]' position="after">
-
+            <xpath expr='(//field[@name="name"])[1]' position="before">
                <field name="equipment_status"/>
                <field name="equipment_image"/>
-
-
            </xpath>
-                 <xpath expr='(//field[@name="name"])[2]' position="after">
-
-                        <field name="equipment_status" />
+            <xpath expr='(//field[@name="name"])[2]' position="before">
                <field name="equipment_image" widget="image"/>

-
            </xpath>
            <xpath expr='(//a[@name="unblock"])' position="after">
-
-                        <div class="czyg">绿色：正常，红色：故障，黄色：下线/暂停</div>
-
-
+<!--                <div class="czyg">绿色：正常，红色：故障，黄色：下线/暂停</div>-->
+            </xpath>
+        </field>
+    </record>
+<!--&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;-->
+    <record id="mrp_workcenter_kanban_inherit1" model="ir.ui.view">
+        <field name="name">mrp.workcenter.kanban.inherit</field>
+        <field name="model">mrp.workcenter</field>
+        <field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/>
+        <field name="arch" type="xml">
+            <xpath expr="//kanban//templates//t" position="inside">
+                <p class="show_state" t-attf-class="oe_kanban_global_click o_kanban_record_has_image_fill o_hr_kanban_record oe_kanban_card oe_kanban_global_click
+                ">
+                    <div t-attf-class="#{record.equipment_status.raw_value == '正常' ? 'color_1' : ''}"></div>
+                    <div t-attf-class="#{record.equipment_status.raw_value == '故障' ? 'color_2' : ''}"></div>
+                    <div t-attf-class="#{record.equipment_status.raw_value == '不可用' ? 'color_3' : ''}"></div>
+                    <span t-attf-class="#{record.equipment_status.raw_value == '正常' ? 'font_color_1' : ''}
+                        #{record.equipment_status.raw_value == '故障' ? 'font_color_2' : ''}
+                        #{record.equipment_status.raw_value == '不可用' ? 'font_color_3' : ''}">
+                        <field name="equipment_status"/>
+                    </span>
+                </p>
            </xpath>
        </field>
    </record>
@@ -155,7 +167,8 @@
    <!--                         <t t-name="kanban-box" -->
    <!--                            t-if="record.production_line_id.value == record.production_line_show.raw_value"> -->
    <!--                            <div t-on-click="console.log(record.production_line_id,'11111111111')"></div>--> -->
-<!--                            <div t-on-click="console.log(record.production_line_show,'22222222222')"></div>--> -->
+    <!--                            <div t-on-click="console.log(record.production_line_show,'22222222222')"></div>-->
+    -->
    <!--                             <div t-attf-class="#{!selection_mode ? kanban_color(record.color.raw_value) : ''}"> -->
    <!--                                 <div t-attf-class="o_kanban_card_header o_kanban_record_top"> -->
    <!--                                     <div class="o_kanban_record_headings o_kanban_card_header_title"> -->