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

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

@@ -1,37 +1,37 @@
 <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">
-      <template v-slot:operation="scope">
-        <el-button type="primary" link @click='agreementEdit(scope.operationData.id)'>明细</el-button>
-      </template>
+      <!-- 表格 -->
+      <ComplexTable :tableData="tableData" :showSelect='false' :columns="listOption.columns" :showIndex="false"
+        :columnwidth="120" :pageInfo="pageInfo" @getList="getList">
+        <template v-slot:operation="scope">
+          <el-button type="primary" link @click='agreementEdit(scope.operationData.id)'>明细</el-button>
+        </template>
 
-      <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>
 
-      <template #customSlot="{  bodyCell: { scope, column } }">
-        <template v-if="column.prop == 'underwriteOrderNum'">
-          {{ scope.row.underwriteOrderNum }} 笔
+        <template #customSlot="{ bodyCell: { scope, column } }">
+          <template v-if="column.prop == 'totalOrder'">
+            {{ scope.row.totalOrder }} 笔
+          </template>
         </template>
-      </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>
@@ -65,12 +65,12 @@ const listOption = reactive({
   // 表格列
   columns: [
     {
-      prop: "salesmanName",
+      prop: "name",
       label: "姓名",
       width: "100",
     },
     {
-      prop: "salesmanPhone",
+      prop: "mobile",
       label: "手机号",
       width: "120",
     },
@@ -80,12 +80,12 @@ const listOption = reactive({
       width: "300",
     },
     {
-      prop: "areaName",
+      prop: "area",
       label: "所在地区",
       width: "180",
     },
     {
-      prop: "underwriteOrderNum",
+      prop: "totalOrder",
       label: "承保订单",
       width: "180",
       align: "right",
@@ -93,21 +93,21 @@ const listOption = reactive({
       component: "customSlot",
     },
     {
-      prop: "sumPremium",
+      prop: "totalAmount",
       label: "保费",
       width: "180",
       align: "right",
       sortable: true,
     },
     {
-      prop: "orderCommissionPremium",
+      prop: "totalBrokerage",
       label: "出单佣金",
       width: "180",
       align: "right",
       sortable: true,
     },
     {
-      prop: "avgOrderNumPremium",
+      prop: "averagePremium",
       label: "单均保费",
       width: "180",
       align: "right",
@@ -119,25 +119,25 @@ const listOption = reactive({
       width: "180",
     },
     {
-      prop: "lastRecordTime",
+      prop: "lastSigningTime",
       label: "上次签单",
       width: "180",
     },
-    {
-      prop: "manegrName",
-      label: "管理人",
-      width: "180",
-    },
-    {
-      prop: "personStatus",
-      label: "人员状态",
-      width: "180",
-    },
-    {
-      prop: "accountStatus",
-      label: "账号状态",
-      width: "180",
-    },
+    // {
+    //   prop: "manegrName",
+    //   label: "管理人",
+    //   width: "180",
+    // },
+    // {
+    //   prop: "personStatus",
+    //   label: "人员状态",
+    //   width: "180",
+    // },
+    // {
+    //   prop: "accountStatus",
+    //   label: "账号状态",
+    //   width: "180",
+    // },
   ],
 });
 
@@ -236,11 +236,15 @@ 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,
+    signingTimeStart: query.signTime[0] ?? '',
+    signingTimeEnd: query.signTime[1] ?? '',
+    typeAttr: '6',
   });
   tableData.value = data.records;
   pageInfo.value.pageNum = data.current;
@@ -262,11 +266,15 @@ 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,
+    signingTimeStart: query.signTime[0] ?? '',
+    signingTimeEnd: query.signTime[1] ?? '',
+    typeAttr: '6',
   });
   ElMessage({
     message: msg,
@@ -294,6 +302,7 @@ onMounted(() => {
   .query-btn {
     margin-left: 20px;
   }
+
   .btn-box {
     padding-bottom: 15px;
     margin-bottom: 24px;
@@ -302,6 +311,7 @@ onMounted(() => {
     justify-content: flex-end;
   }
 }
+
 :deep(.caret-wrapper) {
   display: none !important;
 }

src/views/quoteConfig/agreement/agreementDetails.vue

@@ -281,10 +281,12 @@
       </template>
     </el-dialog>
     <el-dialog :close-on-click-modal="false" v-model="copyDialog2" title="批量设置有效期" width="500">
-      <el-form inline>
-        <el-form-item label="有效期">
-          <el-date-picker v-model="effectiveFailureTime" type="daterange" range-separator="至" start-placeholder="开始时间"
-            end-placeholder="结束时间" value-format="YYYY-MM-DD HH:mm:ss" />
+      <el-form >
+        <el-form-item label="开始时间">
+          <el-date-picker v-model="effectiveTime" type="date" 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-form-item>
       </el-form>
       <template #footer>
@@ -1106,24 +1108,22 @@ const uploadImage = (file: any) => {
 }
 
 const copyDialog2 = ref(false)
-const effectiveFailureTime = ref([])
+const effectiveTime = ref()
+const failureTime = ref()
 const handleUpdateValidDate = () => {
   if (!costIds.value.length) {
     ElMessage.error('请选择费用')
     return
   }
-  effectiveFailureTime.value = []
+  effectiveTime.value=''
+  failureTime.value=''
   copyDialog2.value = true
 }
 const submitUpdate = () => {
-  if (!effectiveFailureTime.value.length) {
-    ElMessage.error('请选择有效期')
-    return
-  }
   const params = {
     costIds: costIds.value,
-    effectiveTime: effectiveFailureTime.value[0],
-    failureTime: effectiveFailureTime.value[1],
+    effectiveTime: effectiveTime.value,
+    failureTime: failureTime.value,
   }
   api.agreementApi.agreementCostBatchUpdateValidDate(params).then((res: any) => {
     if (res.code == '200') {