From 8450544f6d5024539d2d514313653985cca6d455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Tue, 14 Nov 2023 15:05:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=20?= =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchaseMain/purchaseMain.data.ts | 16 +---- .../purchasePlanMain/purchasePlanMain.data.ts | 62 +++++++++++-------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts index c037aa07d..acabf9312 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts @@ -581,13 +581,7 @@ export const PurchaseDetail = useCrudSchemas(reactive([ key:'supplierCode', value:'supplierCode', isMainValue: true - }//, //条件，例：isMainValue: true,表示查询条件是主表的字段的值 itemCode：查询列表中字段 supplierCode：指主表某字段 - // { - // key:'available', - // value:'TRUE', - // isMainValue: false - // } - ] // 条件，例：isMainValue: false,表示查询条件不是主表的字段的值 available：查询列表中字段 TRUE：指查询具体值 + }] }, form: { // labelMessage: '信息提示说明！！！', @@ -602,13 +596,7 @@ export const PurchaseDetail = useCrudSchemas(reactive([ key:'supplierCode', value:'supplierCode', isMainValue: true - }//, //条件，例：isMainValue: true,表示查询条件是主表的字段的值 itemCode：查询列表中字段 supplierCode：指主表某字段 - // { - // key:'available', - // value:'TRUE', - // isMainValue: false - // } - ] // 条件，例：isMainValue: false,表示查询条件不是主表的字段的值 available：查询列表中字段 TRUE：指查询具体值 + }] } } }, diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index 6b3334899..e6e26b3f0 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -2,8 +2,8 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' import * as SupplierApi from '@/api/wms/supplier' import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data' -import * as ItembasicApi from '@/api/wms/itembasic' -import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' +import * as SupplieritemApi from '@/api/wms/supplieritem' +import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data' import * as PurchaseMainApi from '@/api/wms/purchaseMain' import * as PurchaseDetailApi from '@/api/wms/purchaseDetail' import { PurchaseDetail, PurchaseMain } from '../purchaseMain/purchaseMain.data' @@ -33,7 +33,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive([ }, isSearch: true, form: { - // labelMessage: '信息提示说明！！！', + labelMessage: '影响明细中物品代码，需在供应商物品中维护', componentProps: { isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 @@ -78,6 +78,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, form: { value: 'PurchaseReceipt', componentProps: { @@ -314,7 +315,12 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ searchField: 'lineNumber', searchTitle: '采购订单信息', searchAllSchemas: PurchaseDetail.allSchemas, - searchPage: PurchaseDetailApi.getPurchaseDetailPage + searchPage: PurchaseDetailApi.getPurchaseDetailPage, + searchCondition: [{ + key:'number', + value:'poNumber', + isMainValue: true + }] }, form: { // labelMessage: '信息提示说明！！！', @@ -324,7 +330,12 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ searchField: 'lineNumber', searchTitle: '采购订单信息', searchAllSchemas: PurchaseDetail.allSchemas, - searchPage: PurchaseDetailApi.getPurchaseDetailPage + searchPage: PurchaseDetailApi.getPurchaseDetailPage, + searchCondition: [{ + key:'lineNumber', + value:'poNumber', + isMainValue: true + }] } } }, @@ -353,20 +364,30 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ // labelMessage: '信息提示说明！！！', componentProps: { isSearchList: true, - searchListPlaceholder: '请选择物品代码', + searchListPlaceholder: '请选择供应商物品', searchField: 'code', - searchTitle: '物品基础信息', - searchAllSchemas: Itembasic.allSchemas, - searchPage: ItembasicApi.getItembasicPage + searchTitle: '供应商物品信息', + searchAllSchemas: Supplieritem.allSchemas, + searchPage: SupplieritemApi.getSupplieritemPage, + searchCondition: [{ + key:'supplierCode', + value:'supplierCode', + isMainValue: true + }] } }, tableForm: { isInpuFocusShow: true, - searchListPlaceholder: '请选择物品代码', + searchListPlaceholder: '请选择供应商物品', searchField: 'code', - searchTitle: '物品基础信息', - searchAllSchemas: Itembasic.allSchemas, - searchPage: ItembasicApi.getItembasicPage + searchTitle: '供应商物品信息', + searchAllSchemas: Supplieritem.allSchemas, + searchPage: SupplieritemApi.getSupplieritemPage, + searchCondition: [{ + key:'supplierCode', + value:'supplierCode', + isMainValue: true + }] } }, { @@ -409,13 +430,6 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ table: { width: 150 }, - tableForm: { - component: 'InputNumber', - componentProps: { - min: 1, - precision: 6 - } - }, isTableForm: false, isForm: false }, @@ -427,11 +441,9 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ width: 150 }, tableForm: { - component: 'InputNumber', - componentProps: { - min: 1, - precision: 6 - } + type: 'InputNumber', + min: 1, + precision: 6 }, }, {