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

合并代码

Browse Source
This commit is contained in:
gqh
2022-11-08 17:28:28 +08:00
parent edd6c30176
commit 822cca9755
2 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
sf_route_workcenter/views/sf_workorder.xml
View File

@@ -8,9 +8,11 @@
<field name="arch" type="xml">
<xpath expr="//page[last()]" position="after">
<page string="获取CNC加工程序" attrs='{"invisible": [("routing_type","!=","获取CNC加工程序")]}'>
<group>
<field name="cnc_id" widget="many2many_binary"/>
</group>
<div class="col-12 col-lg-6 o_setting_box">
<button type="object" class="oe_highlight" name="fetchCNC" string="获取CNC程序代码"
/>
</div>
</page>
</xpath>
@@ -153,7 +155,25 @@
<xpath expr="//page[last()]" position="after">
<page string="CNC加工" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
<group>
<field name="cnc_ids" widget="one2many"/>
<field name="cnc_ids" widget="one2many">
<tree>
<field name="FNo" />
<field name="FPGName" />
<field name="FKnifeName" />
<field name="FDNo" />
<field name="FWorkType" />
<field name="FXY" />
<field name="FZ" />
<field name="FJGSD" />
<field name="FSCCD" />
<field name="FDJSpec" />
<field name="FJGDate" />
<field name="FComment" />
</tree>
</field>
</group>
</page>