Accept Merge Request #1999: (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/1999
This commit is contained in:
@@ -22,15 +22,21 @@
|
||||
color: #999;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
.custom_group:has(.text-success){
|
||||
position: relative;
|
||||
&::after{
|
||||
content: '';
|
||||
display: block;
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
width: 72px;
|
||||
height: 72px;
|
||||
background: url('/sf_tool_management/static/images/replaceIcon.png') no-repeat center center;
|
||||
background-size: 100%;
|
||||
position: absolute;
|
||||
bottom: 20px;
|
||||
left: 300px;
|
||||
}
|
||||
|
||||
}
|
||||
.o_field_widget.o_readonly_modifier.o_field_char.text-success[name=handle_freight_rfid] {
|
||||
display: flex;
|
||||
|
||||
@@ -531,7 +531,7 @@
|
||||
<div>
|
||||
<separator string="刀柄:" style="font-size: 13px;"/>
|
||||
</div>
|
||||
<group>
|
||||
<group class="custom_group" >
|
||||
<field name="handle_code_id" string="序列号" placeholder="请选择"
|
||||
options="{'no_create': True, 'no_quick_create': True}"/>
|
||||
<field name="handle_freight_rfid" string="Rfid" decoration-success="handle_freight_rfid"/>
|
||||
@@ -554,7 +554,7 @@
|
||||
<separator string="整体式刀具:" style="font-size: 13px;"/>
|
||||
</div>
|
||||
<group>
|
||||
<group>
|
||||
<group class="custom_group">
|
||||
<field name="integral_freight_barcode_id" string="货位" decoration-success="integral_verify == True"/>
|
||||
<field name="integral_lot_id" string="批次"/>
|
||||
<field name="integral_product_id" string="名称"/>
|
||||
@@ -582,8 +582,8 @@
|
||||
<separator string="刀片:" style="font-size: 13px;"/>
|
||||
</div>
|
||||
<group>
|
||||
<group>
|
||||
<field name="blade_freight_barcode_id" string="货位"/>
|
||||
<group class="custom_group">
|
||||
<field name="blade_freight_barcode_id" string="货位" decoration-success="blade_verify == True"/>
|
||||
<field name="blade_lot_id" string="批次"/>
|
||||
<field name="blade_product_id" string="名称"/>
|
||||
<field name="cutting_tool_blade_model_id" string="型号"/>
|
||||
@@ -607,8 +607,8 @@
|
||||
<separator string="刀杆:" style="font-size: 13px;"/>
|
||||
</div>
|
||||
<group>
|
||||
<group>
|
||||
<field name="bar_freight_barcode_id" string="货位"/>
|
||||
<group class="custom_group">
|
||||
<field name="bar_freight_barcode_id" string="货位" decoration-success="bar_verify == True"/>
|
||||
<field name="bar_lot_id" string="批次"/>
|
||||
<field name="bar_product_id" string="名称"/>
|
||||
<field name="cutting_tool_cutterbar_model_id" string="型号"/>
|
||||
@@ -631,8 +631,8 @@
|
||||
<separator string="刀盘:" style="font-size: 13px;"/>
|
||||
</div>
|
||||
<group>
|
||||
<group>
|
||||
<field name="pad_freight_barcode_id" string="货位"/>
|
||||
<group class="custom_group">
|
||||
<field name="pad_freight_barcode_id" string="货位" decoration-success="pad_verify == True"/>
|
||||
<field name="pad_lot_id" string="批次"/>
|
||||
<field name="pad_product_id" string="名称"/>
|
||||
<field name="cutting_tool_cutterpad_model_id" string="型号"/>
|
||||
@@ -911,7 +911,7 @@
|
||||
<!-- </group>-->
|
||||
</group>
|
||||
<group>
|
||||
<field name="handle_rfid" string="Rfid"/>
|
||||
<field name="handle_rfid" string="Rfid" decoration-success="handle_freight_rfid"/>
|
||||
<field name="handle_lot_id" string="序列号"/>
|
||||
<field name="handle_product_id" string="名称"/>
|
||||
<field name="handle_type_id" string="型号"/>
|
||||
|
||||
Reference in New Issue
Block a user