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

Merge branch 'feature/线边料架接口优化' into feature/收藏无法删除缺陷优化

Browse Source
This commit is contained in:
yuxianghui
2024-08-26 17:00:48 +08:00
parent ab66e24c9d da02d68c12
commit c956b06f57
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jikimo_hide_options/models/models.py
View File

@@ -324,4 +324,4 @@ def unlink(self):
BaseModel._create = _create BaseModel._create = _create
BaseModel.unlink = unlink # BaseModel.unlink = unlink

1
sf_sale/views/sale_order_view.xml
View File

@@ -50,6 +50,7 @@
('check_status', '!=', 'approved'),('state', 'in', ['draft','cancel']),'&','&',('check_status', ('check_status', '!=', 'approved'),('state', 'in', ['draft','cancel']),'&','&',('check_status',
'=', 'approved'),('state', 'in', ['sale','cancel']),('delivery_status', '!=', False)]} '=', 'approved'),('state', 'in', ['sale','cancel']),('delivery_status', '!=', False)]}
</attribute> </attribute>
<attribute name="string">拒绝接单</attribute>
</xpath> </xpath>
<xpath expr="//form/header/button[@name='action_draft']" position="attributes"> <xpath expr="//form/header/button[@name='action_draft']" position="attributes">
<attribute name="invisible">1</attribute> <attribute name="invisible">1</attribute>

28
sf_tool_management/views/tool_base_views.xml
View File

@@ -842,21 +842,21 @@
<group string="刀柄" attrs="{'invisible': [('handle_product_id', '=', False)]}" <group string="刀柄" attrs="{'invisible': [('handle_product_id', '=', False)]}"
col="1"> col="1">
<group attrs="{'invisible': [('dismantle_cause', 'not in', ['寿命到期报废','崩刀报废'])]}"> <group attrs="{'invisible': [('dismantle_cause', 'not in', ['寿命到期报废','崩刀报废'])]}">
<group col="3"> <!-- <group col="3">-->
<group> <group>
<field name="scrap_boolean" string="是否报废"/> <field name="scrap_boolean" string="是否报废" readonly="0"/>
</group>
<group></group>
<group>
<button string="报废" name="tool_scrap" type="object"
class="btn-primary" confirm="是否确认报废刀柄"
attrs="{'invisible': [('scrap_boolean', '=', True)]}"/>
<button string="取消" name="tool_no_scrap" type="object"
class="btn-primary" confirm="是否取消报废刀柄"
attrs="{'invisible': [('scrap_boolean', '=', False)]}"/>
<group></group>
</group>
</group> </group>
<!-- <group></group>-->
<!-- <group>-->
<!-- <button string="报废" name="tool_scrap" type="object"-->
<!-- class="btn-primary" confirm="是否确认报废刀柄"-->
<!-- attrs="{'invisible': [('scrap_boolean', '=', True)]}"/>-->
<!-- <button string="取消" name="tool_no_scrap" type="object"-->
<!-- class="btn-primary" confirm="是否取消报废刀柄"-->
<!-- attrs="{'invisible': [('scrap_boolean', '=', False)]}"/>-->
<!-- <group></group>-->
<!-- </group>-->
<!-- </group>-->
</group> </group>
<group> <group>
<field name="handle_rfid" string="Rfid"/> <field name="handle_rfid" string="Rfid"/>