Merge remote-tracking branch 'origin/develop' into feature/必填字段label添加星号
This commit is contained in:
WEB许何哲\xuhez
@@ -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;
|
||||
}
|
||||
|
||||
@@ -19,6 +19,24 @@
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- <record id="mrp_production_form_inherit_planning" model="ir.ui.view">-->
|
||||
<!-- <field name="name">mrp.production.form_inherit_planning</field>-->
|
||||
<!-- <field name="model">mrp.production</field>-->
|
||||
<!-- <field name="inherit_id" ref="mrp.mrp_production_form_view"/>-->
|
||||
<!-- <field name="arch" type="xml">-->
|
||||
<!-- <xpath expr="div[hasclass('oe_chatter')]" position="replace">-->
|
||||
<!-- <!– 这里放置替换后的内容 –>-->
|
||||
<!-- </xpath>-->
|
||||
<!-- <xpath expr="//notebook" position="after">-->
|
||||
<!-- <div class="oe_chatter">-->
|
||||
<!-- <field name="message_follower_ids"/>-->
|
||||
<!-- <field name="activity_ids"/>-->
|
||||
<!-- <field name="message_ids"/>-->
|
||||
<!-- </div>-->
|
||||
<!-- </xpath>-->
|
||||
<!-- </field>-->
|
||||
<!-- </record>-->
|
||||
|
||||
<record id="mrp_production_view_search_inherit_planning" model="ir.ui.view">
|
||||
<field name="name">mrp.production.search.view.inherit.planning</field>
|
||||
<field name="model">mrp.production</field>
|
||||
|
||||
@@ -102,197 +102,202 @@
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- <record id="mrp_workcenter_view_kanban_inherit_maintenance" model="ir.ui.view"> -->
|
||||
<!-- <field name="name">mrp.workcenter.view.kanban.inherit.maintenance</field> -->
|
||||
<!-- <field name="model">mrp.workcenter</field> -->
|
||||
<!-- <field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/> -->
|
||||
<!-- <field name="arch" type="xml"> -->
|
||||
<!-- <xpath expr="//div[@name='plan_order']" position="after"> -->
|
||||
<!-- <div> -->
|
||||
<!-- <a name="%(maintenance.hr_equipment_request_action)d" type="action">Maintenance</a> -->
|
||||
<!-- </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" position="replace">
|
||||
<kanban class="oe_background_grey o_kanban_dashboard o_workcenter_kanban" create="0" sample="1"
|
||||
js_class="custom_kanban1">
|
||||
<field name="name"/>
|
||||
<field name="color"/>
|
||||
<field name="workorder_count"/>
|
||||
<field name="working_state"/>
|
||||
<field name="oee_target"/>
|
||||
<field name="production_line_show"/>
|
||||
<field name="production_line_id"/>
|
||||
<templates>
|
||||
<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-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">
|
||||
<span class="o_primary ml8" style="display: inline-block">
|
||||
<field name="name"/>
|
||||
</span>
|
||||
</div>
|
||||
<div class="o_kanban_manage_button_section">
|
||||
<a class="o_kanban_manage_toggle_button" href="#">
|
||||
<i class="fa fa-ellipsis-v" role="img" aria-label="Manage" title="Manage"/>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="container o_kanban_card_content">
|
||||
<div class="row mb16">
|
||||
<div class="col-6 o_kanban_primary_left">
|
||||
<div class="btn-group" name="o_wo">
|
||||
<t t-if="record.workorder_count.raw_value > 0">
|
||||
<button class="btn btn-primary" name="action_work_order"
|
||||
type="object"
|
||||
context="{'search_default_ready': 1, 'search_default_progress': 1}">
|
||||
<span>WORK ORDERS</span>
|
||||
</button>
|
||||
</t>
|
||||
<t t-if="record.workorder_count.raw_value <= 0">
|
||||
<button class="btn btn-warning"
|
||||
name="%(mrp.act_product_mrp_production_workcenter)d"
|
||||
type="action">
|
||||
<span>PLAN ORDERS</span>
|
||||
</button>
|
||||
</t>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-6 o_kanban_primary_right">
|
||||
<div class="row" t-if="record.workorder_ready_count.raw_value > 0">
|
||||
<div class="col-8">
|
||||
<a name="action_work_order" type="object"
|
||||
context="{'search_default_ready': 1}">
|
||||
To Launch
|
||||
</a>
|
||||
</div>
|
||||
<div class="col-4 text-end">
|
||||
<field name="workorder_ready_count"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row" t-if="record.workorder_progress_count.raw_value > 0">
|
||||
<div class="col-8">
|
||||
<a name="action_work_order" type="object"
|
||||
context="{'search_default_progress': 1}">
|
||||
In Progress
|
||||
</a>
|
||||
</div>
|
||||
<div class="col-4 text-end">
|
||||
<field name="workorder_progress_count"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row" t-if="record.workorder_late_count.raw_value > 0">
|
||||
<div class="col-8">
|
||||
<a name="action_work_order" type="object"
|
||||
context="{'search_default_late': 1}">
|
||||
Late
|
||||
</a>
|
||||
</div>
|
||||
<div class="col-4 text-end">
|
||||
<field name="workorder_late_count"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row" t-if="record.oee.raw_value > 0">
|
||||
<div class="col-6">
|
||||
<a name="%(mrp.mrp_workcenter_productivity_report_oee)d"
|
||||
type="action">
|
||||
OEE
|
||||
</a>
|
||||
</div>
|
||||
<div class="col-6 text-end">
|
||||
<span t-att-class="record.oee_target.raw_value and (record.oee.raw_value < record.oee_target.raw_value) and 'text-danger' or (record.oee.raw_value > record.oee_target.raw_value) and 'text-success' or 'text-warning'">
|
||||
<strong>
|
||||
<field name="oee" widget="integer"/>%
|
||||
</strong>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-12 o_kanban_primary_left"
|
||||
style="position:absolute; bottom:10px;" name="wc_stages">
|
||||
<a name="%(mrp.act_mrp_block_workcenter)d" type="action"
|
||||
class="o_status float-end"
|
||||
title="No workorder currently in progress. Click to mark work center as blocked."
|
||||
aria-label="No workorder currently in progress. Click to mark work center as blocked."
|
||||
attrs="{'invisible': [('working_state','in',('blocked','done'))]}"/>
|
||||
<a name="unblock" type="object" class=" o_status o_status_red float-end"
|
||||
title="Workcenter blocked, click to unblock."
|
||||
aria-label="Workcenter blocked, click to unblock."
|
||||
attrs="{'invisible': [('working_state','in',('normal','done'))]}"/>
|
||||
<a name="%(mrp.act_mrp_block_workcenter)d" type="action"
|
||||
class="o_status o_status_green float-end"
|
||||
title="Work orders in progress. Click to block work center."
|
||||
aria-label="Work orders in progress. Click to block work center."
|
||||
attrs="{'invisible': [('working_state','in',('normal','blocked'))]}"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="container o_kanban_card_manage_pane dropdown-menu" role="menu">
|
||||
<div class="row">
|
||||
<div class="col-6 o_kanban_card_manage_section o_kanban_manage_view">
|
||||
<div role="menuitem" class="o_kanban_card_manage_title">
|
||||
<span>Actions</span>
|
||||
</div>
|
||||
<div role="menuitem" name="plan_order">
|
||||
<a name="action_work_order" type="object">Plan Orders</a>
|
||||
</div>
|
||||
<div>
|
||||
<a name="%(maintenance.hr_equipment_request_action)d" type="action">
|
||||
Maintenance
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-6 o_kanban_card_manage_section o_kanban_manage_new">
|
||||
<div role="menuitem" class="o_kanban_card_manage_title">
|
||||
<span>Reporting</span>
|
||||
</div>
|
||||
<div role="menuitem">
|
||||
<a name="%(mrp.mrp_workcenter_productivity_report_oee)d" type="action">
|
||||
OEE
|
||||
</a>
|
||||
</div>
|
||||
<div role="menuitem">
|
||||
<a name="%(mrp.mrp_workorder_workcenter_report)d" type="action"
|
||||
context="{'search_default_thisyear':True}">
|
||||
Performance
|
||||
</a>
|
||||
</div>
|
||||
<div role="menuitem">
|
||||
<a name="action_work_order" type="object"
|
||||
context="{'search_default_waiting': 1}">Waiting Availability
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<record id="mrp_workcenter_view_kanban_inherit_maintenance" model="ir.ui.view">
|
||||
<field name="name">mrp.workcenter.view.kanban.inherit.maintenance</field>
|
||||
<field name="model">mrp.workcenter</field>
|
||||
<field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//div[@name='plan_order']" position="after">
|
||||
<div>
|
||||
<a name="%(maintenance.hr_equipment_request_action)d" type="action">Maintenance</a>
|
||||
</div>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<div t-if="widget.editable" class="o_kanban_card_manage_settings row">
|
||||
<div role="menuitem" aria-haspopup="true" class="col-8">
|
||||
<ul role="menu" class="oe_kanban_colorpicker" data-field="color"/>
|
||||
</div>
|
||||
<div role="menuitem" class="text-end">
|
||||
<a type="edit">Settings</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</t>
|
||||
</templates>
|
||||
</kanban>
|
||||
</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" position="replace"> -->
|
||||
<!-- <kanban class="oe_background_grey o_kanban_dashboard o_workcenter_kanban" create="0" sample="1" -->
|
||||
<!-- > -->
|
||||
<!-- <field name="name"/> -->
|
||||
<!-- <field name="color"/> -->
|
||||
<!-- <field name="workorder_count"/> -->
|
||||
<!-- <field name="working_state"/> -->
|
||||
<!-- <field name="oee_target"/> -->
|
||||
<!-- <field name="production_line_show"/> -->
|
||||
<!-- <field name="production_line_id"/> -->
|
||||
<!-- <templates> -->
|
||||
<!-- <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-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"> -->
|
||||
<!-- <span class="o_primary ml8" style="display: inline-block"> -->
|
||||
<!-- <field name="name"/> -->
|
||||
<!-- </span> -->
|
||||
<!-- </div> -->
|
||||
<!-- <div class="o_kanban_manage_button_section"> -->
|
||||
<!-- <a class="o_kanban_manage_toggle_button" href="#"> -->
|
||||
<!-- <i class="fa fa-ellipsis-v" role="img" aria-label="Manage" title="Manage"/> -->
|
||||
<!-- </a> -->
|
||||
<!-- </div> -->
|
||||
<!-- </div> -->
|
||||
<!-- <div class="container o_kanban_card_content"> -->
|
||||
<!-- <div class="row mb16"> -->
|
||||
<!-- <div class="col-6 o_kanban_primary_left"> -->
|
||||
<!-- <div class="btn-group" name="o_wo"> -->
|
||||
<!-- <t t-if="record.workorder_count.raw_value > 0"> -->
|
||||
<!-- <button class="btn btn-primary" name="action_work_order" -->
|
||||
<!-- type="object" -->
|
||||
<!-- context="{'search_default_ready': 1, 'search_default_progress': 1}"> -->
|
||||
<!-- <span>WORK ORDERS</span> -->
|
||||
<!-- </button> -->
|
||||
<!-- </t> -->
|
||||
<!-- <t t-if="record.workorder_count.raw_value <= 0"> -->
|
||||
<!-- <button class="btn btn-warning" -->
|
||||
<!-- name="%(mrp.act_product_mrp_production_workcenter)d" -->
|
||||
<!-- type="action"> -->
|
||||
<!-- <span>PLAN ORDERS</span> -->
|
||||
<!-- </button> -->
|
||||
<!-- </t> -->
|
||||
<!-- </div> -->
|
||||
<!-- </div> -->
|
||||
<!-- <div class="col-6 o_kanban_primary_right"> -->
|
||||
<!-- <div class="row" t-if="record.workorder_ready_count.raw_value > 0"> -->
|
||||
<!-- <div class="col-8"> -->
|
||||
<!-- <a name="action_work_order" type="object" -->
|
||||
<!-- context="{'search_default_ready': 1}"> -->
|
||||
<!-- To Launch -->
|
||||
<!-- </a> -->
|
||||
<!-- </div> -->
|
||||
<!-- <div class="col-4 text-end"> -->
|
||||
<!-- <field name="workorder_ready_count"/> -->
|
||||
<!-- </div> -->
|
||||
<!-- </div> -->
|
||||
<!-- <div class="row" t-if="record.workorder_progress_count.raw_value > 0"> -->
|
||||
<!-- <div class="col-8"> -->
|
||||
<!-- <a name="action_work_order" type="object" -->
|
||||
<!-- context="{'search_default_progress': 1}"> -->
|
||||
<!-- In Progress -->
|
||||
<!-- </a> -->
|
||||
<!-- </div> -->
|
||||
<!-- <div class="col-4 text-end"> -->
|
||||
<!-- <field name="workorder_progress_count"/> -->
|
||||
<!-- </div> -->
|
||||
<!-- </div> -->
|
||||
<!-- <div class="row" t-if="record.workorder_late_count.raw_value > 0"> -->
|
||||
<!-- <div class="col-8"> -->
|
||||
<!-- <a name="action_work_order" type="object" -->
|
||||
<!-- context="{'search_default_late': 1}"> -->
|
||||
<!-- Late -->
|
||||
<!-- </a> -->
|
||||
<!-- </div> -->
|
||||
<!-- <div class="col-4 text-end"> -->
|
||||
<!-- <field name="workorder_late_count"/> -->
|
||||
<!-- </div> -->
|
||||
<!-- </div> -->
|
||||
<!-- <div class="row" t-if="record.oee.raw_value > 0"> -->
|
||||
<!-- <div class="col-6"> -->
|
||||
<!-- <a name="%(mrp.mrp_workcenter_productivity_report_oee)d" -->
|
||||
<!-- type="action"> -->
|
||||
<!-- OEE -->
|
||||
<!-- </a> -->
|
||||
<!-- </div> -->
|
||||
<!-- <div class="col-6 text-end"> -->
|
||||
<!-- <span t-att-class="record.oee_target.raw_value and (record.oee.raw_value < record.oee_target.raw_value) and 'text-danger' or (record.oee.raw_value > record.oee_target.raw_value) and 'text-success' or 'text-warning'"> -->
|
||||
<!-- <strong> -->
|
||||
<!-- <field name="oee" widget="integer"/>% -->
|
||||
<!-- </strong> -->
|
||||
<!-- </span> -->
|
||||
<!-- </div> -->
|
||||
<!-- </div> -->
|
||||
<!-- </div> -->
|
||||
<!-- </div> -->
|
||||
<!-- <div class="row"> -->
|
||||
<!-- <div class="col-12 o_kanban_primary_left" -->
|
||||
<!-- style="position:absolute; bottom:10px;" name="wc_stages"> -->
|
||||
<!-- <a name="%(mrp.act_mrp_block_workcenter)d" type="action" -->
|
||||
<!-- class="o_status float-end" -->
|
||||
<!-- title="No workorder currently in progress. Click to mark work center as blocked." -->
|
||||
<!-- aria-label="No workorder currently in progress. Click to mark work center as blocked." -->
|
||||
<!-- attrs="{'invisible': [('working_state','in',('blocked','done'))]}"/> -->
|
||||
<!-- <a name="unblock" type="object" class=" o_status o_status_red float-end" -->
|
||||
<!-- title="Workcenter blocked, click to unblock." -->
|
||||
<!-- aria-label="Workcenter blocked, click to unblock." -->
|
||||
<!-- attrs="{'invisible': [('working_state','in',('normal','done'))]}"/> -->
|
||||
<!-- <a name="%(mrp.act_mrp_block_workcenter)d" type="action" -->
|
||||
<!-- class="o_status o_status_green float-end" -->
|
||||
<!-- title="Work orders in progress. Click to block work center." -->
|
||||
<!-- aria-label="Work orders in progress. Click to block work center." -->
|
||||
<!-- attrs="{'invisible': [('working_state','in',('normal','blocked'))]}"/> -->
|
||||
<!-- </div> -->
|
||||
<!-- </div> -->
|
||||
<!-- </div> -->
|
||||
<!-- <div class="container o_kanban_card_manage_pane dropdown-menu" role="menu"> -->
|
||||
<!-- <div class="row"> -->
|
||||
<!-- <div class="col-6 o_kanban_card_manage_section o_kanban_manage_view"> -->
|
||||
<!-- <div role="menuitem" class="o_kanban_card_manage_title"> -->
|
||||
<!-- <span>Actions</span> -->
|
||||
<!-- </div> -->
|
||||
<!-- <div role="menuitem" name="plan_order"> -->
|
||||
<!-- <a name="action_work_order" type="object">Plan Orders</a> -->
|
||||
<!-- </div> -->
|
||||
<!-- <div> -->
|
||||
<!-- <a name="%(maintenance.hr_equipment_request_action)d" type="action"> -->
|
||||
<!-- Maintenance -->
|
||||
<!-- </a> -->
|
||||
<!-- </div> -->
|
||||
<!-- </div> -->
|
||||
<!-- <div class="col-6 o_kanban_card_manage_section o_kanban_manage_new"> -->
|
||||
<!-- <div role="menuitem" class="o_kanban_card_manage_title"> -->
|
||||
<!-- <span>Reporting</span> -->
|
||||
<!-- </div> -->
|
||||
<!-- <div role="menuitem"> -->
|
||||
<!-- <a name="%(mrp.mrp_workcenter_productivity_report_oee)d" type="action"> -->
|
||||
<!-- OEE -->
|
||||
<!-- </a> -->
|
||||
<!-- </div> -->
|
||||
<!-- <div role="menuitem"> -->
|
||||
<!-- <a name="%(mrp.mrp_workorder_workcenter_report)d" type="action" -->
|
||||
<!-- context="{'search_default_thisyear':True}"> -->
|
||||
<!-- Performance -->
|
||||
<!-- </a> -->
|
||||
<!-- </div> -->
|
||||
<!-- <div role="menuitem"> -->
|
||||
<!-- <a name="action_work_order" type="object" -->
|
||||
<!-- context="{'search_default_waiting': 1}">Waiting Availability -->
|
||||
<!-- </a> -->
|
||||
<!-- </div> -->
|
||||
<!-- </div> -->
|
||||
<!-- </div> -->
|
||||
|
||||
<!-- <div t-if="widget.editable" class="o_kanban_card_manage_settings row"> -->
|
||||
<!-- <div role="menuitem" aria-haspopup="true" class="col-8"> -->
|
||||
<!-- <ul role="menu" class="oe_kanban_colorpicker" data-field="color"/> -->
|
||||
<!-- </div> -->
|
||||
<!-- <div role="menuitem" class="text-end"> -->
|
||||
<!-- <a type="edit">Settings</a> -->
|
||||
<!-- </div> -->
|
||||
<!-- </div> -->
|
||||
<!-- </div> -->
|
||||
<!-- </div> -->
|
||||
<!-- </t> -->
|
||||
<!-- </templates> -->
|
||||
<!-- </kanban> -->
|
||||
<!-- </xpath> -->
|
||||
<!-- </field> -->
|
||||
<!-- </record> -->
|
||||
|
||||
<!-- MRP.PRODUCTION -->
|
||||
<record id="mrp_production_view_form_inherit_maintenance" model="ir.ui.view">
|
||||
@@ -321,22 +326,18 @@
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!--<!– 测试searchpanel –>-->
|
||||
<!-- <record id="view_location_search_sf11111_inherit" model="ir.ui.view">-->
|
||||
<!-- <field name="name">mrp.workcenter.inherit</field>-->
|
||||
<!-- <field name="model">mrp.workcenter</field>-->
|
||||
<!-- <field name="inherit_id" ref="mrp.view_mrp_workcenter_search"/>-->
|
||||
<!-- <field name="arch" type="xml">-->
|
||||
<!-- <xpath expr="//search[1]" position="inside">-->
|
||||
<!-- <searchpanel class="account_root">-->
|
||||
<!--<!– <field name="location_type" icon="fa-filter"/> –>-->
|
||||
<!-- <field name="production_line_id" select="multi"/>-->
|
||||
<!-- </searchpanel>-->
|
||||
<!-- </xpath>-->
|
||||
<!-- </field>-->
|
||||
<!-- </record>-->
|
||||
<!-- 生产线驾驶舱searchpanel -->
|
||||
<record id="view_location_search_sf11111_inherit" model="ir.ui.view">
|
||||
<field name="name">mrp.workcenter.inherit</field>
|
||||
<field name="model">mrp.workcenter</field>
|
||||
<field name="inherit_id" ref="mrp.view_mrp_workcenter_search"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//search[1]" position="inside">
|
||||
<searchpanel>
|
||||
<field name="production_line_id" icon="fa-filter"/>
|
||||
</searchpanel>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
=======
|
||||
>>>>>>> develop
|
||||
</odoo>
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
'web.assets_qweb': [
|
||||
],
|
||||
'web.assets_backend': [
|
||||
'sf_plan/static/src/scss/gannt_change.scss'
|
||||
],
|
||||
|
||||
},
|
||||
|
||||
3
sf_plan/static/src/scss/gannt_change.scss
Normal file
3
sf_plan/static/src/scss/gannt_change.scss
Normal file
@@ -0,0 +1,3 @@
|
||||
//.o_gantt_view .o_gantt_row_nogroup .o_gantt_pill {
|
||||
// background-color: #6ec89b !important;
|
||||
//}
|
||||
@@ -27,8 +27,14 @@
|
||||
<form string="坯料预制计划">
|
||||
<header>
|
||||
<button string="执行排程" name="get_plan_end_time" type="object" class="oe_highlight"/>
|
||||
<field name="state" widget="statusbar" statusbar_visible="draft,produce"/>
|
||||
</header>
|
||||
<sheet>
|
||||
<div class="oe_title">
|
||||
<h1>
|
||||
<field name="pl_no" readonly="1"/>
|
||||
</h1>
|
||||
</div>
|
||||
<group>
|
||||
<group string="基本信息">
|
||||
<field name="pl_no"/>
|
||||
@@ -38,12 +44,25 @@
|
||||
<field name="plan_end_time"/>
|
||||
<field name="state"/>
|
||||
</group>
|
||||
<group string="规格信息">
|
||||
<field name="length"/>
|
||||
<field name="width"/>
|
||||
<field name="thickness"/>
|
||||
<field name="diameter"/>
|
||||
<field name="material"/>
|
||||
<group string="规格信息" col="1">
|
||||
<group col="3">
|
||||
<group>
|
||||
<field name="length"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="width"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="thickness"/>
|
||||
</group>
|
||||
</group>
|
||||
<!-- <field name="length"/> -->
|
||||
<!-- <field name="width"/> -->
|
||||
<!-- <field name="thickness"/> -->
|
||||
<group>
|
||||
<field name="diameter"/>
|
||||
<field name="material"/>
|
||||
</group>
|
||||
</group>
|
||||
<group string="绑定订单">
|
||||
<field name="customer_name"/>
|
||||
@@ -66,12 +85,13 @@
|
||||
<field name="name">sf.pl.plan.gantt</field>
|
||||
<field name="model">sf.pl.plan</field>
|
||||
<field name="arch" type="xml">
|
||||
<gantt class="o_mrp_workorder_gantt" date_stop="plan_end_time" date_start="plan_start_time" string="坯料预制计划" default_group_by="current_operation_name" create="0"
|
||||
delete="0" sample="1"
|
||||
display_unavailability="1"
|
||||
color="pl_name"
|
||||
progress_bar="pl_name"
|
||||
form_view_id="sf_pl_plan_form">
|
||||
<gantt class="o_mrp_workorder_gantt" date_stop="plan_end_time" date_start="plan_start_time"
|
||||
string="坯料预制计划" default_group_by="current_operation_name" create="0"
|
||||
delete="0" sample="1"
|
||||
display_unavailability="1"
|
||||
color="state"
|
||||
progress_bar="pl_name"
|
||||
form_view_id="sf_pl_plan_form">
|
||||
|
||||
<field name="pl_no"/>
|
||||
<field name="pl_name"/>
|
||||
@@ -80,21 +100,43 @@
|
||||
<field name="plan_end_time"/>
|
||||
<field name="state"/>
|
||||
<templates>
|
||||
<div t-name="gantt-popover" class="container-fluid">
|
||||
<div class="row g-0">
|
||||
<div class="col">
|
||||
<ul class="ps-1 mb-0 list-unstyled">
|
||||
<li><strong>开始时间: </strong> <t t-out="userTimezoneStartDate.format('L LTS')"/></li>
|
||||
<li><strong>结束时间: </strong> <t t-out="userTimezoneStopDate.format('L LTS')"/></li>
|
||||
<li><strong>坯料编号: </strong> <t t-out="pl_no"/></li>
|
||||
<li><strong>坯料名称: </strong> <t t-out="pl_name"/></li>
|
||||
<li><strong>数量: </strong> <t t-out="quantity"/></li>
|
||||
<li><strong>材质: </strong> <t t-out="material"/></li>
|
||||
</ul>
|
||||
<div t-name="gantt-popover" class="container-fluid">
|
||||
<div class="row g-0">
|
||||
<div class="col">
|
||||
<ul class="ps-1 mb-0 list-unstyled">
|
||||
<li>
|
||||
<strong>开始时间:</strong>
|
||||
<t t-out="userTimezoneStartDate.format('L LTS')"/>
|
||||
</li>
|
||||
<li>
|
||||
<strong>结束时间:</strong>
|
||||
<t t-out="userTimezoneStopDate.format('L LTS')"/>
|
||||
</li>
|
||||
<li>
|
||||
<strong>坯料编号:</strong>
|
||||
<t t-out="pl_no"/>
|
||||
</li>
|
||||
<li>
|
||||
<strong>坯料名称:</strong>
|
||||
<t t-out="pl_name"/>
|
||||
</li>
|
||||
<li>
|
||||
<strong>数量:</strong>
|
||||
<t t-out="quantity"/>
|
||||
</li>
|
||||
<li>
|
||||
<strong>材质:</strong>
|
||||
<t t-out="material"/>
|
||||
</li>
|
||||
<li>
|
||||
<strong>状态:</strong>
|
||||
<t t-out="state"/>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</templates>
|
||||
</templates>
|
||||
</gantt>
|
||||
</field>
|
||||
</record>
|
||||
@@ -113,6 +155,6 @@
|
||||
parent="mrp_workorder.mrp_workorder_menu_planning"
|
||||
sequence="10"
|
||||
action="sf_pl_plan_action"
|
||||
/>
|
||||
/>
|
||||
</data>
|
||||
</odoo>
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user