Merge branch 'blueBranch' into testToMerge

# Conflicts:
#	package-lock.json

src/HManagement/marketing2/agent/details/index.vue

@@ -9,7 +9,7 @@
     turnPageId="20221011144903"
     idname="sa_agentsid"
     :tags="[]"
-    :tabs="[$t('经销商团队'),$t('授权营销类别'),$t('授权领域'),$t('授权标准'),$t('账户余额查询'),$t('地址管理'),$t('财务信息'),$t('银行卡信息'),$t('关联合同'),$t('联系人管理'),$t('业绩目标'),$t('代理区域')]"
+    :tabs="[$t('合作伙伴团队'),$t('授权营销类别'),$t('授权领域'),$t('授权标准'),$t('账户余额查询'),$t('地址管理'),$t('财务信息'),$t('银行卡信息'),$t('关联合同'),$t('联系人管理'),$t('业绩目标'),$t('代理区域')]"
     @pageChange="pageChange"
     @onEditSuccess="queryMainData($route.query.id)">
     <div slot="tags">

src/HManagement/marketing2/agent/details/modules/contract/index.vue

@@ -19,10 +19,11 @@
       <tableLayout :layout="tablecols" :data="list" :opwidth="200"  :custom="true" :width="false"  :height="tableHieght" fixedName="operation writeoffamount unwriteoffamount">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname == 'type'">
-            <span v-if="scope.column.data[[scope.column.columnname]] == '框架'">经销商合作协议</span>
+            <span v-if="scope.column.data[[scope.column.columnname]] == '框架'">{{$t(`经销商合作协议`)}}</span>
             <span v-else-if="scope.column.data.typemx == '经销'">{{$t(`经销项目协议`)}}</span>
             <span v-else-if="scope.column.data.typemx == '直销'">{{$t(`直销项目协议`)}}</span>
-            <span v-else-if="scope.column.data[[scope.column.columnname]] == '工具借用'">工具使用协议</span>
+            <span v-else-if="scope.column.data[[scope.column.columnname]] == '直销'">{{$t(`直销客户合作协议`)}}</span>
+            <span v-else-if="scope.column.data[[scope.column.columnname]] == '工具借用'">{{$t(`工具使用协议`)}}</span>
             <span v-else-if="scope.column.data[[scope.column.columnname]] == '居间'">{{$t(`居间协议`)}}</span>
           </div>
            <div v-else-if="scope.column.columnname == 'status'">