From 2d145600fddcc37149b44dc5b571a02239cf5fb5 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Wed, 17 Apr 2024 12:01:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E4=BB=A3=E7=90=86?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=20-=20=E7=9C=81=E5=85=AC=E5=8F=B8=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E4=BA=BA=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E7=9C=81?=
 =?UTF-8?q?=E5=9C=B0=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../marketing/agent/agent/template/edit.vue   | 22 +++++++++++++++++++
 src/views/product/addProduct/index.vue        |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/views/marketing/agent/agent/template/edit.vue b/src/views/marketing/agent/agent/template/edit.vue
index e4d8894..26a5bb3 100644
--- a/src/views/marketing/agent/agent/template/edit.vue
+++ b/src/views/marketing/agent/agent/template/edit.vue
@@ -91,6 +91,15 @@
                   </div>
                 </el-form-item>
               </el-col>
+              <!--省公司发起人 仅选择省-->
+              <el-col :span="24" v-if="['2'].includes(String(info.agent_type))">
+                <el-form-item label="地区：">
+                  <div class="selected-city">
+                    <!--省选择-->
+                    <area-info :area_id="info.province_id" class="selected-city-item" @change="changeAreaInfo($event,-1)"></area-info>
+                  </div>
+                </el-form-item>
+              </el-col>
               <!-- 仅餐厅 显示详细地址、定位、商户关联（单个） && info.is_headquarters == 0 -->
               <template v-if="info.agent_type == 7">
                 <el-col :span="24">
@@ -267,6 +276,19 @@
                       </div>
                     </el-form-item>
                   </el-col>
+                  <!-- 省公司发起人 仅选择省 -->
+                  <el-col :span="24" v-if="['2'].includes(String(children_list[index].agent_type))">
+                    <el-form-item label="地区：">
+                      <div class="selected-city">
+                        <!--省选择-->
+                        <area-info
+                          :area_id="children_list[index].province_id"
+                          class="selected-city-item"
+                          @change="changeAreaInfo($event,index)"
+                        ></area-info>
+                      </div>
+                    </el-form-item>
+                  </el-col>
                   <!-- 仅餐厅 显示详细地址、定位、商户关联（单个）  && children_list[index].is_headquarters == 0-->
                   <template v-if="children_list[index].agent_type == 7">
                     <el-col :span="24">
diff --git a/src/views/product/addProduct/index.vue b/src/views/product/addProduct/index.vue
index 8697e81..e23667a 100644
--- a/src/views/product/addProduct/index.vue
+++ b/src/views/product/addProduct/index.vue
@@ -946,7 +946,7 @@
           <!--代理商 分润-->
           <el-form-item label="省公司发起人：">
             <el-select v-model="formValidate.agent_two_ids" placeholder="请选择" class="selWidth" multiple>
-              <el-option v-for="item in agent_list" :key="item.id" :label="item.contact_name" :value="String(item.id)" />
+              <el-option v-for="item in agent_list" :key="item.id" :label="item.province_name ? item.contact_name + '('+item.province_name+')' : item.contact_name" :value="String(item.id)" />
             </el-select>
           </el-form-item>
           <!--酒水卡额度   菜卡额度-->