From de517ec827dc90f87ddda9256b1203d5ae56d395 Mon Sep 17 00:00:00 2001 From: chenfang Date: Tue, 9 Jan 2024 16:06:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BB=A3=E7=A0=81=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=A1=86=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverRequestMain.data.ts | 17 ++++++++++++++++- .../deliver/deliverRequestMain/index.vue | 8 +++++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index f2b27ff8a..b4e69a645 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -11,6 +11,9 @@ import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/item import * as CustomerdockApi from '@/api/wms/customerdock' import { Customerdock } from '@/views/wms/basicDataManage/customerManage/customerdock/customerdock.data' +import * as CustomerApi from '@/api/wms/customer' +import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/customer.data' + import * as CarrierApi from '@/api/wms/carrier' import { Carrier } from '@/views/wms/basicDataManage/orderManage/carrier/carrier.data' @@ -110,8 +113,20 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ }, isSearch: true, form: { + // labelMessage: '信息提示说明!!!', componentProps: { - disabled: true + disabled: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择客户代码', // 输入框占位文本 + searchField: 'number', // 查询弹窗赋值字段 + searchTitle: '客户信息', // 查询弹窗标题 + searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类 + searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] } } }, diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index 06d3fb374..af3d92f42 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -100,7 +100,7 @@ const tableColumns = ref(DeliverRequestMain.allSchemas.tableColumns) const isShowButton = ref(true) //定义 展示子表数据时是否显示新增/修改/删除按钮 -const trueFalse = ref() +const trueFalse = ref(true) // 字段设置 更新主列表字段 const updataTableColumns = (val) => { @@ -298,6 +298,8 @@ const formRef = ref() const openForm =async (type: string, row?: number) => { if(type == "update"){ DeliverRequestMain.allSchemas.formSchema.forEach((item) => { + console.log(95132,item); + if (item.field == 'deliverPlanNumber') { item.componentProps.isSearchList = false, item.componentProps.disabled = true @@ -374,7 +376,7 @@ const handleDeleteTable = (item, index) => { } //为true表示子表数据中存在数量为0的数据 -const flag = ref() +const flag = ref(false) // 主子数据 提交 const submitForm = async (formType, data) => { @@ -386,7 +388,7 @@ const submitForm = async (formType, data) => { return; } }) - if(flag){ + if(flag.value){ return } try {