From 99d56cb53e026c33d81c01f1fc33aba94b037219 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Thu, 3 Nov 2022 17:37:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E9=87=87=E9=9B=86=E5=88=B0=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B7=BB=E5=8A=A0=E5=88=B0=E6=9C=BA=E5=BA=8A?=
 =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E7=9A=84page=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspectionProfiles/profiles_settings.xml  |   6 +
 .idea/jikimo-sf.iml                           |   8 +
 .idea/modules.xml                             |   8 +
 sf_base/views/mrs_base_view.xml               | 170 +++++++++---------
 sf_base/views/mrs_common_view.xml             |   7 +-
 sf_bf_connect/__manifest__.py                 |   2 +-
 .../views/sale_process_order_view.xml         |  26 +--
 7 files changed, 130 insertions(+), 97 deletions(-)
 create mode 100644 .idea/inspectionProfiles/profiles_settings.xml
 create mode 100644 .idea/jikimo-sf.iml
 create mode 100644 .idea/modules.xml

diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 00000000..105ce2da
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/.idea/jikimo-sf.iml b/.idea/jikimo-sf.iml
new file mode 100644
index 00000000..d0876a78
--- /dev/null
+++ b/.idea/jikimo-sf.iml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 00000000..534b713b
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/jikimo-sf.iml" filepath="$PROJECT_DIR$/.idea/jikimo-sf.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/sf_base/views/mrs_base_view.xml b/sf_base/views/mrs_base_view.xml
index 1d6aeaf3..61d57a05 100644
--- a/sf_base/views/mrs_base_view.xml
+++ b/sf_base/views/mrs_base_view.xml
@@ -100,53 +100,57 @@
         <field name="model">mrs.machine_tool.type</field>
         <field name="arch" type="xml">
             <form string="机床型号">
-                <group string="基本信息">
-                    <group>
-                        <field name="code" force_save="1" readonly="1"/>
-                        <field name="name" required="1"/>
-                    </group>
-                    <group>
-                        <field name="brand_id" required="1"
-                               domain="[('tag_ids', '=', '机床')]"
-                               options="{'no_create': True}"/>
-                    </group>
-                </group>
+                <group string="基本信息" name="base_info">
+            <group>
+                <field name="code" force_save="1" readonly="1"/>
+                <field name="name" required="1"/>
+            </group>
+            <group>
+                <field name="brand_id" required="1"
+                       domain="[('tag_ids', '=', '机床')]"
+                       options="{'no_create': True}"/>
+            </group>
+        </group>
                 <group string="参数">
-                    <group>
-                        <field name="knife_type" required="1"/>
-                        <field name="number_of_knife_library" required="1" options="{'format': false}"/>
-                        <field name="number_of_axles" required="1" widget="radio" options="{'horizontal': true}"/>
-                        <label for="x_axis" string="加工行程(mm)"
-                               attrs="{'invisible': [('number_of_axles', '=', False)]}"/>
-                        <div class="o_address_format"
-                             attrs="{'invisible': [('number_of_axles', '=', False)]}">
-                            <label for="x_axis" string="x"/>
-                            <field name="x_axis" class="o_address_city" required="1" options="{'format': false}"/>
-                            <label for="y_axis" string="y"/>
-                            <field name="y_axis" class="o_address_zip" required="1" options="{'format': false}"/>
-                            <label for="z_axis" string="z"/>
-                            <field name="z_axis" class="o_address_zip" required="1" options="{'format': false}"/>
-                            <label for="b_axis" string="b"
-                                   attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"/>
-                            <field name="b_axis" class="o_address_city" required="1"
-                                   attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"
-                                   options="{'format': false}"/>
-                            <label for="c_axis" string="c"
-                                   attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"/>
-                            <field name="c_axis" class="o_address_zip" required="1"
-                                   attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"
-                                   options="{'format': false}"/>
-                        </div>
-                    </group>
-                    <group>
-                        <field name="rotate_speed" string="转速(min)" required="1" options="{'format': false}"/>
-                        <field name="precision" required="1" string="加工精度(mm)"/>
-                        <field name="control_system_id" required="1" options="{'no_create': True}"/>
-                    </group>
-                </group>
+            <group>
+                <field name="knife_type" required="1"/>
+                <field name="number_of_knife_library" required="1" options="{'format': false}"/>
+                <field name="number_of_axles" required="1" widget="radio" options="{'horizontal': true}"/>
+                <label for="x_axis" string="加工行程(mm)"
+                       attrs="{'invisible': [('number_of_axles', '=', False)]}"/>
+                <div class="o_address_format"
+                     attrs="{'invisible': [('number_of_axles', '=', False)]}">
+                    <label for="x_axis" string="x"/>
+                    <field name="x_axis" class="o_address_city" required="1" options="{'format': false}"/>
+                    <label for="y_axis" string="y"/>
+                    <field name="y_axis" class="o_address_zip" required="1" options="{'format': false}"/>
+                    <label for="z_axis" string="z"/>
+                    <field name="z_axis" class="o_address_zip" required="1" options="{'format': false}"/>
+                    <label for="b_axis" string="b"
+                           attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"/>
+                    <field name="b_axis" class="o_address_city" required="1"
+                           attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"
+                           options="{'format': false}"/>
+                    <label for="c_axis" string="c"
+                           attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"/>
+                    <field name="c_axis" class="o_address_zip" required="1"
+                           attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"
+                           options="{'format': false}"/>
+                </div>
+            </group>
+            <group>
+                <field name="rotate_speed" string="转速(min)" required="1" options="{'format': false}"/>
+                <field name="precision" required="1" string="加工精度(mm)"/>
+                <field name="control_system_id" required="1" options="{'no_create': True}"/>
+            </group>
+        </group>
+
                 <group string="其它">
                     <field name="remark"/>
                 </group>
