Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/views/additionalOrder/additional/modules/salesmanSelect.vue

@@ -14,8 +14,9 @@
             <span class="">{{ item.name }}</span>
             <span>{{ item.mobile }}</span>
           </div>
-          <div class="depart">
+          <div class="depart flex items-center">
             {{ item.deptName }}
+            <el-tag type="primary" size="small" class="ml-10px">{{ typeAttrList[item.typeAttr] }}</el-tag>
           </div>
         </div>
         <el-icon v-show="item.checked"><Check /></el-icon>
@@ -53,6 +54,13 @@ const handleSelect = (item, index) => {
   checkedItem.value = item
 }
 
+const typeAttrList=ref({
+  '5':'团队',
+  '6':'个代',
+  '7':'渠道',
+  '8':'电销',
+})
+
 // 取消
 const handleCancel = () => {
   emits('close', checkedItem.value)

src/views/insurancePolicy/index.vue

@@ -28,7 +28,7 @@
         </el-col>
         <el-col :span="6" v-if="insurancePolicyForm.salesman">
           <!-- 更换业务员按钮 -->
-          <el-button link type="primary" @click="handleFocus" style="margin-top: 10px">更换业务员</el-button>
+          <el-button link type="primary" @click="handleFocus" style="margin-top: 16px">更换业务员</el-button>
         </el-col>
       </el-row>
       <!-- 可折叠面板：包含各种信息模块 -->
@@ -4123,6 +4123,13 @@ onMounted(() => {
   initDept()       // 初始化部门数据
   initOption()     // 初始化下拉选项
   initDetail()   // 如果有订单号，初始化详情
+  if (!myRoute.query.orderNo && userInfo.value.typeAttr?.includes('7')) {
+    insurancePolicyForm.value.salesman = userInfo.value.name
+    insurancePolicyForm.value.mobile = userInfo.value.username
+    insurancePolicyForm.value.deptId = userInfo.value.deptId
+    salesmanId.value = userInfo.value.userId // 保存选中的业务员ID
+  }
+
 })
 
 </script>

src/views/quoteConfig/agreement/agreementDetails.vue

@@ -233,7 +233,7 @@
               批量复制到规则
               <template #icon>
                 <el-icon>
-                  <Copy />
+                  <CopyDocument />
                 </el-icon>
               </template>
             </el-button>
@@ -285,7 +285,6 @@
         <ComplexTable :tableData="tableData" tableheight="calc(100vh - 410px)" :showOperation="false"
           :columns="columns1" :columnwidth="200" :showSelect="true" :pageInfo="pageInfo" @getList="getList"
           @selectionChange="selectionChange" uniqueIdName="costId">
-
         </ComplexTable>
       </div>
       <template #footer>