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

Accept Merge Request #901: (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/901?initial=true
This commit is contained in:
黄焱
2024-03-15 10:12:44 +08:00
committed by Coding
parent 2352f862ee f639e59b91
commit 7717731a22
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,9 @@ const filedRequiredList = {
'brand_id': { multiple: false, noLabel: false }, 'brand_id': { multiple: false, noLabel: false },
'type_id': { multiple: false, noLabel: false }, 'type_id': { multiple: false, noLabel: false },
'taper_type_id': { multiple: false, noLabel: false }, 'taper_type_id': { multiple: false, noLabel: false },
'eq_maintenance_id': { multiple: false, noLabel: false },
'overhaul_id': { multiple: false, noLabel: false },
'overhaul_period': { multiple: false, noLabel: false },
'maintenance_equipment_category_id': { multiple: false, noLabel: false }, 'maintenance_equipment_category_id': { multiple: false, noLabel: false },
'maintenance_type': { multiple: false, noLabel: false }, 'maintenance_type': { multiple: false, noLabel: false },
@@ -147,7 +149,7 @@ $(function () {
dom.each(function () { dom.each(function () {
const requiredDom = $(this).parent().prev().find('label') const requiredDom = $(this).parent().prev().find('label')
let t = requiredDom.html() let t = requiredDom.html()
if (t.indexOf('c*') < 0) { if (t && t.indexOf('c*') < 0) {
t = '<i class="c*" style="color: red;margin-left: -4px">*</i>' + t t = '<i class="c*" style="color: red;margin-left: -4px">*</i>' + t
} }
requiredDom.html(t) requiredDom.html(t)

6
sf_maintenance/views/maintenance_views.xml
View File

@@ -981,16 +981,16 @@
<xpath expr="//field[@name='next_action_date']" position="before"> <xpath expr="//field[@name='next_action_date']" position="before">
<field name='eq_maintenance_id' force_save="1" widget="many2one" class="custom_required"/> <field name='eq_maintenance_id' force_save="1" widget="many2one"/>
</xpath> </xpath>
<xpath expr="//div[hasclass('o_row')][field[@name='maintenance_duration']]" position="after"> <xpath expr="//div[hasclass('o_row')][field[@name='maintenance_duration']]" position="after">
<field name='overhaul_id' class="custom_required"/> <field name='overhaul_id'/>
<field name="overhaul_date" string="下次预防检修"/> <field name="overhaul_date" string="下次预防检修"/>
<label for="overhaul_period" string="预防检修频次" class="custom_required"/> <label for="overhaul_period" string="预防检修频次"/>
<div class="o_row"> <div class="o_row">
<field name="overhaul_period"/> <field name="overhaul_period"/>
days days