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

Merge branch 'feature/工单rfid解绑' into feature/必填字段添加红星样式

Browse Source
This commit is contained in:
yuxianghui
2024-02-27 17:17:19 +08:00
parent e4e03e1765 0f8bee120b
commit 0952bc9b70
3 changed files with 78 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
jikimo_frontend/static/src/js/custom_form_status_indicator.js
View File

@@ -59,4 +59,46 @@ $(function (){
}
}
})
function customRequired() {
let timer = null
let timer_count = 0
clearInterval(timer)
timer = setInterval(() => {
timer_count ++
const dom = $('.custom_required')
let tableDom = $('.table_custom_required')
if(tableDom.length) {
tableDom = tableDom.eq(0).parents('tr').children('.table_custom_required')
tableDom.each(function (){
const i = $(this).index()
const requiredDom = $(this).parents('table').find('thead').find('th').eq(i).find('span').eq(0)
const t = requiredDom.text().replace('*', '')
requiredDom.html('<i style="color: red;margin-left: -4px">*</i>' + t)
})
clearInterval(timer)
}
if(dom.length) {
dom.each(function (){
const requiredDom = $(this).parent().prev().find('label')
let t = requiredDom.html()
t.replace('<i style="color: red;margin-left: -4px">*</i>', '');
t = '<i style="color: red;margin-left: -4px">*</i>' + t
requiredDom.html(t)
})
clearInterval(timer)
}
if(timer_count == 20) {
clearInterval(timer)
}
},500)
}
var currentUrl = location.href
const listenerUrl = setInterval(() => {
const isChange = currentUrl != location.href
if(isChange) {
currentUrl = location.href
customRequired()
}
}, 500)
customRequired()
})

30
sf_tool_management/views/tool_base_views.xml
View File

@@ -296,7 +296,7 @@
<field name="name"/>
<field name="sf_cutting_tool_type_id" invisible="True"/>
<field name="tool_groups_id"/>
<field name="diameter"/>
<field name="diameter" class="table_custom_required"/>
<field name="knife_tip_r_angle"/>
<field name="coarse_middle_thin"/>
<field name="tool_stock_num"/>
@@ -325,20 +325,20 @@
<field name="status_create" invisible="1"/>
<group>
<group>
<field name="sf_cutting_tool_type_id"
<field name="sf_cutting_tool_type_id" class="custom_required"
attrs="{'readonly': [('status_create', '=', False)]}"/>
<field name="tool_groups_id"
<field name="tool_groups_id" class="custom_required"
attrs="{'readonly': [('status_create', '=', False)]}"/>
<field name="diameter"
<field name="diameter" class="custom_required"
attrs="{'readonly': [('status_create', '=', False)]}"/>
<field name="knife_tip_r_angle"
<field name="knife_tip_r_angle" class="custom_required"
attrs="{'readonly': [('status_create', '=', False)]}"/>
<field name="coarse_middle_thin"
attrs="{'readonly': [('status_create', '=', False)]}"/>
<field name="whether_standard_knife"
attrs="{'readonly': [('status_create', '=', False)]}"/>
<field name="min_stock_num"/>
<field name="max_stock_num"/>
<field name="min_stock_num" class="custom_required"/>
<field name="max_stock_num" class="custom_required"/>
<field name="batch_replenishment_num"/>
</group>
<group>
@@ -969,10 +969,10 @@
}"
attrs="{'invisible': [('assemble_status', '!=', '0')]}" groups="sf_base.group_sf_mrp_user"
class="btn-primary"/>
<!-- <button string="组装单打印" name="assemble_single_print" type="object"-->
<!-- groups="sf_base.group_sf_mrp_user"-->
<!-- attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary"-->
<!-- confirm="是否确认打印组装单"/>-->
<!-- <button string="组装单打印" name="assemble_single_print" type="object"-->
<!-- groups="sf_base.group_sf_mrp_user"-->
<!-- attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary"-->
<!-- confirm="是否确认打印组装单"/>-->
</tree>
</field>
</record>
@@ -1008,10 +1008,10 @@
attrs="{'invisible': [('assemble_status', '!=', '0')]}"
class="btn-primary"/>
<!-- <button string="组装单打印" name="assemble_single_print" type="object"-->
<!-- groups="sf_base.group_sf_mrp_user"-->
<!-- attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary"-->
<!-- confirm="是否确认打印组装单"/>-->
<!-- <button string="组装单打印" name="assemble_single_print" type="object"-->
<!-- groups="sf_base.group_sf_mrp_user"-->
<!-- attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary"-->
<!-- confirm="是否确认打印组装单"/>-->
<field name="assemble_status" widget="statusbar" statusbar_visible="0,1"/>
</header>
<sheet>

