diff --git a/app_base_chinese/__manifest__.py b/app_base_chinese/__manifest__.py
index 2ea28c81..0bf22671 100644
--- a/app_base_chinese/__manifest__.py
+++ b/app_base_chinese/__manifest__.py
@@ -56,6 +56,7 @@
     'post_init_hook': 'post_init_hook',
     'depends': [
         'app_base',
+        'base_address_extended',
         'account',
         'sales_team',
         'stock',
diff --git a/app_base_chinese/data/res_country_data.xml b/app_base_chinese/data/res_country_data.xml
index 69abe44f..6a046c5d 100644
--- a/app_base_chinese/data/res_country_data.xml
+++ b/app_base_chinese/data/res_country_data.xml
@@ -3,7 +3,9 @@
     <data noupdate="1">
         <!-- Country -->
         <record id="base.cn" model="res.country">
-            <field name="address_format"  eval="'%(country_name)s%(state_name)s%(city)s%(street)s\n%(street2)s'"/>
+            <field name="enforce_cities" eval="True"/>
+            <field name="address_format" eval="'%(country_name)s%(state_name)s%(city)s%(street)s\n%(street2)s'"/>
+            <field name="address_view_id" ref="app_base_chinese.app_view_partner_form_chinese"/>
         </record>
     </data>
 </odoo>
diff --git a/app_base_chinese/static/src/scss/app_style.scss b/app_base_chinese/static/src/scss/app_style.scss
index 39bfb17d..aa406454 100644
--- a/app_base_chinese/static/src/scss/app_style.scss
+++ b/app_base_chinese/static/src/scss/app_style.scss
@@ -1,26 +1,27 @@
-.o_form_view .o_address_format {
+.o_form_view .o_address_format.o_address_chinese {
   .o_address_country {
     display: -webkit-inline-flex;
     display: inline-flex;
-    width: 48%;
+    width: 38%;
     margin-right: 2%;
   }
 }
-.o_form_view.o_form_editable .o_address_format {
-  div.o_address_state {
-    width: 50%;
-    margin-right: 0;
+
+.o_form_view .o_form_editable .o_address_format.o_address_chinese {
+  .o_address_zip{
+    width: 38%;
+    margin-right: 2%;
+  }
+  .o_address_state {
+    width: 38%;
+    margin-right: 2%;
   }
   .o_address_city{
-    width: 48%;
+    width: 38%;
     margin-right: 2%;
   }
   .o_address_city_id{
-    width: 48%;
+    width: 38%;
     margin-right: 2%;
   }
-  input.o_address_zip{
-    width: 50%;
-    margin-right: 0;
-  }
 }
diff --git a/app_base_chinese/views/res_partner_views.xml b/app_base_chinese/views/res_partner_views.xml
index d0aaa83f..f29ccbf2 100644
--- a/app_base_chinese/views/res_partner_views.xml
+++ b/app_base_chinese/views/res_partner_views.xml
@@ -9,128 +9,61 @@
             <field name="arch" type="xml">
                 <!-- 客户编号设计在重要位置，放到 app_partner_auto_reference -->
                 <!--<xpath expr="//field[@name='type']" position="after">-->
-                    <!--<xpath expr="//field[@name='ref']" position="move"/>-->
+                <!--<xpath expr="//field[@name='ref']" position="move"/>-->
                 <!--</xpath>-->
-                <xpath expr="//field[@name='type']" position="after">
+                <xpath expr="//field[@name='function']" position="before">
                     <field name="short_name"/>
                 </xpath>
-                <!-- 信用额度 -->
-                <xpath expr="//field[@name='category_id']" position="after">
-                    <field name="credit_limit"/>
-                </xpath>
-                <!--res.partner客户 地址中国化 -->
+                <!--res.partner客户，细节调整至 app_base_chinese_city 中处理 -->
                 <xpath expr="//field[@name='street']" position="before">
-                    <xpath expr="//field[@name='country_id']" position="move"/>
+                    <xpath expr="//div[@name='partner_address_country']" position="move"/>
                 </xpath>
-                <xpath expr="//field[@name='street']" position="before">
-                    <xpath expr="//field[@name='state_id']" position="move"/>
-                </xpath>
-                <xpath expr="//field[@name='street']" position="before">
-                    <xpath expr="//field[@name='city']" position="move"/>
-                </xpath>
-                <xpath expr="//field[@name='street']" position="before">
-                    <xpath expr="//field[@name='zip']" position="move"/>
-                </xpath>
-                <!-- res.partner联系人 form -->
-                <!--联系人，如果是个人类型，不允许其下再有联系人-->
-                <!--调整，电商情况，一个人有多个地址-->
-<!--                <xpath expr="//notebook/page[1]" position="attributes">-->
-<!--                    <attribute name="attrs">{'invisible': [('is_company','!=', True)]}</attribute>-->
-<!--                </xpath>-->
-                <!-- 所有类型联系人都要填姓名 -->
                 <xpath expr="//page//field[@name='child_ids']//form[1]//field[@name='name']" position="attributes">
                     <attribute name="required">1</attribute>
                 </xpath>
-                <!-- 联系人也显示地址，中国格式 -->
-                <!--res.partner客户 地址中国化 -->
-                <xpath expr="//field[@name='child_ids']//form[1]//field[@name='street']" position="before">
-                    <xpath expr="//field[@name='child_ids']//form[1]//field[@name='country_id']" position="move"/>
-                </xpath>
-                <xpath expr="//field[@name='child_ids']//form[1]//field[@name='street']" position="before">
-                    <xpath expr="//field[@name='child_ids']//form[1]//field[@name='state_id']" position="move"/>
-                </xpath>
-                <xpath expr="//field[@name='child_ids']//form[1]//field[@name='street']" position="before">
-                    <xpath expr="//field[@name='child_ids']//form[1]//field[@name='city']" position="move"/>
-                </xpath>
-                <xpath expr="//field[@name='child_ids']//form[1]//field[@name='street']" position="before">
-                    <xpath expr="//field[@name='child_ids']//form[1]//field[@name='zip']" position="move"/>
-                </xpath>
                 <xpath expr="//field[@name='child_ids']//form[1]//field[@name='email']" position="before">
                     <field name="category_id" widget="many2many_tags"/>
                 </xpath>
                 <!-- res.partner联系人 kanban -->
                 <!-- 显示类型和地址等 -->
                 <xpath expr="//field[@name='child_ids']//kanban[1]//templates//field[@name='name']" position="before">
-                    <t t-if="record.ref and record.ref.raw_value">[<field name="ref"/>]</t>
+                    <t t-if="record.ref and record.ref.raw_value">[<field name="ref"/>]
+                    </t>
                 </xpath>
                 <xpath expr="//field[@name='child_ids']//kanban[1]//templates//field[@name='name']" position="after">
-                    <div t-if="record.type and record.type.raw_value"><field name="type"/></div>
-                    <div t-if="record.category_id and record.category_id.raw_value"><field name="category_id" widget="many2many_tags"/></div>
+                    <div t-if="record.type and record.type.raw_value">
+                        <field name="type"/>
+                    </div>
+                    <div t-if="record.category_id and record.category_id.raw_value">
+                        <field name="category_id" widget="many2many_tags"/>
+                    </div>
                 </xpath>
             </field>
         </record>
-
-        <!--res.partner open地址中国化 -->
-        <record id="app_view_partner_address_form" model="ir.ui.view">
-            <field name="name">app.res.partner.form.address</field>
+        <!--        指定的中国地址格式-->
+        <record id="app_view_partner_form_chinese" model="ir.ui.view">
+            <field name="name">app.res.partner.form.chinese</field>
             <field name="model">res.partner</field>
-            <field name="inherit_id" ref="base.view_partner_address_form"/>
+            <field name="priority" eval="900"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='street']" position="before">
-                    <xpath expr="//field[@name='country_id']" position="move"/>
-                </xpath>
-                <xpath expr="//field[@name='street']" position="before">
-                    <xpath expr="//field[@name='state_id']" position="move"/>
-                </xpath>
-                <xpath expr="//field[@name='street']" position="before">
-                    <xpath expr="//field[@name='city']" position="move"/>
-                </xpath>
-                <xpath expr="//field[@name='street']" position="before">
-                    <xpath expr="//field[@name='zip']" position="move"/>
-                </xpath>
-                <xpath expr="//field[@name='website']" position="after">
-                    <field name="category_id" widget="many2many_tags"/>
-                </xpath>
-            </field>
-        </record>
-        <!--res.partner open地址中国化 -->
-        <record id="app_view_partner_short_form" model="ir.ui.view">
-            <field name="name">app.res.partner.form</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='street']" position="before">
-                    <xpath expr="//field[@name='country_id']" position="move"/>
-                </xpath>
-                <xpath expr="//field[@name='street']" position="before">
-                    <xpath expr="//field[@name='state_id']" position="move"/>
-                </xpath>
-                <xpath expr="//field[@name='street']" position="before">
-                    <xpath expr="//field[@name='city']" position="move"/>
-                </xpath>
-                <xpath expr="//field[@name='street']" position="before">
-                    <xpath expr="//field[@name='zip']" position="move"/>
-                </xpath>
-            </field>
-        </record>
-        <!--res.partner 私人地址中国化 -->
-        <record id="app_res_partner_view_form_private" model="ir.ui.view">
-            <field name="name">app.res.partner.view.form.private</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="base.res_partner_view_form_private"/>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='street']" position="before">
-                    <xpath expr="//field[@name='country_id']" position="move"/>
-                </xpath>
-                <xpath expr="//field[@name='street']" position="before">
-                    <xpath expr="//field[@name='state_id']" position="move"/>
-                </xpath>
-                <xpath expr="//field[@name='street']" position="before">
-                    <xpath expr="//field[@name='city']" position="move"/>
-                </xpath>
-                <xpath expr="//field[@name='street']" position="before">
-                    <xpath expr="//field[@name='zip']" position="move"/>
-                </xpath>
+                <div class="o_address_format o_address_chinese">
+                    <field name="country_enforce_cities" invisible="1"/>
+                    <field name="parent_id" invisible="1"/>
+                    <field name="type" invisible="1"/>
+                    <div name="partner_address_country" class="d-flex">
+                        <field name="country_id" placeholder="Country" class="o_address_country"
+                               options="{&quot;no_open&quot;: True, &quot;no_create&quot;: True}"/>
+                        <field name="zip" placeholder="ZIP" class="o_address_zip"/>
+                    </div>
+                    <field name="state_id" class="o_address_state" placeholder="State"  options='{"no_open": True, "no_create": True}'
+                           context="{'country_id': country_id, 'default_country_id': country_id, 'zip': zip}"/>
+                    <field name="city_id" placeholder="City" class="o_address_city"
+                           options='{"no_open": True, "no_create": True}'
+                           context="{'default_country_id': country_id, 'default_state_id': state_id,}"/>
+                    <field name="city" placeholder="City" invisible="1"/>
+                    <field name="street" placeholder="Street..." class="o_address_street"/>
+                    <field name="street2" placeholder="Street 2..." class="o_address_street"/>
+                </div>
             </field>
         </record>
 
@@ -156,7 +89,8 @@
                 </xpath>
                 <xpath expr="//div[hasclass('oe_kanban_details')]/div/ul" position="inside">
                     <li t-if="record.credit_limit and record.credit_limit.raw_value">
-                        Credit：<field name="credit_limit"/>
+                        Credit：
+                        <field name="credit_limit"/>
                     </li>
                 </xpath>
             </field>