+
+
+
             </form>
         </field>
     </record>
@@ -375,43 +379,49 @@
                         <field name="code" readonly="1" string="行业编码" force_save="1"/>
                     </group>
                 </group>
-                <group string="参数">
-                    <group>
-                        <field name="knife_type" required="1"/>
-                        <field name="number_of_knife_library" required="1" options="{'format': false}"/>
-                        <field name="number_of_axles" widget="radio" options="{'horizontal': true}"/>
-                        <label for="x_axis" string="加工行程(mm)"
-                               attrs="{'invisible': [('number_of_axles', '=', False)]}"/>
-                        <div class="o_address_format"
-                             attrs="{'invisible': [('number_of_axles', '=', False)]}">
-                            <label for="x_axis" string="x"/>
-                            <field name="x_axis" class="o_address_city" required="1" options="{'format': false}"/>
-                            <label for="y_axis" string="y"/>
-                            <field name="y_axis" class="o_address_zip" required="1" options="{'format': false}"/>
-                            <label for="z_axis" string="z"/>
-                            <field name="z_axis" class="o_address_zip" required="1" options="{'format': false}"/>
-                            <label for="b_axis" string="b"
-                                   attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"/>
-                            <field name="b_axis" class="o_address_city" required="1"
-                                   attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"
-                                   options="{'format': false}"/>
-                            <label for="c_axis" string="c"
-                                   attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"/>
-                            <field name="c_axis" class="o_address_zip" required="1"
-                                   attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"
-                                   options="{'format': false}"/>
-                        </div>
-                    </group>
-                    <group>
-                        <field name="rotate_speed" required="1" string="转速(min)" options="{'format': false}"/>
-                        <field name="precision" required="1" string="加工精度(mm)"/>
-                        <field name="control_system_id" required="1" options="{'no_create': True}"/>
-                         <field name="state" widget="selection"/>
-                    </group>
-                </group>
-                <group string="其它">
-                    <field name="remark"/>
-                </group>
+                <notebook>
+                    <page string="参数">
+                        <group string="参数">
+                            <group>
+                                <field name="knife_type" required="1"/>
+                                <field name="number_of_knife_library" required="1" options="{'format': false}"/>
+                                <field name="number_of_axles" widget="radio" options="{'horizontal': true}"/>
+                                <label for="x_axis" string="加工行程(mm)"
+                                       attrs="{'invisible': [('number_of_axles', '=', False)]}"/>
+                                <div class="o_address_format"
+                                     attrs="{'invisible': [('number_of_axles', '=', False)]}">
+                                    <label for="x_axis" string="x"/>
+                                    <field name="x_axis" class="o_address_city" required="1" options="{'format': false}"/>
+                                    <label for="y_axis" string="y"/>
+                                    <field name="y_axis" class="o_address_zip" required="1" options="{'format': false}"/>
+                                    <label for="z_axis" string="z"/>
+                                    <field name="z_axis" class="o_address_zip" required="1" options="{'format': false}"/>
+                                    <label for="b_axis" string="b"
+                                           attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"/>
+                                    <field name="b_axis" class="o_address_city" required="1"
+                                           attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"
+                                           options="{'format': false}"/>
+                                    <label for="c_axis" string="c"
+                                           attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"/>
+                                    <field name="c_axis" class="o_address_zip" required="1"
+                                           attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"
+                                           options="{'format': false}"/>
+                                </div>
+                            </group>
+                            <group>
+                                <field name="rotate_speed" required="1" string="转速(min)" options="{'format': false}"/>
+                                <field name="precision" required="1" string="加工精度(mm)"/>
+                                <field name="control_system_id" required="1" options="{'no_create': True}"/>
+                                 <field name="state" widget="selection"/>
+                            </group>
+                        </group>
+                    </page>
+                    <page string="其他">
+                        <group string="其他">
+                            <field name="remark"/>
+                        </group>
+                    </page>
+                </notebook>
             </form>
         </field>
     </record>
