From f4428fde9f5480301ab3f105a4b4afe49150c8e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?WEB=E8=AE=B8=E4=BD=95=E5=93=B2=5Cxuhez?= Date: Wed, 16 Aug 2023 09:25:13 +0800 Subject: [PATCH 1/4] =?UTF-8?q?gantt=E5=9B=BE=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_plan/__manifest__.py | 1 + sf_plan/static/src/scss/gannt_change.scss | 3 ++ sf_plan/views/view.xml | 63 ++++++++++++++++------- 3 files changed, 47 insertions(+), 20 deletions(-) create mode 100644 sf_plan/static/src/scss/gannt_change.scss diff --git a/sf_plan/__manifest__.py b/sf_plan/__manifest__.py index 2c965850..80a9d5fb 100644 --- a/sf_plan/__manifest__.py +++ b/sf_plan/__manifest__.py @@ -24,6 +24,7 @@ 'web.assets_qweb': [ ], 'web.assets_backend': [ + 'sf_plan/static/src/scss/gannt_change.scss' ], }, diff --git a/sf_plan/static/src/scss/gannt_change.scss b/sf_plan/static/src/scss/gannt_change.scss new file mode 100644 index 00000000..e9ffbc59 --- /dev/null +++ b/sf_plan/static/src/scss/gannt_change.scss @@ -0,0 +1,3 @@ +//.o_gantt_view .o_gantt_row_nogroup .o_gantt_pill { +// background-color: #6ec89b !important; +//} \ No newline at end of file diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml index 9e82fd8a..3366ce49 100644 --- a/sf_plan/views/view.xml +++ b/sf_plan/views/view.xml @@ -66,12 +66,13 @@ sf.pl.plan.gantt sf.pl.plan - + @@ -80,21 +81,43 @@ -
-
-
-
    -
  • 开始时间:
    • -
  • 结束时间:
    • -
  • 坯料编号:
    • -
  • 坯料名称:
    • -
  • 数量:
    • -
  • 材质:
    • -
+
+
+
+
    +
  • + 开始时间: + +
    • +
  • + 结束时间: + +
    • +
  • + 坯料编号: + +
    • +
  • + 坯料名称: + +
    • +
  • + 数量: + +
    • +
  • + 材质: + +
    • +
  • + 状态: + +
    • +
+
-
- + @@ -113,6 +136,6 @@ parent="mrp_workorder.mrp_workorder_menu_planning" sequence="10" action="sf_pl_plan_action" - /> + /> From 06ed10bd5e8d60e8477cc13e45889e539dd2112b Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Wed, 16 Aug 2023 09:42:51 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_plan/views/view.xml | 31 +++++++++++++++---- .../static/src/js/3d_viewer.js | 3 ++ 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml index 9e82fd8a..c3cc8218 100644 --- a/sf_plan/views/view.xml +++ b/sf_plan/views/view.xml @@ -27,8 +27,14 @@
+
+

+ +

