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

src/api/modules/consoleManage.ts

@@ -53,14 +53,14 @@ const manageApi = (axiosInstance: ApiInstance) => ({
     companyQuotationDataPageList: (params: any) => axiosInstance.post('/console/quotationReport/company/page',params),//列表接口
     companyQuotationDataToTask: (params: any) => axiosInstance.post('/console/quotationReport/company/export',params),//列表导出接口
     //业务员
-    salesmanQuotationDataPageList: (params: any) => axiosInstance.post('/console/quotationDataManage/salesmanQuotationDataPageList',params),//列表接口
-    salesmanQuotationDataToTask: (params: any) => axiosInstance.post('/console/quotationDataManage/salesmanQuotationDataToTask',params),//列表导出接口
+    salesmanQuotationDataPageList: (params: any) => axiosInstance.post('/console/quotationReport/salesman/page',params),//列表接口
+    salesmanQuotationDataToTask: (params: any) => axiosInstance.post('/console/quotationReport/salesman/export',params),//列表导出接口
      //渠道
-    channelQuotationDataPageList: (params: any) => axiosInstance.post('/console/quotationDataManage/channelQuotationDataPageList',params),//列表接口
-    channelQuotationDataToTask: (params: any) => axiosInstance.post('/console/quotationDataManage/channelQuotationDataToTask',params),//列表导出接口
+    channelQuotationDataPageList: (params: any) => axiosInstance.post('/console/quotationReport/salesman/page',params),//列表接口
+    channelQuotationDataToTask: (params: any) => axiosInstance.post('/console/quotationReport/salesman/export',params),//列表导出接口
     //电销
-     telemarketingQuotationDataPageList: (params: any) => axiosInstance.post('/console/quotationDataManage/telemarketingQuotationDataPageList',params),//列表接口
-    telemarketingQuotationDataToTask: (params: any) => axiosInstance.post('/console/quotationDataManage/telemarketingQuotationDataToTask',params),//列表导出接口
+     telemarketingQuotationDataPageList: (params: any) => axiosInstance.post('/console/quotationReport/salesman/page',params),//列表接口
+    telemarketingQuotationDataToTask: (params: any) => axiosInstance.post('/console/quotationReport/salesman/export',params),//列表导出接口
 
 
     //人员数据

src/views/consoleManage/personDataManage/salesmanDept/index.vue

@@ -225,11 +225,14 @@ const queryList = async () => {
     pageNo: pageInfo.value.pageNum,
     pageSize: pageInfo.value.pageSize,
     routerKey: routerKey.value,
+    systemCode: localStorage.getItem('login_system'),
     userId: phone,
     orderType: globalSortKey.value
       ? globalSortKey.value + " " + globalSortOrder.value
       : "",
     ...query,
+    signTimeBegin: query.createTime[0] ?? '',
+    signTimeEnd: query.createTime[1] ?? '',
   });
   tableData.value = data.records;
   pageInfo.value.pageNum = data.current;
@@ -251,11 +254,14 @@ const downloadFile = async () => {
     pageNo: pageInfo.value.pageNum,
     pageSize: pageInfo.value.pageSize,
     routerKey: routerKey.value,
+    systemCode: localStorage.getItem('login_system'),
     userId: phone,
     orderType: globalSortKey.value
       ? globalSortKey.value + " " + globalSortOrder.value
       : "",
     ...query,
+    signTimeBegin: query.createTime[0] ?? '',
+    signTimeEnd: query.createTime[1] ?? '',
   });
   ElMessage({
     message: msg,

src/views/consoleManage/quotationDataManage/channelQuotationData/index.vue

@@ -272,6 +272,10 @@ const queryList = async () => {
       ? globalSortKey.value + " " + globalSortOrder.value
       : "",
     ...query,
+    orgIds: query.orgIds.filter(v => v),
+    createTimeBegin: query.recordTime[0] ?? '',
+    createTimeEnd: query.recordTime[1] ?? '',
+    salesmanTypes:['7']
   });
   tableData.value = data.records;
   pageInfo.value.pageNum = data.current;
@@ -298,6 +302,10 @@ const downloadFile = async () => {
       ? globalSortKey.value + " " + globalSortOrder.value
       : "",
     ...query,
+    orgIds: query.orgIds.filter(v => v),
+    createTimeBegin: query.recordTime[0] ?? '',
+    createTimeEnd: query.recordTime[1] ?? '',
+    salesmanTypes:['7']
   });
   ElMessage({
     message: msg,

src/views/consoleManage/quotationDataManage/salesmanQuotationData/index.vue

@@ -1,45 +1,45 @@
 <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>
-    <div class='flex content-box'>
-      <!-- tree -->
-      <div class='content-l'>
-        <Tree ref='treeRef' @nodeId='nodeId'></Tree>
-      </div>
-
-      <div class='flex-1 content-r'>
-        <!-- 表格 -->
-        <ComplexTable :tableData="tableData" :showSelect='false' :columns="listOption.columns" :showIndex="false"
-          :columnwidth="120" :pageInfo="pageInfo" @getList="getList" :showOperation='false'>
+      <QueryForm :option="listOption" @query='query' @delSelect='delSelect' ref='queryFormRef'></QueryForm>
+      <div class='flex content-box'>
+        <!-- tree -->
+        <div class='content-l'>
+          <Tree ref='treeRef' @nodeId='nodeId'></Tree>
+        </div>
 
-          <template v-slot:search="scope">
-            <Sort :scope="scope.slotData" :globalSortKey="globalSortKey" :globalSortOrder="globalSortOrder"
-              @update:sort="handleSortUpdate"></Sort>
-          </template>
+        <div class='flex-1 content-r'>
+          <!-- 表格 -->
+          <ComplexTable :tableData="tableData" :showSelect='false' :columns="listOption.columns" :showIndex="false"
+            :columnwidth="120" :pageInfo="pageInfo" @getList="getList" :showOperation='false'>
 
-          <template #customSlot="{  bodyCell: { scope, column } }">
-            <template v-if="column.prop == 'quoteCountNumProportion'">
-              {{ scope.row.quoteCountNumProportion }} %
+            <template v-slot:search="scope">
+              <Sort :scope="scope.slotData" :globalSortKey="globalSortKey" :globalSortOrder="globalSortOrder"
+                @update:sort="handleSortUpdate"></Sort>
             </template>
-            <template v-if="column.prop == 'avgQuoteTime'">
-              {{ scope.row.avgQuoteTime }} s
+
+            <template #customSlot="{ bodyCell: { scope, column } }">
+              <template v-if="column.prop == 'quoteCountNumProportion'">
+                {{ scope.row.quoteCountNumProportion }} %
+              </template>
+              <template v-if="column.prop == 'avgQuoteTime'">
+                {{ scope.row.avgQuoteTime }} s
+              </template>
             </template>
-          </template>
-        </ComplexTable>
+          </ComplexTable>
+        </div>
       </div>
-    </div>
 
-    <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>
@@ -272,6 +272,10 @@ const queryList = async () => {
       ? globalSortKey.value + " " + globalSortOrder.value
       : "",
     ...query,
+    orgIds: query.orgIds.filter(v => v),
+    createTimeBegin: query.recordTime[0] ?? '',
+    createTimeEnd: query.recordTime[1] ?? '',
+    salesmanTypes: ['6']
   });
   tableData.value = data.records;
   pageInfo.value.pageNum = data.current;
@@ -298,6 +302,10 @@ const downloadFile = async () => {
       ? globalSortKey.value + " " + globalSortOrder.value
       : "",
     ...query,
+    orgIds: query.orgIds.filter(v => v),
+    createTimeBegin: query.recordTime[0] ?? '',
+    createTimeEnd: query.recordTime[1] ?? '',
+    salesmanTypes: ['6']
   });
   ElMessage({
     message: msg,
@@ -330,6 +338,7 @@ onMounted(() => {
   .query-btn {
     margin-left: 20px;
   }
+
   .btn-box {
     padding-bottom: 15px;
     margin-bottom: 24px;
@@ -340,10 +349,12 @@ onMounted(() => {
 
   .content-box {
     justify-content: space-between;
+
     .content-l {
       width: 298px;
       display: flex;
       margin: 20px 16px 20px 0;
+
       .item {
         width: 50%;
         height: 36px;
@@ -353,16 +364,19 @@ onMounted(() => {
         text-align: center;
         border-radius: 2px;
       }
+
       .active {
         background: #0083ff;
         color: #fff;
       }
     }
+
     .content-r {
       width: 0;
     }
   }
 }
+
 :deep(.caret-wrapper) {
   display: none !important;
 }

src/views/consoleManage/quotationDataManage/telemarketingQuotationData/index.vue

@@ -272,6 +272,10 @@ const queryList = async () => {
       ? globalSortKey.value + " " + globalSortOrder.value
       : "",
     ...query,
+    orgIds: query.orgIds.filter(v => v),
+    createTimeBegin: query.recordTime[0] ?? '',
+    createTimeEnd: query.recordTime[1] ?? '',
+    salesmanTypes:['8']
   });
   tableData.value = data.records;
   pageInfo.value.pageNum = data.current;
@@ -298,6 +302,10 @@ const downloadFile = async () => {
       ? globalSortKey.value + " " + globalSortOrder.value
       : "",
     ...query,
+    orgIds: query.orgIds.filter(v => v),
+    createTimeBegin: query.recordTime[0] ?? '',
+    createTimeEnd: query.recordTime[1] ?? '',
+    salesmanTypes:['8']
   });
   ElMessage({
     message: msg,

src/views/insurancePolicy/index.vue

@@ -2765,10 +2765,9 @@ const getSchemeResult = (bool: false) => {
     // 方案信息
     quoteData.value.forEach((item: any) => {
       if (item.id === insurancePolicyForm.value.order.insuranceCompanyCode) {
-        item.projectList = list.map((item1: any) => {
+        list = list.map((item1: any) => {
           return {
             ...item1,
-            drivings: item1.drivings.filter(v => ['1', '2'].includes(v.selectedStatus)),
             drivingsArr: item1.drivings,
             rescue: [],
             detection: [],
@@ -2813,16 +2812,7 @@ const getSchemeResult = (bool: false) => {
           }
           list = list.map(v => ({ ...v, drivings: v.drivings.filter(k => ['1', '2'].includes(k.selectedStatus)), }))
         }
-        item.projectList = list.map((item1: any) => {
-          return {
-            ...item1,
-            drivingsArr: item1.drivings,
-            rescue: [],
-            detection: [],
-            driver: [],
-            inspect: []
-          }
-        })
+        item.projectList = list
       }
     })
   })

src/views/quoteConfig/agreement/agreementDetails.vue

@@ -274,10 +274,10 @@
     <el-dialog :close-on-click-modal="false" v-model="copyDialog2" title="批量设置有效期" width="500">
       <el-form>
         <el-form-item label="开始时间">
-          <el-date-picker v-model="effectiveTime" type="date" value-format="YYYY-MM-DD HH:mm:ss" />
+          <el-date-picker v-model="effectiveTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" />
         </el-form-item>
         <el-form-item label="结束时间">
-          <el-date-picker v-model="failureTime" type="date" value-format="YYYY-MM-DD HH:mm:ss" />
+          <el-date-picker v-model="failureTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" />
         </el-form-item>
       </el-form>
       <template #footer>