From a170c70536df5f17cfde80500e7908afee43e52c Mon Sep 17 00:00:00 2001 From: zhangli <2235006734@qq.com> Date: Mon, 30 Oct 2023 14:00:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/purchaseclaimRequestDetail/index.ts | 9 ++++++++- src/components/Detail/src/Detail.vue | 1 + src/components/SearchHigh/src/SearchHigh.vue | 14 +++++++++++++- src/components/TableHead/src/TableHead.vue | 6 ++++++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/api/wms/purchaseclaimRequestDetail/index.ts b/src/api/wms/purchaseclaimRequestDetail/index.ts index 3e767be76..fed254b7d 100644 --- a/src/api/wms/purchaseclaimRequestDetail/index.ts +++ b/src/api/wms/purchaseclaimRequestDetail/index.ts @@ -22,7 +22,14 @@ export interface PurchaseclaimRequestDetailVO { // 查询采购索赔申请子列表 export const getPurchaseclaimRequestDetailPage = async (params) => { - return await request.get({ url: `/wms/purchaseclaim-request-detail/page`, params }) + // return await request.get({ url: `/wms/purchaseclaim-request-detail/page`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return request.post({ url: '/wms/purchaseclaim-request-detail/senior', data }) + } else { + return await request.get({ url: `/wms/purchaseclaim-request-detail/page`, params }) + } } // 查询采购索赔申请子详情 diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index 181ee8730..2cae59c35 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -19,6 +19,7 @@ (item.field == val)) let data = 'input' - if (type?.dictClass) { + if (type?.dictType) { data = 'select' } else if (type?.form?.component == 'InputNumber') { data = 'inputNumber' @@ -208,6 +213,13 @@ const buttonBaseClick = (val) => { } data.push(obj) }) + if (props.masterId){ + data.push({ + column: 'masterId', + action: "==", + value: props.masterId, + }) + } emit('searchFormClick', { filters:data }) diff --git a/src/components/TableHead/src/TableHead.vue b/src/components/TableHead/src/TableHead.vue index fa52d9877..d127ccb34 100644 --- a/src/components/TableHead/src/TableHead.vue +++ b/src/components/TableHead/src/TableHead.vue @@ -33,6 +33,7 @@ ref="searchHigh_Ref" class="searchHighClass" :routeName="routeName" + :masterId="masterId" :showPrimaryBaseButton="false" @searchFormClick="searchFormClick" :isHighExcludePrimary="false" @@ -56,6 +57,11 @@ import rowDrop from "@/components/rowDrop/index.vue" routeName: { type: String, default: '' + }, + // 从子表进行高级搜索 + masterId: { + type: String, + default: '' } })