31
sf_tool_management/wizard/wizard_view.xml
View File

@@ -195,7 +195,7 @@
<field name="new_former"/>
<field name="use_tool_time"/>
<field name="reason_for_applying"/>
<!-- <field name="functional_tool_cutting_type"/>-->
<!-- <field name="functional_tool_cutting_type"/>-->
</group>
</group>
<group string="组装物料信息" col="1">
@@ -208,6 +208,7 @@
<group>
<group>
<field name="integral_code_id" placeholder="请选择" string="序列号"
class="custom_required"
options="{'no_create': True, 'no_quick_create': True}"/>
</group>
</group>
@@ -229,6 +230,7 @@
<group>
<group>
<field name="blade_code_id" placeholder="请选择" string="序列号"
class="custom_required"
options="{'no_create': True, 'no_quick_create': True}"/>
</group>
</group>
@@ -251,6 +253,7 @@
<group>
<group>
<field name="bar_code_id" placeholder="请选择" string="序列号"
class="custom_required"
options="{'no_create': True, 'no_quick_create': True}"/>
</group>
</group>
@@ -273,6 +276,7 @@
<group>
<group>
<field name="pad_code_id" placeholder="请选择" string="序列号"
class="custom_required"
options="{'no_create': True, 'no_quick_create': True}"/>
</group>
</group>
@@ -294,6 +298,7 @@
<group>
<group>
<field name="handle_code_id" string="序列号" placeholder="请选择"
class="custom_required"
options="{'no_create': True, 'no_quick_create': True}"/>
</group>
</group>
@@ -315,6 +320,7 @@
<group>
<group>
<field name="chuck_code_id" string="序列号" placeholder="请选择"
class="custom_required"
options="{'no_create': True, 'no_quick_create': True}"/>
</group>
</group>
@@ -335,13 +341,15 @@
<group>
<field name="barcode_id" invisible="True"/>
<field name="tool_code" readonly="True"/>
<field name="rfid" placeholder="请输入rfid码"/>
<field name="rfid" placeholder="请输入rfid码" class="custom_required"/>
<field name="after_assembly_functional_tool_name" string="功能刀具名称"/>
<field name="after_assembly_functional_tool_type_id" string="功能刀具类型"
options="{'no_create': True, 'no_quick_create': True}"/>
<field name="tool_groups_id"/>
<field name="after_assembly_functional_tool_diameter" string="刀具直径(mm)"/>
<field name="after_assembly_knife_tip_r_angle" string="刀尖R角(mm)"/>
<field name="after_assembly_functional_tool_diameter" string="刀具直径(mm)"
class="custom_required"/>
<field name="after_assembly_knife_tip_r_angle" string="刀尖R角(mm)"
class="custom_required"/>
<field name="after_assembly_new_former" string="新/旧"/>
<field name="cut_time" attrs="{'invisible': [('after_assembly_new_former','=','0')]}"/>
<field name="cut_length" attrs="{'invisible': [('after_assembly_new_former','=','0')]}"/>
@@ -350,13 +358,16 @@
<group>
<field name="after_assembly_whether_standard_knife" string="是否标准刀"/>
<field name="after_assembly_coarse_middle_thin" string="粗/中/精"/>
<field name="after_assembly_max_lifetime_value" string="最大寿命值(min)"/>
<field name="after_assembly_alarm_value" string="报警值(min)"/>
<field name="after_assembly_max_lifetime_value" string="最大寿命值(min)"
class="custom_required"/>
<field name="after_assembly_alarm_value" string="报警值(min)" class="custom_required"/>
<field name="after_assembly_used_value" string="已使用值(min)"/>
<field name="after_assembly_tool_loading_length" string="总长度(mm)"/>
<field name="after_assembly_functional_tool_length" string="伸出长(mm)"/>
<field name="after_assembly_effective_length" string="有效长(mm)"/>
<field name="hiding_length"/>
<field name="after_assembly_tool_loading_length" string="总长度(mm)"
class="custom_required"/>
<field name="after_assembly_functional_tool_length" string="伸出长(mm)"
class="custom_required"/>
<field name="after_assembly_effective_length" string="有效长(mm)" class="custom_required"/>
<field name="hiding_length" class="custom_required"/>
<field name="L_D_number"/>
</group>
</group>