jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/坯料排程

Browse Source
This commit is contained in:
mgw
2023-08-16 09:43:29 +08:00
parent 06ed10bd5e 4e2bf6534a
commit ab61902deb
81 changed files with 25845 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sf_plan/__manifest__.py
View File

@@ -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
View File

@@ -0,0 +1,3 @@
//.o_gantt_view .o_gantt_row_nogroup .o_gantt_pill {
// background-color: #6ec89b !important;
//}

63
sf_plan/views/view.xml
View File

@@ -85,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"/>
@@ -99,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>
@@ -132,6 +155,6 @@
parent="mrp_workorder.mrp_workorder_menu_planning"
sequence="10"
action="sf_pl_plan_action"
/>
/>
</data>
</odoo>