From 179aa457f4fae1f053391d5d1b331bb2bbee7198 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 24 Jan 2024 15:16:59 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E4=BB=93=E5=BA=93=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BE=9B?= =?UTF-8?q?=E8=BE=93=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain.data.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index 445e355b4..4f05d0507 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -135,19 +135,18 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive( }, }, { - label: '从仓库代码', + label: '供应商发货仓库代码', field: 'fromWarehouseCode', sort: 'custom', table: { width: 150 }, form: { - value: 'T1', componentProps: { disbaled: true } }, - isForm: false + isForm: true }, { label: '到仓库代码', From c002a9e7c8c321940484c4e7919b55da59d42dab Mon Sep 17 00:00:00 2001 From: chenfang Date: Wed, 24 Jan 2024 16:01:05 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/customerdock/index.ts | 13 +++- .../customerdock/customerdock.data.ts | 74 ++++++++++++------- .../customerreturnRequestMain.data.ts | 43 ++++++----- .../customerreturnRequestMain/index.vue | 3 +- 4 files changed, 81 insertions(+), 52 deletions(-) diff --git a/src/api/wms/customerdock/index.ts b/src/api/wms/customerdock/index.ts index d93f98c85..a7e631080 100644 --- a/src/api/wms/customerdock/index.ts +++ b/src/api/wms/customerdock/index.ts @@ -63,7 +63,7 @@ export const importTemplate = () => { return request.download({ url: '/wms/customerdock/get-import-template' }) } -// 查询客户月台列表 +// 查询客户月台发货口列表 export const pageCustomerCodeToCustomerDock = async (params) => { if (params.isSearch) { delete params.isSearch @@ -72,4 +72,15 @@ export const pageCustomerCodeToCustomerDock = async (params) => { } else { return await request.get({ url: `/wms/customerdock/pageCustomerCodeToCustomerDock`, params }) } +} + +// 查询客户月台收货口列表 +export const pageCustomerCodeToCustomerDockReceiving = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return request.post({ url: '/wms/customerdock/pageCustomerCodeToCustomerDockReceivingSenior', data }) + } else { + return await request.get({ url: `/wms/customerdock/pageCustomerCodeToCustomerDockReceiving`, params }) + } } \ No newline at end of file diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts index e4bee6ec4..cd96b4c93 100644 --- a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts +++ b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts @@ -4,6 +4,9 @@ import { dateFormatter } from '@/utils/formatTime' import * as CustomerApi from '@/api/wms/customer' import { Customer } from '../customer/customer.data' +import * as DockApi from '@/api/wms/dock' +import { Dock } from '../../factoryModeling/dock/dock.data' + import * as WarehouseApi from '@/api/wms/warehouse' import { Warehouse } from '../../factoryModeling/warehouse/warehouse.data' @@ -26,7 +29,50 @@ export const Customerdock = useCrudSchemas(reactive([ width: 150, fixed: 'left' }, - isSearch: true + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择月台代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '月台基础信息', // 查询弹窗标题 + searchAllSchemas: Dock.allSchemas, // 查询弹窗所需类 + searchPage: DockApi.getDockPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + action: '==', + isSearch: true, + isMainValue: false + }] + } + } + }, + { + label: '客户代码', + field: 'customerCode', + sort: 'custom', + table: { + width: 150 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择客户代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '客户基础信息', // 查询弹窗标题 + searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类 + searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + action: '==', + isSearch: true, + isMainValue: false + }] + } + } }, { label: '名称', @@ -77,32 +123,6 @@ export const Customerdock = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '客户代码', - field: 'customerCode', - sort: 'custom', - table: { - width: 150 - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择客户代码', // 输入框占位文本 - searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '客户基础信息', // 查询弹窗标题 - searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类 - searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法 - searchCondition: [{ - key: 'available', - value: 'TRUE', - action: '==', - isSearch: true, - isMainValue: false - }] - } - } - }, { label: '仓库', field: 'warehouseCode', diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index adee29386..17622bc58 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -61,12 +61,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - form: { - value: '1', - componentProps: { - disabled: true - } - }, + isForm: false, isSearch: true, }, { @@ -89,24 +84,14 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false + },{ + key: 'customerCode', + value: 'customerCode', + isMainValue: false }] } } }, - { - label: '发货计划单号', - field: 'deliverPlanNumber', - sort: 'custom', - table: { - width: 150 - }, - isSearch: true, - form: { - componentProps: { - disabled: true - } - } - }, { label: '客户代码', field: 'customerCode', @@ -121,7 +106,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择客户代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '客户月台信息', // 查询弹窗标题 + searchTitle: '客户信息', // 查询弹窗标题 searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类 searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法 searchCondition: [{ @@ -132,6 +117,20 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ } } }, + { + label: '发货计划单号', + field: 'deliverPlanNumber', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + form: { + componentProps: { + disabled: true + } + } + }, { label: '客户月台代码', field: 'customerDockCode', @@ -147,7 +146,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ searchField: 'code', // 查询弹窗赋值字段 searchTitle: '客户月台信息', // 查询弹窗标题 searchAllSchemas: Customerdock.allSchemas, // 查询弹窗所需类 - searchPage: CustomerdockApi.getCustomerdockPage, // 查询弹窗所需分页方法 + searchPage: CustomerdockApi.pageCustomerCodeToCustomerDockReceiving, // 查询弹窗所需分页方法 searchCondition: [{ key: 'available', value: 'TRUE', diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index ef8e8c45f..735e0d9b5 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -125,6 +125,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => }] } }) + console.log(128, customerCode.value) if (type == 'tableForm') { if(formField == 'packingNumber') { @@ -411,10 +412,8 @@ const handleDelete = async (id: number) => { try { // 删除的二次确认 await message.delConfirm() - tableObject.loading = true // 发起删除 await CustomerreturnRequestMainApi.deleteCustomerreturnRequestMain(id) - tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 await getList() From be49b03c7ab0187c623a5b26911e265b708eb8bc Mon Sep 17 00:00:00 2001 From: chenfang Date: Wed, 24 Jan 2024 16:13:18 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E6=98=BE=E7=A4=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/basicDataManage/customerManage/customeritem/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue index c49dd9b48..d9264f058 100644 --- a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue +++ b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue @@ -183,7 +183,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { const setV = {} if(formField == 'itemCode'){ console.log(val); - setV['cusotmerUom'] = val[0]['uom'] + setV['customerUom'] = val[0]['uom'] } setV[formField] = val[0][searchField] formRef.setValues(setV) From e9b15482b2a407d12ee668a952ab480ee5f52413 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 24 Jan 2024 16:21:58 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E7=89=A9?= =?UTF-8?q?=E5=93=81=E4=B8=8D=E8=83=BD=E9=80=89=E8=99=9A=E6=8B=9F=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierManage/supplieritem/supplieritem.data.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts index 1ba659561..79922c226 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts @@ -68,6 +68,10 @@ export const Supplieritem = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false + },{ + key: 'isPhantom', // 不能是虚拟件 + value: 'FALSE', + isMainValue: false }] } }