From 2cc03c21edf115280acc7cdab31ccf6649fb0d21 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Fri, 15 Sep 2023 10:37:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BE=E6=96=87=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/src/scss/custom_style.scss         | 14 +++++++++-
 sf_maintenance/views/maintenance_views.xml    |  2 +-
 .../views/mrp_workcenter_views.xml            | 26 ++++++++++++-------
 sf_plan/views/view.xml                        |  4 +--
 web_gantt/static/src/js/gantt_renderer.js     |  2 +-
 5 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss
index a9f2cee8..fdbd674b 100644
--- a/jikimo_frontend/static/src/scss/custom_style.scss
+++ b/jikimo_frontend/static/src/scss/custom_style.scss
@@ -148,4 +148,16 @@ td.o_required_modifier {
   justify-content: flex-start;
 }
 
-//-----------------------------------------------------------
\ No newline at end of file
+//-----------------------------------------------------------
+//图文展示换行及对齐
+.many2many_flex  {
+  flex-wrap: wrap;
+}
+
+.many2many_flex > div {
+  width: 110px;
+  margin-right: 15px;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+}
\ No newline at end of file
diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml
index 5c699af0..cbb063a0 100644
--- a/sf_maintenance/views/maintenance_views.xml
+++ b/sf_maintenance/views/maintenance_views.xml
@@ -177,7 +177,7 @@
 
                     </page>
 
-                    <page string="图文展示">
+                    <page string="加工能力">
                         <field name='image_id' widget="custom_many2many_checkboxes">
                             <tree editable="bottom">
                                 <field name="name"/>
diff --git a/sf_manufacturing/views/mrp_workcenter_views.xml b/sf_manufacturing/views/mrp_workcenter_views.xml
index 48487bfd..c38613f6 100644
--- a/sf_manufacturing/views/mrp_workcenter_views.xml
+++ b/sf_manufacturing/views/mrp_workcenter_views.xml
@@ -31,28 +31,36 @@
             <field name="arch" type="xml">
                 <!-- Desktop view -->
                 <xpath expr='(//field[@name="name"])[1]' position="after">
-
                         <field name="equipment_status" />
                         <field name="equipment_image" />
-
-
                 </xpath>
                  <xpath expr='(//field[@name="name"])[2]' position="after">
-
                         <field name="equipment_status" />
                         <field name="equipment_image" widget="image" />
-
-
                 </xpath>
                 <xpath expr='(//a[@name="unblock"])' position="after">
-
                         <div class="czyg">绿色：正常，红色：故障，黄色：下线/暂停</div>
-
-
                 </xpath>
             </field>
         </record>
 
+<!--         继承原有的看板视图 -->
+    <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">
+                <div 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>
+                </div>
+            </xpath>
+        </field>
+    </record>
+
     <!-- override to change the no content image -->
     <record id="mrp.action_work_orders" model="ir.actions.act_window">
         <field name="help" type="html">
diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml
index 7878fa5f..f7c22624 100644
--- a/sf_plan/views/view.xml
+++ b/sf_plan/views/view.xml
@@ -35,7 +35,7 @@
                         <button string="取消排程" name="cancel_production_schedule" type="object" class="oe_highlight"/>
 <!--                         <button string="销售单" name="test_sale_order" type="object" class="oe_highlight"/> -->
 <!--                         <button string="测试流程" name="liucheng_cs" type="object" class="oe_highlight"/> -->
-<!--                         <field name="state" widget="statusbar" statusbar_visible="draft,produce"/> -->
+                        <field name="state" widget="statusbar" statusbar_visible="draft,done,processing,finished"/>
                     </header>
                     <sheet>
                         <div class="oe_title">
@@ -128,7 +128,7 @@
                        decoration-success="state == 'done'"
                        progress_bar="name"
                        form_view_id="sf_production_plan_form"
-                       default_scale="year"
+                       default_scale="week"
                        scales="day,week,month,year"
                        precision="{'day': 'hour:quarter', 'week': 'day:half', 'month': 'day', 'year': 'month:quarter'}">
                         <field name="shift"/>
diff --git a/web_gantt/static/src/js/gantt_renderer.js b/web_gantt/static/src/js/gantt_renderer.js
index 4ef5b845..d0c55a1d 100644
--- a/web_gantt/static/src/js/gantt_renderer.js
+++ b/web_gantt/static/src/js/gantt_renderer.js
@@ -635,7 +635,7 @@ export default AbstractRenderer.extend(WidgetAdapterMixin, {
         const focusDate = this.state.focusDate;
         switch (this.state.scale) {
             case 'day':
-                return focusDate.format('dddd, MMMM DD, YYYY');
+                return focusDate.format('YYYY MMMM DD dddd');
             case 'week':
                 // const dateStart = focusDate.clone().startOf('week').format('DD MMMM YYYY');
                 const dateStart = focusDate.clone().startOf('week').format('YYYY MMMM DD ');