diff --git a/src/views/marketing/agent/agent/index.vue b/src/views/marketing/agent/agent/index.vue
index 087a455..6d0269c 100644
--- a/src/views/marketing/agent/agent/index.vue
+++ b/src/views/marketing/agent/agent/index.vue
@@ -43,29 +43,21 @@
                 </div>
                 <div class="agent-type-text">
                   <!--角色信息-->
-                  <el-tag v-if="Number(scope.row.agent_type) == 1" type="info" effect="dark" size="small">总部发起人</el-tag>
-                  <el-tag v-if="Number(scope.row.agent_type) == 9" type="info" effect="dark" size="small">总部外勤</el-tag>
-                  <el-tag v-if="Number(scope.row.agent_type) == 10" type="info" effect="dark" size="small">总部内勤</el-tag>
-                  <el-tag v-if="Number(scope.row.agent_type) == 2" type="info" effect="dark" size="small">省发起人</el-tag>
-                  <el-tag v-if="Number(scope.row.agent_type) == 3" type="info" effect="dark" size="small">省公司外勤</el-tag>
-                  <el-tag v-if="Number(scope.row.agent_type) == 4" type="info" effect="dark" size="small">省公司内勤</el-tag>
-                  <el-tag v-if="Number(scope.row.agent_type) == 5" type="info" effect="dark" size="small">区县运营商</el-tag>
-                  <el-tag v-if="Number(scope.row.agent_type) == 6" type="info" effect="dark" size="small">区县合伙人</el-tag>
+                  <el-tag type="info" effect="dark" size="small">{{ scope.row.agent_type_text || '' }}</el-tag>
+                  <!--餐厅关联商户-->
                   <template v-if="Number(scope.row.agent_type) == 7">
-                    <el-tag type="info" effect="dark" size="small">餐厅</el-tag>
                     <el-tag v-if="scope.row.mer" type="success" effect="dark" size="small">{{ scope.row.mer.mer_name }}</el-tag>
                   </template>
+                  <!--配送商关联商户-->
                   <template v-if="Number(scope.row.agent_type) == 8">
-                    <el-tag type="info" effect="dark" size="small">配送商</el-tag>
                     <el-tag v-if="Object.values(scope.row.merList).length > 0" type="success" effect="dark" size="small">
                       {{ scope.row.merList[0].mer_name }}
                       {{ Object.values(scope.row.merList).length > 1 ? '+'+Object.values(scope.row.merList).length : '' }}
                     </el-tag>
                   </template>
-                  <!--是否为总部-->
-                  <!--<el-tag v-if="Number(scope.row.is_headquarters) == 1" type="warning" effect="dark" size="small">总部</el-tag>-->
-                  <el-tag v-if="Number(scope.row.agent_type) == 2 && scope.row.province_corporate_name" type="warning" effect="dark" size="small">
-                    {{ scope.row.province_corporate_name || '' }}
+                  <!--公司名称-->
+                  <el-tag v-if="(scope.row.agent_type == 2 || scope.row.agent_type == 5) && scope.row.corporate_name" type="warning" effect="dark" size="small">
+                    {{ scope.row.corporate_name || '' }}
                   </el-tag>
                 </div>
               </div>
@@ -84,16 +76,12 @@
                   <div class="user-id">{{ scope.row.parent.uid }}</div>
                 </div>
                 <div class="agent-type-text">
-                  <el-tag v-if="Number(scope.row.parent.agent_type) == 1" type="info" effect="dark" size="small">总部发起人</el-tag>
-                  <el-tag v-if="Number(scope.row.parent.agent_type) == 9" type="info" effect="dark" size="small">总部外勤</el-tag>
-                  <el-tag v-if="Number(scope.row.parent.agent_type) == 10" type="info" effect="dark" size="small">总部内勤</el-tag>
-                  <el-tag v-if="Number(scope.row.parent.agent_type) == 2" type="info" effect="dark" size="small">省发起人</el-tag>
-                  <el-tag v-if="Number(scope.row.parent.agent_type) == 3" type="info" effect="dark" size="small">省公司外勤</el-tag>
-                  <el-tag v-if="Number(scope.row.parent.agent_type) == 4" type="info" effect="dark" size="small">省公司内勤</el-tag>
-                  <el-tag v-if="Number(scope.row.parent.agent_type) == 5" type="info" effect="dark" size="small">区县运营商</el-tag>
-                  <el-tag v-if="Number(scope.row.parent.agent_type) == 6" type="info" effect="dark" size="small">区县合伙人</el-tag>
-                  <el-tag v-if="Number(scope.row.parent.agent_type) == 7" type="info" effect="dark" size="small">餐厅</el-tag>
-                  <el-tag v-if="Number(scope.row.parent.agent_type) == 8" type="info" effect="dark" size="small">配送商</el-tag>
+                  <!--角色信息-->
+                  <el-tag type="info" effect="dark" size="small">{{ scope.row.agent_type_text || '' }}</el-tag>
+                  <!--公司名称-->
+                  <el-tag v-if="(scope.row.agent_type == 2 || scope.row.agent_type == 5) && scope.row.corporate_name" type="warning" effect="dark" size="small">
+                    {{ scope.row.corporate_name || '' }}
+                  </el-tag>
                 </div>
               </div>
             </div>
diff --git a/src/views/marketing/agent/agent/template/edit.vue b/src/views/marketing/agent/agent/template/edit.vue
index 0c14955..9bd6159 100644
--- a/src/views/marketing/agent/agent/template/edit.vue
+++ b/src/views/marketing/agent/agent/template/edit.vue
@@ -53,9 +53,9 @@
               <!--    </el-radio-group>-->
               <!--  </el-form-item>-->
               <!--</el-col>-->
-              <el-col :span="12" v-if="info.agent_type == 2">
-                <el-form-item label="省公司名称：">
-                  <el-input v-model="info.province_corporate_name" placeholder="请填写省公司名称" />
+              <el-col :span="12" v-if="info.agent_type == 2 || info.agent_type == 5">
+                <el-form-item label="公司名称：">
+                  <el-input v-model="info.corporate_name" placeholder="请填写公司名称" />
                 </el-form-item>
               </el-col>
               <!-- 地区选择，仅需要的显示  类型：1=总部发起人,2=省发起人,3=省公司外勤,4=省公司内勤,5=区县运营商,6=区县合伙人,7=餐厅,8=配送商  && info.is_headquarters == 0-->
@@ -190,9 +190,9 @@
                   <!--    </el-radio-group>-->
                   <!--  </el-form-item>-->
                   <!--</el-col>-->
-                  <el-col :span="12" v-if="children_list[index].agent_type == 2">
-                    <el-form-item label="省公司名称：">
-                      <el-input v-model="children_list[index].province_corporate_name" placeholder="请填写省公司名称" />
+                  <el-col :span="12" v-if="children_list[index].agent_type == 2 || children_list[index].agent_type == 5">
+                    <el-form-item label="公司名称：">
+                      <el-input v-model="children_list[index].corporate_name" placeholder="请填写公司名称" />
                     </el-form-item>
                   </el-col>
                   <!-- 仅总部发起人显示 -->
@@ -612,7 +612,7 @@ export default {
           mer_id: '',
           mer_id_list: [],
           user: item,
-          province_corporate_name: '',
+          corporate_name: '',
         };
         this.children_list = Object.assign({}, this.children_list);
       }