+
@@ -38,12 +44,25 @@ - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/web_widget_model_viewer/static/src/js/3d_viewer.js b/web_widget_model_viewer/static/src/js/3d_viewer.js index 261590fb..582c887f 100644 --- a/web_widget_model_viewer/static/src/js/3d_viewer.js +++ b/web_widget_model_viewer/static/src/js/3d_viewer.js @@ -20,6 +20,7 @@ import { Component, onWillUpdateProps, useState, useRef, useEffect } from "@odoo export class StepViewer extends Component { setup() { + console.log('setup') this.props.url = this.formatUrl(); } @@ -33,9 +34,11 @@ export class StepViewer extends Component { id: JSON.stringify(this.props.record.data['id']), field: this.props.name} url = url_props['base_url']+'/web/content/'+url_props['model']+'/'+url_props['id']+'/'+url_props['field']+'?download=true' + console.log('url', url) } else { url = "data:model/gltf-binary;base64," + this.props.value; + console.log('url222', url) } } return url From 2169c10417c5b167abaae57d15ad069c8b50eb08 Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Wed, 16 Aug 2023 10:11:40 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=BA=BF=E9=A9=BE=E9=A9=B6=E8=88=B1=E5=BD=A2=E5=BC=8F=E4=B8=BA?= =?UTF-8?q?searchpanel=EF=BC=8C=E8=B4=B4=E8=BF=91=E6=95=B4=E4=BD=93?= =?UTF-8?q?=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/mrp_workcenter_views.xml | 415 +++++++++--------- 1 file changed, 208 insertions(+), 207 deletions(-) diff --git a/sf_manufacturing/views/mrp_workcenter_views.xml b/sf_manufacturing/views/mrp_workcenter_views.xml index cc3f6015..3bd8260e 100644 --- a/sf_manufacturing/views/mrp_workcenter_views.xml +++ b/sf_manufacturing/views/mrp_workcenter_views.xml @@ -102,197 +102,202 @@ - - - - - - - - - - - - - - - mrp.workcenter.kanban.inherit - mrp.workcenter - - - - - - - - - - - - - - - -
-
-
- - - -
-
- - - -
-
-
-
-
-
- - - - - - -
-
-
-
-
- - To Launch - -
-
- -
-
-
-
- - In Progress - -
-
- -
-
-
-
- - Late - -
-
- -
-
-
-
- - OEE - -
-
- - - % - - -
-
-
-
-
-
- - - -
-
-
- -
- - - - - - + + + + + + + + + + + + + + + + + + + + + + + + --> + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -321,22 +326,18 @@ - - - - - - - - - - - - - - + + + mrp.workcenter.inherit + mrp.workcenter + + + + + + + + + - - ======= - >>>>>>> develop From 9d025c10b4c47d1271e4a26e1940d0560d3627a4 Mon Sep 17 00:00:00 2001 From: yuxianghui <1608204036@qq.com> Date: Wed, 16 Aug 2023 11:00:34 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=B0=86=E8=AE=B0=E5=BD=95=E7=9A=84?= =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=92=8C=E8=AF=84=E8=AE=BA=E7=AA=97=E5=8F=A3?= =?UTF-8?q?=E4=BB=8Eform=E8=A7=86=E5=9B=BE=E5=8F=B3=E4=BE=A7=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E5=88=B0=E8=A7=86=E5=9B=BE=E6=9C=80=E4=B8=8B=E6=96=B9?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/src/scss/tablet_view.scss | 25 +++++++++++++++++++ mrp_workorder/views/mrp_production_views.xml | 18 +++++++++++++ 2 files changed, 43 insertions(+) diff --git a/mrp_workorder/static/src/scss/tablet_view.scss b/mrp_workorder/static/src/scss/tablet_view.scss index 16aa5d06..0ecc86da 100644 --- a/mrp_workorder/static/src/scss/tablet_view.scss +++ b/mrp_workorder/static/src/scss/tablet_view.scss @@ -224,3 +224,28 @@ } } } + +.o_form_view.o_xxl_form_view { + flex-flow:column !important; +} + +.o_form_view_container { + width:100% !important; +} + +html .o_web_client > .o_action_manager > .o_action { + overflow:scroll !important; +} + +.o_FormRenderer_chatterContainer.o-aside { + width:100% !important; + max-width: 1320px !important; + background-color:#ccc !important; +} + +.o_form_view { + background-color:unset !important; + border: 1px solid #C9CCD2 !important; + border-left-color:unset !important; + box-shadow: 0 5px 20px -15px rgb(0 0 0 / 40%) !important; +} diff --git a/mrp_workorder/views/mrp_production_views.xml b/mrp_workorder/views/mrp_production_views.xml index be335b85..a033d501 100644 --- a/mrp_workorder/views/mrp_production_views.xml +++ b/mrp_workorder/views/mrp_production_views.xml @@ -19,6 +19,24 @@ + + + + + + + + + + + + + + + + + + mrp.production.search.view.inherit.planning mrp.production