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

src/api/modules/consoleManage.ts

@@ -24,25 +24,25 @@ const manageApi = (axiosInstance: ApiInstance) => ({
     riskDataManageDetailPageList: (params: any) => axiosInstance.post('/console/businessReport/risk/detail/page',params),//明细接口
     riskDataManageDetailToPage: (params: any) => axiosInstance.post('/console/businessReport/risk/detail/export',params),//明细出接口
     //对接人
-    contactPersonDataManagePageList: (params: any) => axiosInstance.post('/console/businessDataManage/contactPersonDataManagePageList',params),//列表接口
-    contactPersonDataManageToTask: (params: any) => axiosInstance.post('/console/businessDataManage/contactPersonDataManageToTask',params),//列表导出接口
-    contactPersonDataManageDetailPageList: (params: any) => axiosInstance.post('/console/businessDataManage/contactPersonDataManageDetailPageList',params),//明细接口
-    contactPersonDataManageDetailToTask: (params: any) => axiosInstance.post('/console/businessDataManage/contactPersonDataManageDetailToTask',params),//明细出接口
+    contactPersonDataManagePageList: (params: any) => axiosInstance.post('/console/businessReport/contact/page',params),//列表接口
+    contactPersonDataManageToTask: (params: any) => axiosInstance.post('/console/businessReport/contact/export',params),//列表导出接口
+    contactPersonDataManageDetailPageList: (params: any) => axiosInstance.post('/console/businessReport/contact/detail/page',params),//明细接口
+    contactPersonDataManageDetailToTask: (params: any) => axiosInstance.post('/console/businessReport/contact/detail/export',params),//明细出接口
     //业务员
-    salesmanDataManagePageList: (params: any) => axiosInstance.post('/console/businessDataManage/salesmanDataManagePageList',params),//列表接口
-    salesmanDataManageToTask: (params: any) => axiosInstance.post('/console/businessDataManage/salesmanDataManageToTask',params),//列表导出接口
-    salesmanDataManageDetailPageList: (params: any) => axiosInstance.post('/console/businessDataManage/salesmanDataManageDetailPageList',params),//明细接口
-    salesmanDataManageDetailToTask: (params: any) => axiosInstance.post('/console/businessDataManage/salesmanDataManageDetailToTask',params),//明细出接口
+    salesmanDataManagePageList: (params: any) => axiosInstance.post('/console/businessReport/salesman/page',params),//列表接口
+    salesmanDataManageToTask: (params: any) => axiosInstance.post('/console/businessReport/salesman/export',params),//列表导出接口
+    salesmanDataManageDetailPageList: (params: any) => axiosInstance.post('/console/businessReport/salesman/detail/page',params),//明细接口
+    salesmanDataManageDetailToTask: (params: any) => axiosInstance.post('/console/businessReport/salesman/detail/export',params),//明细出接口
     //渠道
-    channelDataManagePageList: (params: any) => axiosInstance.post('/console/businessDataManage/channelDataManagePageList',params),//列表接口
-    channelDataManageToTask: (params: any) => axiosInstance.post('/console/businessDataManage/channelDataManageToTask',params),//列表导出接口
-    channelDataManageDetailPageList: (params: any) => axiosInstance.post('/console/businessDataManage/channelDataManageDetailPageList',params),//明细接口
-    channelDataManageDetailToTask: (params: any) => axiosInstance.post('/console/businessDataManage/channelDataManageDetailToTask',params),//明细出接口
+    channelDataManagePageList: (params: any) => axiosInstance.post('/console/businessReport/salesman/page',params),//列表接口
+    channelDataManageToTask: (params: any) => axiosInstance.post('/console/businessReport/salesman/export',params),//列表导出接口
+    channelDataManageDetailPageList: (params: any) => axiosInstance.post('/console/businessReport/salesman/detail/page',params),//明细接口
+    channelDataManageDetailToTask: (params: any) => axiosInstance.post('/console/businessReport/salesman/detail/export',params),//明细出接口
     //电销
-    telemarketingDataManagePageList: (params: any) => axiosInstance.post('/console/businessDataManage/telemarketingDataManagePageList',params),//列表接口
-    telemarketingDataManageToTask: (params: any) => axiosInstance.post('/console/businessDataManage/telemarketingDataManageToTask',params),//列表导出接口
-    telemarketingDataManageDetailPageList: (params: any) => axiosInstance.post('/console/businessDataManage/telemarketingDataManageDetailPageList',params),//明细接口
-    telemarketingDataManageDetailToTask: (params: any) => axiosInstance.post('/console/businessDataManage/telemarketingDataManageDetailToTask',params),//明细出接口
+    telemarketingDataManagePageList: (params: any) => axiosInstance.post('/console/businessReport/salesman/page',params),//列表接口
+    telemarketingDataManageToTask: (params: any) => axiosInstance.post('/console/businessReport/salesman/export',params),//列表导出接口
+    telemarketingDataManageDetailPageList: (params: any) => axiosInstance.post('/console/businessReport/salesman/detail/page',params),//明细接口
+    telemarketingDataManageDetailToTask: (params: any) => axiosInstance.post('/console/businessReport/salesman/detail/export',params),//明细出接口
 
 
     //报价数据

src/views/consoleManage/businessDataManage/channelDataManage/channelDataManageDetail.vue

@@ -97,13 +97,13 @@ const listOption = reactive({
       label: "险种",
       width: "180",
     },
-    {
-      prop: "quoteCountNum",
-      label: "报价次数",
-      width: "180",
-      align: "right",
-      sortable: true,
-    },
+    // {
+    //   prop: "quoteCountNum",
+    //   label: "报价次数",
+    //   width: "180",
+    //   align: "right",
+    //   sortable: true,
+    // },
     {
       prop: "sumPremium",
       label: "保费",
@@ -254,6 +254,7 @@ const queryList = async () => {
       ? globalSortKey.value + " " + globalSortOrder.value
       : "",
     ...query,
+    salesmanTypes: ['7'],
   });
   tableData.value = data.records;
   pageInfo.value.pageNum = data.current;
@@ -280,6 +281,7 @@ const downloadFile = async () => {
       ? globalSortKey.value + " " + globalSortOrder.value
       : "",
     ...query,
+    salesmanTypes: ['7'],
   });
   ElMessage({
     message: msg,

src/views/consoleManage/businessDataManage/channelDataManage/index.vue

@@ -300,6 +300,7 @@ const queryList = async () => {
       ? globalSortKey.value + " " + globalSortOrder.value
       : "",
     ...query,
+    salesmanTypes: ['7'],
   });
   tableData.value = data.records;
   pageInfo.value.pageNum = data.current;
@@ -326,6 +327,7 @@ const downloadFile = async () => {
       ? globalSortKey.value + " " + globalSortOrder.value
       : "",
     ...query,
+    salesmanTypes: ['7'],
   });
   ElMessage({
     message: msg,
@@ -338,7 +340,7 @@ const agreementEdit = (item) => {
   queryFormRes.value = queryFormRef.value?.querySelect();
   let query = {
     ...queryFormRes.value,
-    salesmanId: item.salesmanId,
+    salesmanPhone: item.salesmanPhone,
   };
   router.push({
     name: "channelDataManageDetail",

src/views/consoleManage/businessDataManage/contactPersonDataManage/contactPersonDataManageDetail.vue

@@ -113,12 +113,12 @@ const listOption = reactive({
       width: "200",
     },
     {
-      prop: "salesmanName",
+      prop: "contactPersonName",
       label: "业务员",
       width: "180",
     },
     {
-      prop: "salesmanPhone",
+      prop: "contactPersonPhone",
       label: "手机号",
       width: "180",
     },

src/views/consoleManage/businessDataManage/salesmanDataManage/index.vue

@@ -297,9 +297,10 @@ const queryList = async () => {
     routerKey: routerKey.value,
     userId: phone,
     orderType: globalSortKey.value
-      ? globalSortKey.value + " " + globalSortOrder.value
-      : "",
+    ? globalSortKey.value + " " + globalSortOrder.value
+    : "",
     ...query,
+    salesmanTypes: ['6'],
   });
   tableData.value = data.records;
   pageInfo.value.pageNum = data.current;
@@ -326,6 +327,7 @@ const downloadFile = async () => {
       ? globalSortKey.value + " " + globalSortOrder.value
       : "",
     ...query,
+    salesmanTypes: ['6'],
   });
   ElMessage({
     message: msg,
@@ -338,7 +340,7 @@ const agreementEdit = (item) => {
   queryFormRes.value = queryFormRef.value?.querySelect();
   let query = {
     ...queryFormRes.value,
-    salesmanId: item.salesmanId,
+    salesmanPhone: item.salesmanPhone,
   };
   router.push({
     name: "salesmanDataManageDetail",

src/views/consoleManage/businessDataManage/salesmanDataManage/salesmanDataManageDetail.vue

@@ -97,13 +97,13 @@ const listOption = reactive({
       label: "险种",
       width: "180",
     },
-    {
-      prop: "quoteCountNum",
-      label: "报价次数",
-      width: "180",
-      align: "right",
-      sortable: true,
-    },
+    // {
+    //   prop: "quoteCountNum",
+    //   label: "报价次数",
+    //   width: "180",
+    //   align: "right",
+    //   sortable: true,
+    // },
     {
       prop: "sumPremium",
       label: "保费",
@@ -255,6 +255,7 @@ const queryList = async () => {
       ? globalSortKey.value + " " + globalSortOrder.value
       : "",
     ...query,
+    salesmanTypes: ['6'],
   });
   tableData.value = data.records;
   pageInfo.value.pageNum = data.current;
@@ -281,6 +282,7 @@ const downloadFile = async () => {
       ? globalSortKey.value + " " + globalSortOrder.value
       : "",
     ...query,
+    salesmanTypes: ['6'],
   });
   ElMessage({
     message: msg,

src/views/consoleManage/businessDataManage/telemarketingDataManage/index.vue

@@ -300,6 +300,7 @@ const queryList = async () => {
       ? globalSortKey.value + " " + globalSortOrder.value
       : "",
     ...query,
+    salesmanTypes: ['8'],
   });
   tableData.value = data.records;
   pageInfo.value.pageNum = data.current;
@@ -326,6 +327,7 @@ const downloadFile = async () => {
       ? globalSortKey.value + " " + globalSortOrder.value
       : "",
     ...query,
+    salesmanTypes: ['8'],
   });
   ElMessage({
     message: msg,
@@ -338,7 +340,7 @@ const agreementEdit = (item) => {
   queryFormRes.value = queryFormRef.value?.querySelect();
   let query = {
     ...queryFormRes.value,
-    salesmanId: item.salesmanId,
+    salesmanPhone: item.salesmanPhone,
   };
   router.push({
     name: "telemarketingDataManageDetail",

src/views/consoleManage/businessDataManage/telemarketingDataManage/telemarketingDataManageDetail.vue

@@ -1,29 +1,29 @@
 <template>
   <div class="log">
     <PageMain class="vh100">
-    <div class='btn-box'>
-      <el-button type="primary" plain class='query-btn'
-        @click='dialogShow'>{{selectedKeys.length?`已选${selectedKeys.length}项`:'筛选条件'}}</el-button>
-      <div class='query-btn'>
-        <DowButton @endAnim='downloadFile'></DowButton>
+      <div class='btn-box'>
+        <el-button type="primary" plain class='query-btn'
+          @click='dialogShow'>{{ selectedKeys.length ? `已选${selectedKeys.length}项` : '筛选条件' }}</el-button>
+        <div class='query-btn'>
+          <DowButton @endAnim='downloadFile'></DowButton>
+        </div>
       </div>
-    </div>
-    <QueryForm :option="listOption" @query='query' @delSelect='delSelect' ref='queryFormRef'></QueryForm>
+      <QueryForm :option="listOption" @query='query' @delSelect='delSelect' ref='queryFormRef'></QueryForm>
 
-    <!-- 表格 -->
-    <ComplexTable :tableData="tableData" :showSelect='false' :columns="listOption.columns" :showIndex="false"
-      :columnwidth="120" :pageInfo="pageInfo" @getList="getList" :showOperation='false'>
+      <!-- 表格 -->
+      <ComplexTable :tableData="tableData" :showSelect='false' :columns="listOption.columns" :showIndex="false"
+        :columnwidth="120" :pageInfo="pageInfo" @getList="getList" :showOperation='false'>
 
-      <template v-slot:search="scope">
-        <Sort :scope="scope.slotData" :globalSortKey="globalSortKey" :globalSortOrder="globalSortOrder"
-          @update:sort="handleSortUpdate"></Sort>
-      </template>
+        <template v-slot:search="scope">
+          <Sort :scope="scope.slotData" :globalSortKey="globalSortKey" :globalSortOrder="globalSortOrder"
+            @update:sort="handleSortUpdate"></Sort>
+        </template>
 
-    </ComplexTable>
+      </ComplexTable>
 
-    <FilterDialog :show='isShow' @close='isShow=false' @sure='filterSure' ref='filterDialogRef' @selectedKeys='selected'
-      routerKey='routerKey'>
-    </FilterDialog>
+      <FilterDialog :show='isShow' @close='isShow = false' @sure='filterSure' ref='filterDialogRef'
+        @selectedKeys='selected' routerKey='routerKey'>
+      </FilterDialog>
     </PageMain>
   </div>
 </template>
@@ -97,13 +97,13 @@ const listOption = reactive({
       label: "险种",
       width: "180",
     },
-    {
-      prop: "quoteCountNum",
-      label: "报价次数",
-      width: "180",
-      align: "right",
-      sortable: true,
-    },
+    // {
+    //   prop: "quoteCountNum",
+    //   label: "报价次数",
+    //   width: "180",
+    //   align: "right",
+    //   sortable: true,
+    // },
     {
       prop: "sumPremium",
       label: "保费",
@@ -254,6 +254,7 @@ const queryList = async () => {
       ? globalSortKey.value + " " + globalSortOrder.value
       : "",
     ...query,
+    salesmanTypes: ['8'],
   });
   tableData.value = data.records;
   pageInfo.value.pageNum = data.current;
@@ -281,6 +282,7 @@ const downloadFile = async () => {
         ? globalSortKey.value + " " + globalSortOrder.value
         : "",
       ...query,
+      salesmanTypes: ['8'],
     }
   );
   ElMessage({
@@ -300,6 +302,7 @@ onMounted(() => {
   .query-btn {
     margin-left: 20px;
   }
+
   .btn-box {
     padding-bottom: 15px;
     margin-bottom: 24px;
@@ -308,6 +311,7 @@ onMounted(() => {
     justify-content: flex-end;
   }
 }
+
 :deep(.caret-wrapper) {
   display: none !important;
 }