diff --git a/src/api/wms/itembasic/index.ts b/src/api/wms/itembasic/index.ts index 9faaeaadb..473c096a0 100644 --- a/src/api/wms/itembasic/index.ts +++ b/src/api/wms/itembasic/index.ts @@ -85,6 +85,6 @@ export const selectItembasicPageToFgAndSemibasicPage = async (params) => { const data = {...params} return request.post({ url: '/wms/itembasic/itembasicPageToFgAndSemiSenior', data }) } else { - return await request.get({ url: `/wms/itembasic/ItembasicPageToFgAndSemi`, params }) + return await request.get({ url: `/wms/itembasic/itembasicPageToFgAndSemi`, params }) } } \ No newline at end of file diff --git a/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue b/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue index 375b80c44..12a562ceb 100644 --- a/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue @@ -55,8 +55,6 @@ diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index 90c237b54..f060b7e99 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -5,6 +5,9 @@ import * as getRequestsettingApi from '@/api/wms/requestsetting/index' import * as DeliverRecordMainApi from '@/api/wms/deliverRecordMain' import { DeliverRecordMain } from '../../deliver/deliverRecordMain/deliverRecordMain.data' +import * as CustomerApi from '@/api/wms/customer' +import { Customer } from '../../../basicDataManage/customerManage/customer/customer.data' + import * as CustomerdockApi from '@/api/wms/customerdock' import { Customerdock } from '../../../basicDataManage/customerManage/customerdock/customerdock.data' @@ -110,8 +113,19 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ }, isSearch: true, form: { + // labelMessage: '信息提示说明!!!', componentProps: { - disabled: true + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择客户代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '客户月台信息', // 查询弹窗标题 + searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类 + searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] } } }, diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue index d8eb5a9c4..aa8a2ad7a 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue @@ -40,8 +40,15 @@ @searchTableSuccessDetail="searchTableSuccessDetail" /> - +