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

Accept Merge Request #201: (feature/sf刀具功能分支 -> develop)

Browse Source 
Merge Request: 优化了功能刀具实时分布和出入库记录的视图显示效果

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/201?initial=true
This commit is contained in:
禹翔辉
2023-06-15 17:05:26 +08:00
parent ff904c2c02 4f7489f471
commit 376731fbd9
1 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
sf_tool_management/views/tool_base_views.xml
View File

@@ -42,45 +42,45 @@
<field name="model">sf.functional.cutting.tool.entity</field>
<field name="arch" type="xml">
<tree>
<field name="order"/>
<!-- <field name="order"/>-->
<field name="code"/>
<field name="name"/>
<field name="functional_model_number"/>
<field name="integral_model_number"/>
<field name="blade_model_number"/>
<field name="cutterbar_model_number"/>
<field name="cutterpad_model_number"/>
<field name="handle_model_number"/>
<field name="chuck_model_number"/>
<field name="diameter"/>
<field name="tool_grade"/>
<field name="machining_accuracy"/>
<field name="tool_length"/>
<field name="blade_number"/>
<field name="integral_blade_length"/>
<field name="effective_blade_length"/>
<field name="max_life"/>
<field name="is_standard"/>
<field name="applicable_range"/>
<field name="thickness"/>
<field name="max_life_span"/>
<field name="alarm_value"/>
<field name="used_value"/>
<field name="current_state"/>
<field name="current_store_area"/>
<field name="current_store_place"/>
<field name="number"/>
<field name="reason_application"/>
<field name="applicant"/>
<field name="return_staff"/>
<field name="return_time"/>
<field name="tool_state"/>
<field name="tool_install_staff"/>
<field name="tool_install_time"/>
<field name="receive_equipment"/>
<field name="receive_staff"/>
<field name="receive_time"/>
<field name="remark"/>
<field name="blade_model_number" optional="hide"/>
<field name="cutterbar_model_number" optional="hide"/>
<field name="cutterpad_model_number" optional="hide"/>
<field name="handle_model_number" optional="hide"/>
<field name="chuck_model_number" optional="hide"/>
<field name="diameter" optional="hide"/>
<field name="tool_grade" optional="hide"/>
<field name="machining_accuracy" optional="hide"/>
<field name="tool_length" optional="hide"/>
<field name="blade_number" optional="hide"/>
<field name="integral_blade_length" optional="hide"/>
<field name="effective_blade_length" optional="hide"/>
<field name="max_life" optional="hide"/>
<field name="is_standard" optional="hide"/>
<field name="applicable_range" optional="hide"/>
<field name="thickness" optional="show"/>
<field name="max_life_span" optional="show"/>
<field name="alarm_value" optional="show"/>
<field name="used_value" optional="show"/>
<field name="current_state" optional="show"/>
<field name="current_store_area" optional="show"/>
<field name="current_store_place" optional="show"/>
<field name="number" optional="show"/>
<field name="reason_application" optional="show"/>
<field name="applicant" optional="show"/>
<field name="return_staff" optional="show"/>
<field name="return_time" optional="show"/>
<field name="tool_state" optional="show"/>
<field name="tool_install_staff" optional="show"/>
<field name="tool_install_time" optional="show"/>
<field name="receive_equipment" optional="show"/>
<field name="receive_staff" optional="show"/>
<field name="receive_time" optional="show"/>
<field name="remark" optional="show"/>
</tree>
</field>
</record>
@@ -100,36 +100,36 @@
<field name="model">sf.functional.cutting.tool.entity</field>
<field name="arch" type="xml">
<tree>
<field name="order"/>
<field name="code" width="200"/>
<!-- <field name="order"/>-->
<field name="code"/>
<field name="name"/>
<field name="functional_model_number"/>
<field name="integral_model_number"/>
<field name="blade_model_number"/>
<field name="cutterbar_model_number"/>
<field name="cutterpad_model_number"/>
<field name="handle_model_number"/>
<field name="chuck_model_number"/>
<field name="diameter"/>
<field name="tool_grade"/>
<field name="machining_accuracy"/>
<field name="tool_length"/>
<field name="blade_number"/>
<field name="integral_blade_length"/>
<field name="effective_blade_length"/>
<field name="max_life"/>
<field name="is_standard"/>
<field name="applicable_range"/>
<field name="tool_stock_num"/>
<field name="side_shelf_num"/>
<field name="on_tool_stock_num"/>
<field name="tool_stock_total"/>
<field name="return_reuse_num_re"/>
<field name="return_reuse_num_co"/>
<field name="return_processing_num"/>
<field name="return_total"/>
<field name="total"/>
<field name="remark"/>
<field name="blade_model_number" optional="hide"/>
<field name="cutterbar_model_number" optional="hide"/>
<field name="cutterpad_model_number" optional="hide"/>
<field name="handle_model_number" optional="hide"/>
<field name="chuck_model_number" optional="hide"/>
<field name="diameter" optional="hide"/>
<field name="tool_grade" optional="hide"/>
<field name="machining_accuracy" optional="hide"/>
<field name="tool_length" optional="hide"/>
<field name="blade_number" optional="hide"/>
<field name="integral_blade_length" optional="hide"/>
<field name="effective_blade_length" optional="hide"/>
<field name="max_life" optional="hide"/>
<field name="is_standard" optional="hide"/>
<field name="applicable_range" optional="hide"/>
<field name="tool_stock_num" optional="show"/>
<field name="side_shelf_num" optional="show"/>
<field name="on_tool_stock_num" optional="show"/>
<field name="tool_stock_total" optional="show"/>
<field name="return_reuse_num_re" optional="show"/>
<field name="return_reuse_num_co" optional="show"/>
<field name="return_processing_num" optional="show"/>
<field name="return_total" optional="show"/>
<field name="total" optional="show"/>
<field name="remark" optional="show"/>
</tree>
</field>
</record>