Browse Source

Merge branch 'dev' into ecp

liyuan 1 week ago
parent
commit
f2fa0db8d0

+ 3 - 3
src/api/claimSearch/index.js

@@ -11,7 +11,7 @@ import request from '@/router/axios';
 
 
 /**
 /**
  * 理赔申请综合查询(分页)
  * 理赔申请综合查询(分页)
- * GET /api/factory/claimSearch/comprehensive
+ * POST /api/factory/claimSearch/comprehensive
  * @param {number} pageSize - 每页条数(1~100)
  * @param {number} pageSize - 每页条数(1~100)
  * @param {number} pageNum - 页码(最小 1)
  * @param {number} pageNum - 页码(最小 1)
  * @param {ClaimSearchComprehensiveParams} [params={}] - 查询参数
  * @param {ClaimSearchComprehensiveParams} [params={}] - 查询参数
@@ -20,8 +20,8 @@ import request from '@/router/axios';
 export const getClaimSearchComprehensive = (pageSize, pageNum, params = {}) => {
 export const getClaimSearchComprehensive = (pageSize, pageNum, params = {}) => {
   return request({
   return request({
     url: '/api/factory/claimSearch/comprehensive',
     url: '/api/factory/claimSearch/comprehensive',
-    method: 'get',
-    params: {
+    method: 'post',
+    data: {
       pageSize,
       pageSize,
       pageNum,
       pageNum,
       ...params
       ...params

+ 4 - 0
src/api/types/claim-search.d.ts

@@ -26,6 +26,10 @@ export interface ClaimSearchPageResult<T> {
  * GET /api/factory/claimSearch/comprehensive
  * GET /api/factory/claimSearch/comprehensive
  */
  */
 export interface ClaimSearchComprehensiveParams {
 export interface ClaimSearchComprehensiveParams {
+  storeName?: string;
+  storeAddress?: string;
+  storeContact?: string;
+  storePhone?: string;
   /** 理赔单号(精准匹配) */
   /** 理赔单号(精准匹配) */
   claimNo?: string;
   claimNo?: string;
   /** 来源类型:1 - 经销商、2 - 门店、3 - 终端消费者 */
   /** 来源类型:1 - 经销商、2 - 门店、3 - 终端消费者 */

+ 24 - 0
src/views/claim/claimMixin.js

@@ -193,6 +193,30 @@ export default {
         addBtn: false,
         addBtn: false,
         column: [
         column: [
           {
           {
+            label: '门店名称',
+            prop: 'storeName',
+            overHidden: true,
+            width: 160
+          },
+          {
+            label: '门店地址',
+            prop: 'storeAddress',
+            overHidden: true,
+            width: 220
+          },
+          {
+            label: '门店联系人',
+            prop: 'storeContact',
+            overHidden: true,
+            width: 120
+          },
+          {
+            label: '门店联系电话',
+            prop: 'storePhone',
+            overHidden: true,
+            width: 140
+          },
+          {
             label: '理赔单号',
             label: '理赔单号',
             prop: 'claimNo',
             prop: 'claimNo',
             search: true
             search: true

+ 8 - 0
src/views/claim/types.d.ts

@@ -35,6 +35,10 @@ export interface ClaimItem {
   purchaseDate: string; // 购买日期
   purchaseDate: string; // 购买日期
   mountDate: string; // 安装日期
   mountDate: string; // 安装日期
   runMileage: number; // 行驶里程
   runMileage: number; // 行驶里程
+  storeName?: string; // 门店名称
+  storeAddress?: string; // 门店地址
+  storeContact?: string; // 门店联系人
+  storePhone?: string; // 门店联系电话
   vehicleNumber?: string; // 车牌号
   vehicleNumber?: string; // 车牌号
   tireQuantity?: number; // 轮胎数量
   tireQuantity?: number; // 轮胎数量
   brandItem?: string; // 花纹
   brandItem?: string; // 花纹
@@ -158,6 +162,10 @@ export interface ClaimItem {
   purchaseDate: string;
   purchaseDate: string;
   mountDate: string;
   mountDate: string;
   runMileage: number;
   runMileage: number;
+  storeName?: string;
+  storeAddress?: string;
+  storeContact?: string;
+  storePhone?: string;
   vehicleNumber?: string;
   vehicleNumber?: string;
   tireQuantity?: number;
   tireQuantity?: number;
   brandItem?: string;
   brandItem?: string;

+ 4 - 0
src/views/search/claim-query/mixin.js

@@ -81,6 +81,10 @@ export default {
         delBtn: false,
         delBtn: false,
         addBtn: false,
         addBtn: false,
         column: [
         column: [
+          { label: '门店名称', prop: 'storeName', search: true, hide: true, width: 160 },
+          { label: '门店地址', prop: 'storeAddress', search: true, hide: true, width: 200 },
+          { label: '门店联系人', prop: 'storeContact', search: true, hide: true, width: 120 },
+          { label: '门店联系电话', prop: 'storePhone', search: true, hide: true, width: 140 },
           { label: '理赔单号', prop: 'claimNo', search: true, width: 150 },
           { label: '理赔单号', prop: 'claimNo', search: true, width: 150 },
           {
           {
             label: '来源类型',
             label: '来源类型',