From b81a02c0e0b680950bb2f0e2be4e019fa98c9218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Mon, 23 Oct 2023 14:50:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=8F=98=E9=87=8F=E5=90=8D=E7=A7=B0=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/disposition/tableColumns.ts | 8 +++-- src/views/wms/accountcalendar/index.vue | 4 +-- src/views/wms/bom/index.vue | 6 ++-- src/views/wms/carrier/index.vue | 4 +-- src/views/wms/condition/index.vue | 4 +-- src/views/wms/configuration/index.vue | 4 +-- src/views/wms/configurationsetting/index.vue | 4 +-- src/views/wms/currencyexchange/index.vue | 4 +-- src/views/wms/customer/index.vue | 4 +-- src/views/wms/customeritem/index.vue | 4 +-- src/views/wms/documentsetting/index.vue | 4 +-- src/views/wms/itembasic/index.vue | 32 +++++++++++++++---- src/views/wms/itempackaging/index.vue | 15 ++++++--- src/views/wms/jobsetting/index.vue | 4 +-- src/views/wms/owner/index.vue | 4 +-- src/views/wms/paramsetting/index.vue | 4 +-- src/views/wms/productionlineitem/index.vue | 4 +-- .../wms/purchaseclaimRequestMain/index.vue | 7 ++-- src/views/wms/purchaseprice/index.vue | 4 +-- src/views/wms/recordsetting/index.vue | 4 +-- src/views/wms/requestsetting/index.vue | 4 +-- src/views/wms/rule/index.vue | 4 +-- src/views/wms/saleprice/index.vue | 4 +-- src/views/wms/shift/index.vue | 4 +-- src/views/wms/stdcostprice/index.vue | 4 +-- src/views/wms/supplier/index.vue | 4 +-- src/views/wms/supplieritem/index.vue | 4 +-- src/views/wms/systemcalendar/index.vue | 4 +-- src/views/wms/team/index.vue | 4 +-- src/views/wms/transactiontype/index.vue | 4 +-- 30 files changed, 96 insertions(+), 72 deletions(-) diff --git a/src/utils/disposition/tableColumns.ts b/src/utils/disposition/tableColumns.ts index bba5f1f06..8a2681191 100644 --- a/src/utils/disposition/tableColumns.ts +++ b/src/utils/disposition/tableColumns.ts @@ -3,7 +3,7 @@ import { dateFormatter } from '@/utils/formatTime' /** * @returns {Array} 基础物料信息 */ -export const ItemBasic = useCrudSchemas(reactive([ +export const Itembasic = useCrudSchemas(reactive([ { label: '代码', field: 'code', @@ -395,7 +395,7 @@ export const ItemBasic = useCrudSchemas(reactive([ ])) // 表单校验 -export const ItemBasicRules = reactive({ +export const ItembasicRules = reactive({ code: [ { required: true, message: '请输入代码', trigger: 'blur' } ], @@ -10654,6 +10654,10 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive([ } ])) +// 表单校验 +export const PurchaseclaimRequestMainRules = reactive({ +}) + /** * @returns {Array} 采购索赔申请子表 */ diff --git a/src/views/wms/accountcalendar/index.vue b/src/views/wms/accountcalendar/index.vue index cbb6553e0..b930a661b 100644 --- a/src/views/wms/accountcalendar/index.vue +++ b/src/views/wms/accountcalendar/index.vue @@ -37,7 +37,7 @@ @success="getList" :rules="AccountcalendarRules" :formAllSchemas="Accountcalendar.allSchemas" - :searchTableAllSchemas="ItemBasic.allSchemas" + :searchTableAllSchemas="Itembasic.allSchemas" :apiUpdate="AccountcalendarApi.updateAccountcalendar" :apiCreate="AccountcalendarApi.createAccountcalendar" :isBusiness="false" @@ -54,7 +54,7 @@ import download from '@/utils/download' import * as AccountcalendarApi from '@/api/wms/accountcalendar' import BasicForm from '@/components/BasicForm/src/BasicForm.vue' -import { Accountcalendar, AccountcalendarRules, ItemBasic } from '@/utils/disposition/tableColumns' +import { Accountcalendar, AccountcalendarRules, Itembasic } from '@/utils/disposition/tableColumns' import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' diff --git a/src/views/wms/bom/index.vue b/src/views/wms/bom/index.vue index 9360b2bd3..88983bc4a 100644 --- a/src/views/wms/bom/index.vue +++ b/src/views/wms/bom/index.vue @@ -62,7 +62,7 @@ import download from '@/utils/download' import * as BomApi from '@/api/wms/bom' import * as ItembasicApi from '@/api/wms/itembasic' import BasicForm from '@/components/BasicForm/src/BasicForm.vue' -import { Bom, BomRules, ItemBasic } from '@/utils/disposition/tableColumns' +import { Bom, BomRules, Itembasic } from '@/utils/disposition/tableColumns' import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' @@ -77,12 +77,12 @@ const { t } = useI18n() // 国际化 const searchTableParams = ref([{ formField: 'productItemCode', searchTableTitle: '物料信息', - searchTableAllSchemas: ItemBasic.allSchemas, + searchTableAllSchemas: Itembasic.allSchemas, searchTablePage: ItembasicApi.getItembasicPage },{ formField: 'componentItemCode', searchTableTitle: '物料信息', - searchTableAllSchemas: ItemBasic.allSchemas, + searchTableAllSchemas: Itembasic.allSchemas, searchTablePage: ItembasicApi.getItembasicPage }]) diff --git a/src/views/wms/carrier/index.vue b/src/views/wms/carrier/index.vue index cc2ea6a93..3fb600eab 100644 --- a/src/views/wms/carrier/index.vue +++ b/src/views/wms/carrier/index.vue @@ -37,7 +37,7 @@ @success="getList" :rules="CarrierRules" :formAllSchemas="Carrier.allSchemas" - :searchTableAllSchemas="ItemBasic.allSchemas" + :searchTableAllSchemas="Itembasic.allSchemas" :apiUpdate="CarrierApi.updateCarrier" :apiCreate="CarrierApi.createCarrier" :isBusiness="false" @@ -54,7 +54,7 @@ import download from '@/utils/download' import * as CarrierApi from '@/api/wms/carrier' import BasicForm from '@/components/BasicForm/src/BasicForm.vue' -import { Carrier, CarrierRules, ItemBasic } from '@/utils/disposition/tableColumns' +import { Carrier, CarrierRules, Itembasic } from '@/utils/disposition/tableColumns' import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' diff --git a/src/views/wms/condition/index.vue b/src/views/wms/condition/index.vue index 13c305f73..7db886fff 100644 --- a/src/views/wms/condition/index.vue +++ b/src/views/wms/condition/index.vue @@ -38,7 +38,7 @@ :rules="ConditionRules" :formAllSchemas="Condition.allSchemas" searchTableTitle="物料基础信息" - :searchTableAllSchemas="ItemBasic.allSchemas" + :searchTableAllSchemas="Itembasic.allSchemas" :searchTablePage="ItembasicApi.getItembasicPage" :apiUpdate="ConditionApi.updateCondition" :apiCreate="ConditionApi.createCondition" @@ -57,7 +57,7 @@ import download from '@/utils/download' import * as ConditionApi from '@/api/wms/condition' import * as ItembasicApi from '@/api/wms/itembasic' import BasicForm from '@/components/BasicForm/src/BasicForm.vue' -import { Condition, ConditionRules, ItemBasic } from '@/utils/disposition/tableColumns' +import { Condition, ConditionRules, Itembasic } from '@/utils/disposition/tableColumns' import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' diff --git a/src/views/wms/configuration/index.vue b/src/views/wms/configuration/index.vue index a7bc37f23..96b0d20ef 100644 --- a/src/views/wms/configuration/index.vue +++ b/src/views/wms/configuration/index.vue @@ -38,7 +38,7 @@ :rules="ConfigurationRules" :formAllSchemas="Configuration.allSchemas" searchTableTitle="物料基础信息" - :searchTableAllSchemas="ItemBasic.allSchemas" + :searchTableAllSchemas="Itembasic.allSchemas" :searchTablePage="ItembasicApi.getItembasicPage" :apiUpdate="ConfigurationApi.updateConfiguration" :apiCreate="ConfigurationApi.createConfiguration" @@ -57,7 +57,7 @@ import download from '@/utils/download' import * as ConfigurationApi from '@/api/wms/configuration' import * as ItembasicApi from '@/api/wms/itembasic' import BasicForm from '@/components/BasicForm/src/BasicForm.vue' -import { Configuration, ConfigurationRules, ItemBasic } from '@/utils/disposition/tableColumns' +import { Configuration, ConfigurationRules, Itembasic } from '@/utils/disposition/tableColumns' import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' diff --git a/src/views/wms/configurationsetting/index.vue b/src/views/wms/configurationsetting/index.vue index b5fe5fbea..e7d7bd301 100644 --- a/src/views/wms/configurationsetting/index.vue +++ b/src/views/wms/configurationsetting/index.vue @@ -38,7 +38,7 @@ :rules="ConfigurationsettingRules" :formAllSchemas="Configurationsetting.allSchemas" searchTableTitle="物料基础信息" - :searchTableAllSchemas="ItemBasic.allSchemas" + :searchTableAllSchemas="Itembasic.allSchemas" :searchTablePage="ItembasicApi.getItembasicPage" :apiUpdate="ConfigurationsettingApi.updateConfigurationsetting" :apiCreate="ConfigurationsettingApi.createConfigurationsetting" @@ -57,7 +57,7 @@ import download from '@/utils/download' import * as ConfigurationsettingApi from '@/api/wms/configurationsetting' import * as ItembasicApi from '@/api/wms/itembasic' import BasicForm from '@/components/BasicForm/src/BasicForm.vue' -import { Configurationsetting, ConfigurationsettingRules, ItemBasic } from '@/utils/disposition/tableColumns' +import { Configurationsetting, ConfigurationsettingRules, Itembasic } from '@/utils/disposition/tableColumns' import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' diff --git a/src/views/wms/currencyexchange/index.vue b/src/views/wms/currencyexchange/index.vue index ef1b287e7..b9f980acd 100644 --- a/src/views/wms/currencyexchange/index.vue +++ b/src/views/wms/currencyexchange/index.vue @@ -37,7 +37,7 @@ @success="getList" :rules="CurrencyexchangeRules" :formAllSchemas="Currencyexchange.allSchemas" - :searchTableAllSchemas="ItemBasic.allSchemas" + :searchTableAllSchemas="Itembasic.allSchemas" :apiUpdate="CurrencyexchangeApi.updateCurrencyexchange" :apiCreate="CurrencyexchangeApi.createCurrencyexchange" :isBusiness="false" @@ -54,7 +54,7 @@ import download from '@/utils/download' import * as CurrencyexchangeApi from '@/api/wms/currencyexchange' import BasicForm from '@/components/BasicForm/src/BasicForm.vue' -import { Currencyexchange, CurrencyexchangeRules, ItemBasic } from '@/utils/disposition/tableColumns' +import { Currencyexchange, CurrencyexchangeRules, Itembasic } from '@/utils/disposition/tableColumns' import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' diff --git a/src/views/wms/customer/index.vue b/src/views/wms/customer/index.vue index ab9d10c60..91e04bd64 100644 --- a/src/views/wms/customer/index.vue +++ b/src/views/wms/customer/index.vue @@ -37,7 +37,7 @@ @success="getList" :rules="CustomerRules" :formAllSchemas="Customer.allSchemas" - :searchTableAllSchemas="ItemBasic.allSchemas" + :searchTableAllSchemas="Itembasic.allSchemas" :apiUpdate="CustomerApi.updateCustomer" :apiCreate="CustomerApi.createCustomer" :isBusiness="false" @@ -54,7 +54,7 @@ import download from '@/utils/download' import * as CustomerApi from '@/api/wms/customer' import BasicForm from '@/components/BasicForm/src/BasicForm.vue' -import { Customer, CustomerRules, ItemBasic } from '@/utils/disposition/tableColumns' +import { Customer, CustomerRules, Itembasic } from '@/utils/disposition/tableColumns' import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' diff --git a/src/views/wms/customeritem/index.vue b/src/views/wms/customeritem/index.vue index 339c72752..f2567fd95 100644 --- a/src/views/wms/customeritem/index.vue +++ b/src/views/wms/customeritem/index.vue @@ -57,7 +57,7 @@ import * as CustomeritemApi from '@/api/wms/customeritem' import * as ItembasicApi from '@/api/wms/itembasic' import * as CustomerApi from '@/api/wms/customer' import BasicForm from '@/components/BasicForm/src/BasicForm.vue' -import { Customer, Customeritem, CustomeritemRules, ItemBasic } from '@/utils/disposition/tableColumns' +import { Customer, Customeritem, CustomeritemRules, Itembasic } from '@/utils/disposition/tableColumns' import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' @@ -77,7 +77,7 @@ const searchTableParams = ref([{ },{ formField: 'itemCode', searchTableTitle: '物料信息', - searchTableAllSchemas: ItemBasic.allSchemas, + searchTableAllSchemas: Itembasic.allSchemas, searchTablePage: ItembasicApi.getItembasicPage }]) diff --git a/src/views/wms/documentsetting/index.vue b/src/views/wms/documentsetting/index.vue index 9bdddd6d1..e348c1eb6 100644 --- a/src/views/wms/documentsetting/index.vue +++ b/src/views/wms/documentsetting/index.vue @@ -38,7 +38,7 @@ :rules="DocumentsettingRules" :formAllSchemas="Documentsetting.allSchemas" searchTableTitle="物料基础信息" - :searchTableAllSchemas="ItemBasic.allSchemas" + :searchTableAllSchemas="Itembasic.allSchemas" :searchTablePage="ItembasicApi.getItembasicPage" :apiUpdate="DocumentsettingApi.updateDocumentsetting" :apiCreate="DocumentsettingApi.createDocumentsetting" @@ -57,7 +57,7 @@ import download from '@/utils/download' import * as DocumentsettingApi from '@/api/wms/documentsetting' import * as ItembasicApi from '@/api/wms/itembasic' import BasicForm from '@/components/BasicForm/src/BasicForm.vue' -import { Documentsetting, DocumentsettingRules, ItemBasic } from '@/utils/disposition/tableColumns' +import { Documentsetting, DocumentsettingRules, Itembasic } from '@/utils/disposition/tableColumns' import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' diff --git a/src/views/wms/itembasic/index.vue b/src/views/wms/itembasic/index.vue index 883bc727d..20b2432ae 100644 --- a/src/views/wms/itembasic/index.vue +++ b/src/views/wms/itembasic/index.vue @@ -1,15 +1,21 @@