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

Accept Merge Request #1771: (feature/加工能力显示重叠 -> develop)

Browse Source 
Merge Request: 修复设备档案页面数据显示

Created By: @管欢
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1771
This commit is contained in:
管欢
2025-01-16 12:50:47 +08:00
committed by Coding
parent f93edef2d3 e57574783f
commit c7265bdb46
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
jikimo_frontend/static/src/fields/custom_many2many_checkboxes/custom_many2many_checkboxes.css
View File

@@ -22,6 +22,7 @@
width: 50px;
height: 50px;
margin-bottom: 5px;
margin-top: 15px;
}
.item-label {

1
sf_manufacturing/__manifest__.py
View File

@@ -59,6 +59,7 @@
'sf_manufacturing/static/src/js/agv_scheduling_cancel_confirm.js',
'sf_manufacturing/static/src/js/qr.js',
'sf_manufacturing/static/src/xml/qr.xml',
'sf_manufacturing/static/src/scss/equipment_spacing.scss',
]
},

3
sf_manufacturing/static/src/scss/equipment_spacing.scss Normal file
View File

@@ -0,0 +1,3 @@
.my_custom_group_spacing {
margin-top: 30px; /* 调整组与上方元素的距离 */
}

9
sf_manufacturing/views/sf_maintenance_equipment.xml
View File

@@ -12,15 +12,16 @@
attrs="{'invisible': [('equipment_type', '!=', '机床')]}">
<button name="get_equipment_base_coordinate" string="获取基坐标数据" type="object"
class="oe_highlight"/>
<separator invisible="0"/>
<group>
<group class="my_custom_group_spacing">
<group>
<field name="base_coordinate_fixture_model_id" options="{'no_create': True}"/>
<field name="base_coordinate_g_coordinate"/>
<field name="base_coordinate_x"/>
<field name="base_coordinate_y"/>
<field name="base_coordinate_z"/>
</group>
<group>
<field name="base_coordinate_g_coordinate"/>
<field name="base_coordinate_y"/>
</group>
</group>
</page>
<page string="标准刀库" name="sf_equipment_product_template"