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 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 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..09ba627a 100644 --- a/sf_plan/views/view.xml +++ b/sf_plan/views/view.xml @@ -27,8 +27,14 @@
+
+

+ +

+
@@ -38,12 +44,25 @@ - - - - - - + + + + + + + + + + + + + + + + + + + @@ -66,12 +85,13 @@ sf.pl.plan.gantt sf.pl.plan - + @@ -80,21 +100,43 @@ -
-
-
-
    -
  • 开始时间:
    • -
  • 结束时间:
    • -
  • 坯料编号:
    • -
  • 坯料名称:
    • -
  • 数量:
    • -
  • 材质:
    • -
+
+
+
+
    +
  • + 开始时间: + +
    • +
  • + 结束时间: + +
    • +
  • + 坯料编号: + +
    • +
  • + 坯料名称: + +
    • +
  • + 数量: + +
    • +
  • + 材质: + +
    • +
  • + 状态: + +
    • +
+
-
- + @@ -113,6 +155,6 @@ parent="mrp_workorder.mrp_workorder_menu_planning" sequence="10" action="sf_pl_plan_action" - /> + /> 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