Accept Merge Request #1076: (feature/去掉返工报废的代码 -> develop)

Merge Request: 去掉返工报废的代码

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1076?initial=true
This commit is contained in:
杨金灵
2024-06-17 11:56:45 +08:00
committed by Coding

View File

@@ -477,13 +477,13 @@
<page string="后置三元检测" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'> <page string="后置三元检测" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
<group> <group>
<field name="test_results" attrs='{"invisible":[("results","!=",False)]}'/> <field name="test_results" attrs='{"invisible":[("results","!=",False)]}'/>
<field name="is_remanufacture" attrs='{"invisible":[("test_results","!=","报废")]}'/> <!-- <field name="is_remanufacture" attrs='{"invisible":[("test_results","!=","报废")]}'/>-->
<field name="is_fetchcnc" <!-- <field name="is_fetchcnc"-->
attrs='{"invisible":["|",("test_results","=","合格"),("is_remanufacture","=",False)]}'/> <!-- attrs='{"invisible":["|",("test_results","=","合格"),("is_remanufacture","=",False)]}'/>-->
<field name="reason" <!-- <field name="reason"-->
attrs='{"required":[("test_results","!=","合格")],"invisible":[("test_results","=","合格")]}'/> <!-- attrs='{"required":[("test_results","!=","合格")],"invisible":[("test_results","=","合格")]}'/>-->
<field name="detailed_reason" attrs='{"invisible":[("test_results","=","合格")]}'/> <!-- <field name="detailed_reason" attrs='{"invisible":[("test_results","=","合格")]}'/>-->
<field name="results" readonly="1" attrs='{"invisible":[("results","!=","合格")]}'/> <!-- <field name="results" readonly="1" attrs='{"invisible":[("results","!=","合格")]}'/>-->
<field name="detection_report" attrs='{"invisible":[("results","!=",False)]}' <field name="detection_report" attrs='{"invisible":[("results","!=",False)]}'
widget="pdf_viewer"/> widget="pdf_viewer"/>
</group> </group>