From 0f8bee120b162f41b5772b8070d86706aea21ad5 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Tue, 27 Feb 2024 17:15:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB=E5=AD=97=E6=AE=B5=E5=89=8D=E6=B7=BB=E5=8A=A0=20*=20?=
 =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F=EF=BC=9B2=E3=80=81=E7=BB=99?=
 =?UTF-8?q?=E5=88=80=E5=85=B7=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E7=9A=84?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0=E7=BA=A2?=
 =?UTF-8?q?=E6=98=9F=E6=A0=B7=E5=BC=8F=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/js/custom_form_status_indicator.js    | 42 +++++++++++++++++++
 sf_tool_management/views/tool_base_views.xml  | 30 ++++++-------
 sf_tool_management/wizard/wizard_view.xml     | 31 +++++++++-----
 3 files changed, 78 insertions(+), 25 deletions(-)

diff --git a/jikimo_frontend/static/src/js/custom_form_status_indicator.js b/jikimo_frontend/static/src/js/custom_form_status_indicator.js
index a5ca68f1..484114d0 100644
--- a/jikimo_frontend/static/src/js/custom_form_status_indicator.js
+++ b/jikimo_frontend/static/src/js/custom_form_status_indicator.js
@@ -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()
 })
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 1a33c713..834cec5f 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -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>
diff --git a/sf_tool_management/wizard/wizard_view.xml b/sf_tool_management/wizard/wizard_view.xml
index cd15a91b..f055ffba 100644
--- a/sf_tool_management/wizard/wizard_view.xml
+++ b/sf_tool_management/wizard/wizard_view.xml
@@ -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>

From 659f869d630322f7edaa81edb634e1c89ac83222 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Tue, 27 Feb 2024 17:20:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=88=80=E5=85=B7?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=BA=93=E5=AD=98=E7=9A=84tree=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E5=BF=85=E5=A1=AB=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_tool_management/views/tool_base_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 834cec5f..bac6533d 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -296,7 +296,7 @@
                     <field name="name"/>
                     <field name="sf_cutting_tool_type_id" invisible="True"/>
                     <field name="tool_groups_id"/>
-                    <field name="diameter" class="table_custom_required"/>
+                    <field name="diameter"/>
                     <field name="knife_tip_r_angle"/>
                     <field name="coarse_middle_thin"/>
                     <field name="tool_stock_num"/>