diff --git a/sf_base/views/mrs_common_view.xml b/sf_base/views/mrs_common_view.xml
index 1877de05..6424a6f3 100644
--- a/sf_base/views/mrs_common_view.xml
+++ b/sf_base/views/mrs_common_view.xml
@@ -285,10 +285,11 @@
                     <field name="name" string="名称" filter_domain="[('name','ilike',self)]"/>
                     <field name="code" string="编码" filter_domain="[('code','ilike',self)]"/>
 <!--                    <field name="state" string="状态" filter_domain="[('state','ilike',self)]"/>-->
-                </search>
-                 <group string="分组">
+                    <group string="分组">
                     <filter name="state" string="状态" domain="[]" context="{'group_by': 'state'}"/>
-                </group>
+                    </group>
+                </search>
+
             </field>
         </record>
 
diff --git a/sf_bf_connect/__manifest__.py b/sf_bf_connect/__manifest__.py
index 612bc615..77d97796 100644
--- a/sf_bf_connect/__manifest__.py
+++ b/sf_bf_connect/__manifest__.py
@@ -12,7 +12,7 @@
     'website': 'https://www.sf.cs.jikimo.com',
     'depends': ['account', 'sf_base', 'base', 'sale'],
     'data': [
-        'views/sale_process_order_view.xml'
+        # 'views/sale_process_order_view.xml'
     ],
     'demo': [
     ],
diff --git a/sf_bf_connect/views/sale_process_order_view.xml b/sf_bf_connect/views/sale_process_order_view.xml
index 898ade1b..183f793e 100644
--- a/sf_bf_connect/views/sale_process_order_view.xml
+++ b/sf_bf_connect/views/sale_process_order_view.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <data>
-        <record model="ir.ui.view" id="view_sf_form_inherit">
-            <field name="model">sale.order</field>
-            <field name="inherit_id" ref="sale.view_order_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//page[@name='Customer Signature']" position="before">
-                    <page string="Bfm Line">
-                        <group>
-                            <field name="bfm_process_order_ids"/>
-                        </group>
-                    </page>
-                </xpath>
-            </field>
-        </record>
+<!--        <record model="ir.ui.view" id="view_sf_form_inherit">-->
+<!--            <field name="model">sale.order</field>-->
+<!--            <field name="inherit_id" ref="sale.view_order_form"/>-->
+<!--            <field name="arch" type="xml">-->
+<!--&lt;!&ndash;                <xpath expr="//page[@name='Customer Signature']" position="before">&ndash;&gt;-->
+<!--&lt;!&ndash;                    <page string="Bfm Line">&ndash;&gt;-->
+<!--&lt;!&ndash;                        <group>&ndash;&gt;-->
+<!--&lt;!&ndash;                            <field name="bfm_process_order_ids"/>&ndash;&gt;-->
+<!--&lt;!&ndash;                        </group>&ndash;&gt;-->
+<!--&lt;!&ndash;                    </page>&ndash;&gt;-->
+<!--&lt;!&ndash;                </xpath>&ndash;&gt;-->
+<!--            </field>-->
+<!--        </record>-->
     </data>
 </odoo>
\ No newline at end of file