From 32014d7fc1219fde4c2b3a9470a6c832e400ad8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E8=83=9C=E6=A5=A0?= <2792649152@qq.com> Date: Thu, 19 Oct 2023 20:00:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BasicForm/src/BasicForm.vue | 50 +++ .../accountcalendar/AccountcalendarForm.vue | 200 ------------ src/views/wms/accountcalendar/index.vue | 9 +- src/views/wms/areabasic/AreaForm.vue | 197 ------------ src/views/wms/areabasic/index.vue | 36 ++- src/views/wms/businesstype/index.vue | 39 ++- src/views/wms/carrier/index.vue | 9 +- src/views/wms/condition/index.vue | 4 +- src/views/wms/configuration/index.vue | 4 +- src/views/wms/configurationsetting/index.vue | 4 +- .../currencyexchange/CurrencyexchangeForm.vue | 162 ---------- src/views/wms/currencyexchange/index.vue | 9 +- src/views/wms/customer/CustomerForm.vue | 261 ---------------- src/views/wms/customer/index.vue | 9 +- .../wms/customerdock/CustomerdockForm.vue | 217 ------------- src/views/wms/customerdock/index.vue | 46 ++- .../wms/customeritem/CustomeritemForm.vue | 238 -------------- src/views/wms/customeritem/index.vue | 38 ++- src/views/wms/dock/DockForm.vue | 224 -------------- src/views/wms/dock/index.vue | 42 ++- src/views/wms/documentsetting/index.vue | 4 +- src/views/wms/jobsetting/index.vue | 4 +- src/views/wms/location/LocationForm.vue | 290 ------------------ src/views/wms/location/index.vue | 48 ++- .../wms/locationgroup/LocationgroupForm.vue | 177 ----------- src/views/wms/locationgroup/index.vue | 42 ++- src/views/wms/owner/index.vue | 9 +- src/views/wms/paramsetting/index.vue | 4 +- src/views/wms/process/ProcessForm.vue | 191 ------------ src/views/wms/process/index.vue | 42 ++- .../wms/productionline/ProductionlineForm.vue | 199 ------------ src/views/wms/productionline/index.vue | 47 ++- src/views/wms/project/ProjectForm.vue | 167 ---------- src/views/wms/project/index.vue | 34 +- .../wms/purchaseprice/PurchasepriceForm.vue | 177 ----------- src/views/wms/purchaseprice/index.vue | 40 ++- 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/SalepriceForm.vue | 177 ----------- src/views/wms/saleprice/index.vue | 38 ++- src/views/wms/shift/index.vue | 9 +- src/views/wms/supplier/SupplierForm.vue | 261 ---------------- src/views/wms/supplier/index.vue | 9 +- .../wms/supplieritem/SupplieritemForm.vue | 268 ---------------- src/views/wms/supplieritem/index.vue | 52 +++- .../wms/systemcalendar/SystemcalendarForm.vue | 168 ---------- src/views/wms/systemcalendar/index.vue | 9 +- src/views/wms/team/index.vue | 9 +- src/views/wms/transactiontype/index.vue | 4 +- src/views/wms/warehouse/WarehouseForm.vue | 173 ----------- src/views/wms/warehouse/index.vue | 12 +- src/views/wms/workshop/WorkshopForm.vue | 173 ----------- src/views/wms/workshop/index.vue | 12 +- src/views/wms/workstation/WorkstationForm.vue | 211 ------------- src/views/wms/workstation/index.vue | 53 +++- 56 files changed, 599 insertions(+), 4324 deletions(-) delete mode 100644 src/views/wms/accountcalendar/AccountcalendarForm.vue delete mode 100644 src/views/wms/areabasic/AreaForm.vue delete mode 100644 src/views/wms/currencyexchange/CurrencyexchangeForm.vue delete mode 100644 src/views/wms/customer/CustomerForm.vue delete mode 100644 src/views/wms/customerdock/CustomerdockForm.vue delete mode 100644 src/views/wms/customeritem/CustomeritemForm.vue delete mode 100644 src/views/wms/dock/DockForm.vue delete mode 100644 src/views/wms/location/LocationForm.vue delete mode 100644 src/views/wms/locationgroup/LocationgroupForm.vue delete mode 100644 src/views/wms/process/ProcessForm.vue delete mode 100644 src/views/wms/productionline/ProductionlineForm.vue delete mode 100644 src/views/wms/project/ProjectForm.vue delete mode 100644 src/views/wms/purchaseprice/PurchasepriceForm.vue delete mode 100644 src/views/wms/saleprice/SalepriceForm.vue delete mode 100644 src/views/wms/supplier/SupplierForm.vue delete mode 100644 src/views/wms/supplieritem/SupplieritemForm.vue delete mode 100644 src/views/wms/systemcalendar/SystemcalendarForm.vue delete mode 100644 src/views/wms/warehouse/WarehouseForm.vue delete mode 100644 src/views/wms/workshop/WorkshopForm.vue delete mode 100644 src/views/wms/workstation/WorkstationForm.vue diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index ea46ca254..297d6f92b 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -34,6 +34,56 @@ + + + + + + + + + +
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - diff --git a/src/views/wms/accountcalendar/index.vue b/src/views/wms/accountcalendar/index.vue index e7deb5594..d28a0259a 100644 --- a/src/views/wms/accountcalendar/index.vue +++ b/src/views/wms/accountcalendar/index.vue @@ -36,12 +36,11 @@ ref="basicFormRef" @success="getList" :rules="AccountcalendarRules" - :formAllSchemas="Accountcalendar.allSchemas" - searchTableTitle="物料基础信息" + :formAllSchemas="Accountcalendar.allSchemas" :searchTableAllSchemas="ItemBasic.allSchemas" - :searchTablePage="ItembasicApi.getItembasicPage" :apiUpdate="AccountcalendarApi.updateAccountcalendar" :apiCreate="AccountcalendarApi.createAccountcalendar" + :isBusiness="false" /> @@ -54,7 +53,6 @@ diff --git a/src/views/wms/areabasic/index.vue b/src/views/wms/areabasic/index.vue index efa824119..5d9b59dc7 100644 --- a/src/views/wms/areabasic/index.vue +++ b/src/views/wms/areabasic/index.vue @@ -36,12 +36,12 @@ ref="basicFormRef" @success="getList" :rules="AreaRules" - :formAllSchemas="Area.allSchemas" - searchTableTitle="物料基础信息" - :searchTableAllSchemas="ItemBasic.allSchemas" - :searchTablePage="ItembasicApi.getItembasicPage" + :formAllSchemas="Area.allSchemas" + :searchTableParams="searchTableParams" :apiUpdate="AreaApi.updateArea" :apiCreate="AreaApi.createArea" + @searchTableSuccess="searchTableSuccess" + :isBusiness="false" /> @@ -54,9 +54,9 @@ diff --git a/src/views/wms/currencyexchange/index.vue b/src/views/wms/currencyexchange/index.vue index 544d3ca9e..60ff47002 100644 --- a/src/views/wms/currencyexchange/index.vue +++ b/src/views/wms/currencyexchange/index.vue @@ -36,12 +36,11 @@ ref="basicFormRef" @success="getList" :rules="CurrencyexchangeRules" - :formAllSchemas="Currencyexchange.allSchemas" - searchTableTitle="物料基础信息" + :formAllSchemas="Currencyexchange.allSchemas" :searchTableAllSchemas="ItemBasic.allSchemas" - :searchTablePage="ItembasicApi.getItembasicPage" :apiUpdate="CurrencyexchangeApi.updateCurrencyexchange" :apiCreate="CurrencyexchangeApi.createCurrencyexchange" + :isBusiness="false" /> @@ -54,7 +53,6 @@ diff --git a/src/views/wms/customer/index.vue b/src/views/wms/customer/index.vue index 0977e1fe2..fe6a67dd1 100644 --- a/src/views/wms/customer/index.vue +++ b/src/views/wms/customer/index.vue @@ -36,12 +36,11 @@ ref="basicFormRef" @success="getList" :rules="CustomerRules" - :formAllSchemas="Customer.allSchemas" - searchTableTitle="物料基础信息" + :formAllSchemas="Customer.allSchemas" :searchTableAllSchemas="ItemBasic.allSchemas" - :searchTablePage="ItembasicApi.getItembasicPage" :apiUpdate="CustomerApi.updateCustomer" :apiCreate="CustomerApi.createCustomer" + :isBusiness="false" /> @@ -54,7 +53,6 @@ diff --git a/src/views/wms/customerdock/index.vue b/src/views/wms/customerdock/index.vue index a36e94a0a..fa3496dce 100644 --- a/src/views/wms/customerdock/index.vue +++ b/src/views/wms/customerdock/index.vue @@ -37,11 +37,11 @@ @success="getList" :rules="CustomerdockRules" :formAllSchemas="Customerdock.allSchemas" - searchTableTitle="物料基础信息" - :searchTableAllSchemas="ItemBasic.allSchemas" - :searchTablePage="ItembasicApi.getItembasicPage" + :searchTableParams="searchTableParams" :apiUpdate="CustomerdockApi.updateCustomerdock" :apiCreate="CustomerdockApi.createCustomerdock" + @searchTableSuccess="searchTableSuccess" + :isBusiness="false" /> @@ -54,9 +54,11 @@ diff --git a/src/views/wms/customeritem/index.vue b/src/views/wms/customeritem/index.vue index 086289924..cc3afe833 100644 --- a/src/views/wms/customeritem/index.vue +++ b/src/views/wms/customeritem/index.vue @@ -37,11 +37,11 @@ @success="getList" :rules="CustomeritemRules" :formAllSchemas="Customeritem.allSchemas" - searchTableTitle="物料基础信息" - :searchTableAllSchemas="ItemBasic.allSchemas" - :searchTablePage="ItembasicApi.getItembasicPage" + :searchTableParams="searchTableParams" :apiUpdate="CustomeritemApi.updateCustomeritem" :apiCreate="CustomeritemApi.createCustomeritem" + @searchTableSuccess="searchTableSuccess" + :isBusiness="false" /> @@ -55,8 +55,9 @@ import download from '@/utils/download' 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 { 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' @@ -67,6 +68,19 @@ defineOptions({ name: 'Customeritem' }) const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 +// 查询列表参数设置 +const searchTableParams = ref([{ + formField: 'customerCode', + searchTableTitle: '客户信息', + searchTableAllSchemas: Customer.allSchemas, + searchTablePage: CustomerApi.getCustomerPage +},{ + formField: 'itemCode', + searchTableTitle: '物料信息', + searchTableAllSchemas: ItemBasic.allSchemas, + searchTablePage: ItembasicApi.getItembasicPage +}]) + const { tableObject, tableMethods } = useTable({ getListApi: CustomeritemApi.getCustomeritemPage // 分页接口 }) @@ -79,8 +93,7 @@ const HeadButttondata = [ defaultButtons.defaultAddBtn({hasPermi:'wms:customeritem:create'}), // 新增 defaultButtons.defaultImportBtn({hasPermi:'wms:customeritem:import'}), // 导入 defaultButtons.defaultExportBtn({hasPermi:'wms:customeritem:export'}), // 导出 - // defaultButtons.defaultFilterBtn(), // 筛选 - defaultButtons.defaultFreshBtn(null), // 刷新 + defaultButtons.defaultFreshBtn(null),//刷新 // { // label: '自定义扩展按钮', // name: 'zdy', @@ -129,6 +142,19 @@ const openForm = (type: string, row?: any) => { basicFormRef.value.open(type, row) } +// 查询页面返回 +const searchTableSuccess = (formField, searchField, val, formRef) => { + console.log(144, formField) + console.log(145, searchField) + console.log(146, val) + console.log(147, formRef) + nextTick(() => { + const setV = {} + setV[formField] = val[0][searchField] + formRef.setValues(setV) + }) +} + /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { diff --git a/src/views/wms/dock/DockForm.vue b/src/views/wms/dock/DockForm.vue deleted file mode 100644 index 156705593..000000000 --- a/src/views/wms/dock/DockForm.vue +++ /dev/null @@ -1,224 +0,0 @@ - - diff --git a/src/views/wms/dock/index.vue b/src/views/wms/dock/index.vue index e2d30e6d7..4f9647426 100644 --- a/src/views/wms/dock/index.vue +++ b/src/views/wms/dock/index.vue @@ -36,12 +36,12 @@ ref="basicFormRef" @success="getList" :rules="DockRules" - :formAllSchemas="Dock.allSchemas" - searchTableTitle="物料基础信息" - :searchTableAllSchemas="ItemBasic.allSchemas" - :searchTablePage="ItembasicApi.getItembasicPage" + :formAllSchemas="Dock.allSchemas" + :searchTableParams="searchTableParams" :apiUpdate="DockApi.updateDock" :apiCreate="DockApi.createDock" + @searchTableSuccess="searchTableSuccess" + :isBusiness="false" /> @@ -54,9 +54,10 @@ diff --git a/src/views/wms/location/index.vue b/src/views/wms/location/index.vue index 9a92ec638..d737a4163 100644 --- a/src/views/wms/location/index.vue +++ b/src/views/wms/location/index.vue @@ -36,12 +36,12 @@ ref="basicFormRef" @success="getList" :rules="LocationRules" - :formAllSchemas="Location.allSchemas" - searchTableTitle="物料基础信息" - :searchTableAllSchemas="ItemBasic.allSchemas" - :searchTablePage="ItembasicApi.getItembasicPage" + :formAllSchemas="Location.allSchemas" + :searchTableParams="searchTableParams" :apiUpdate="LocationApi.updateLocation" :apiCreate="LocationApi.createLocation" + @searchTableSuccess="searchTableSuccess" + :isBusiness="false" /> @@ -54,9 +54,11 @@ diff --git a/src/views/wms/locationgroup/index.vue b/src/views/wms/locationgroup/index.vue index 4021fbdee..7c1ab264f 100644 --- a/src/views/wms/locationgroup/index.vue +++ b/src/views/wms/locationgroup/index.vue @@ -36,12 +36,12 @@ ref="basicFormRef" @success="getList" :rules="LocationgroupRules" - :formAllSchemas="Locationgroup.allSchemas" - searchTableTitle="物料基础信息" - :searchTableAllSchemas="ItemBasic.allSchemas" - :searchTablePage="ItembasicApi.getItembasicPage" + :formAllSchemas="Locationgroup.allSchemas" + :searchTableParams="searchTableParams" :apiUpdate="LocationgroupApi.updateLocationgroup" :apiCreate="LocationgroupApi.createLocationgroup" + @searchTableSuccess="searchTableSuccess" + :isBusiness="false" /> @@ -54,9 +54,10 @@ diff --git a/src/views/wms/process/index.vue b/src/views/wms/process/index.vue index efb331da2..fd607c6a0 100644 --- a/src/views/wms/process/index.vue +++ b/src/views/wms/process/index.vue @@ -36,12 +36,12 @@ ref="basicFormRef" @success="getList" :rules="ProcessRules" - :formAllSchemas="Process.allSchemas" - searchTableTitle="物料基础信息" - :searchTableAllSchemas="ItemBasic.allSchemas" - :searchTablePage="ItembasicApi.getItembasicPage" + :formAllSchemas="Process.allSchemas" + :searchTableParams="searchTableParams" :apiUpdate="ProcessApi.updateProcess" :apiCreate="ProcessApi.createProcess" + @searchTableSuccess="searchTableSuccess" + :isBusiness="false" /> @@ -54,9 +54,10 @@ diff --git a/src/views/wms/productionline/index.vue b/src/views/wms/productionline/index.vue index ff0aab831..183c6d9f0 100644 --- a/src/views/wms/productionline/index.vue +++ b/src/views/wms/productionline/index.vue @@ -36,12 +36,12 @@ ref="basicFormRef" @success="getList" :rules="ProductionlineRules" - :formAllSchemas="Productionline.allSchemas" - searchTableTitle="物料基础信息" - :searchTableAllSchemas="ItemBasic.allSchemas" - :searchTablePage="ItembasicApi.getItembasicPage" + :formAllSchemas="Productionline.allSchemas" + :searchTableParams="searchTableParams" :apiUpdate="ProductionlineApi.updateProductionline" :apiCreate="ProductionlineApi.createProductionline" + @searchTableSuccess="searchTableSuccess" + :isBusiness="false" /> @@ -54,9 +54,10 @@ diff --git a/src/views/wms/project/index.vue b/src/views/wms/project/index.vue index e6c3768c5..8bbdd38c1 100644 --- a/src/views/wms/project/index.vue +++ b/src/views/wms/project/index.vue @@ -37,11 +37,11 @@ @success="getList" :rules="ProjectRules" :formAllSchemas="Project.allSchemas" - searchTableTitle="物料基础信息" - :searchTableAllSchemas="ItemBasic.allSchemas" - :searchTablePage="ItembasicApi.getItembasicPage" + :searchTableParams="searchTableParams" :apiUpdate="ProjectApi.updateProject" :apiCreate="ProjectApi.createProject" + @searchTableSuccess="searchTableSuccess" + :isBusiness="false" /> @@ -54,9 +54,9 @@ diff --git a/src/views/wms/purchaseprice/index.vue b/src/views/wms/purchaseprice/index.vue index 18fd91435..727cf0ec7 100644 --- a/src/views/wms/purchaseprice/index.vue +++ b/src/views/wms/purchaseprice/index.vue @@ -36,12 +36,12 @@ ref="basicFormRef" @success="getList" :rules="PurchasepriceRules" - :formAllSchemas="Purchaseprice.allSchemas" - searchTableTitle="物料基础信息" - :searchTableAllSchemas="ItemBasic.allSchemas" - :searchTablePage="ItembasicApi.getItembasicPage" + :formAllSchemas="Purchaseprice.allSchemas" + :searchTableParams="searchTableParams" :apiUpdate="PurchasepriceApi.updatePurchaseprice" :apiCreate="PurchasepriceApi.createPurchaseprice" + @searchTableSuccess="searchTableSuccess" + :isBusiness="false" /> @@ -55,8 +55,9 @@ import download from '@/utils/download' import * as PurchasepriceApi from '@/api/wms/purchaseprice' import * as ItembasicApi from '@/api/wms/itembasic' +import * as SupplierApi from '@/api/wms/supplier' import BasicForm from '@/components/BasicForm/src/BasicForm.vue' -import { Purchaseprice, PurchasepriceRules, ItemBasic } from '@/utils/disposition/tableColumns' +import { Purchaseprice, PurchasepriceRules, ItemBasic, Supplier } 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' @@ -67,6 +68,19 @@ defineOptions({ name: 'Purchaseprice' }) const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 +// 查询列表参数设置 +const searchTableParams = ref([{ + formField: 'supplierCode', + searchTableTitle: '供应商信息', + searchTableAllSchemas: Supplier.allSchemas, + searchTablePage: SupplierApi.getSupplierPage +},{ + formField: 'itemCode', + searchTableTitle: '物料信息', + searchTableAllSchemas: ItemBasic.allSchemas, + searchTablePage: ItembasicApi.getItembasicPage +}]) + const { tableObject, tableMethods } = useTable({ getListApi: PurchasepriceApi.getPurchasepricePage // 分页接口 }) @@ -79,8 +93,7 @@ const HeadButttondata = [ defaultButtons.defaultAddBtn({hasPermi:'wms:purchaseprice:create'}), // 新增 defaultButtons.defaultImportBtn({hasPermi:'wms:purchaseprice:import'}), // 导入 defaultButtons.defaultExportBtn({hasPermi:'wms:purchaseprice:export'}), // 导出 - // defaultButtons.defaultFilterBtn(), // 筛选 - defaultButtons.defaultFreshBtn(null), // 刷新 + defaultButtons.defaultFreshBtn(null),//刷新 // { // label: '自定义扩展按钮', // name: 'zdy', @@ -129,6 +142,19 @@ const openForm = (type: string, row?: any) => { basicFormRef.value.open(type, row) } +// 查询页面返回 +const searchTableSuccess = (formField, searchField, val, formRef) => { + console.log(144, formField) + console.log(145, searchField) + console.log(146, val) + console.log(147, formRef) + nextTick(() => { + const setV = {} + setV[formField] = val[0][searchField] + formRef.setValues(setV) + }) +} + /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { diff --git a/src/views/wms/recordsetting/index.vue b/src/views/wms/recordsetting/index.vue index d6b61efd5..4301b7f69 100644 --- a/src/views/wms/recordsetting/index.vue +++ b/src/views/wms/recordsetting/index.vue @@ -42,6 +42,7 @@ :searchTablePage="ItembasicApi.getItembasicPage" :apiUpdate="RecordsettingApi.updateRecordsetting" :apiCreate="RecordsettingApi.createRecordsetting" + :isBusiness="false" /> @@ -79,8 +80,7 @@ const HeadButttondata = [ defaultButtons.defaultAddBtn({hasPermi:'wms:recordsetting:create'}), // 新增 defaultButtons.defaultImportBtn({hasPermi:'wms:recordsetting:import'}), // 导入 defaultButtons.defaultExportBtn({hasPermi:'wms:recordsetting:export'}), // 导出 - // defaultButtons.defaultFilterBtn(), // 筛选 - defaultButtons.defaultFreshBtn(null), // 刷新 + defaultButtons.defaultFreshBtn(null),//刷新 // { // label: '自定义扩展按钮', // name: 'zdy', diff --git a/src/views/wms/requestsetting/index.vue b/src/views/wms/requestsetting/index.vue index 9895db6d8..2869d86d9 100644 --- a/src/views/wms/requestsetting/index.vue +++ b/src/views/wms/requestsetting/index.vue @@ -42,6 +42,7 @@ :searchTablePage="ItembasicApi.getItembasicPage" :apiUpdate="RequestsettingApi.updateRequestsetting" :apiCreate="RequestsettingApi.createRequestsetting" + :isBusiness="false" /> @@ -79,8 +80,7 @@ const HeadButttondata = [ defaultButtons.defaultAddBtn({hasPermi:'wms:requestsetting:create'}), // 新增 defaultButtons.defaultImportBtn({hasPermi:'wms:requestsetting:import'}), // 导入 defaultButtons.defaultExportBtn({hasPermi:'wms:requestsetting:export'}), // 导出 - // defaultButtons.defaultFilterBtn(), // 筛选 - defaultButtons.defaultFreshBtn(null), // 刷新 + defaultButtons.defaultFreshBtn(null),//刷新 // { // label: '自定义扩展按钮', // name: 'zdy', diff --git a/src/views/wms/rule/index.vue b/src/views/wms/rule/index.vue index c24a8b580..13ccb7b95 100644 --- a/src/views/wms/rule/index.vue +++ b/src/views/wms/rule/index.vue @@ -42,6 +42,7 @@ :searchTablePage="ItembasicApi.getItembasicPage" :apiUpdate="RuleApi.updateRule" :apiCreate="RuleApi.createRule" + :isBusiness="false" /> @@ -79,8 +80,7 @@ const HeadButttondata = [ defaultButtons.defaultAddBtn({hasPermi:'wms:rule:create'}), // 新增 defaultButtons.defaultImportBtn({hasPermi:'wms:rule:import'}), // 导入 defaultButtons.defaultExportBtn({hasPermi:'wms:rule:export'}), // 导出 - // defaultButtons.defaultFilterBtn(), // 筛选 - defaultButtons.defaultFreshBtn(null), // 刷新 + defaultButtons.defaultFreshBtn(null),//刷新 // { // label: '自定义扩展按钮', // name: 'zdy', diff --git a/src/views/wms/saleprice/SalepriceForm.vue b/src/views/wms/saleprice/SalepriceForm.vue deleted file mode 100644 index ff5afbd77..000000000 --- a/src/views/wms/saleprice/SalepriceForm.vue +++ /dev/null @@ -1,177 +0,0 @@ - - diff --git a/src/views/wms/saleprice/index.vue b/src/views/wms/saleprice/index.vue index bc9d7e5f4..21513bfd1 100644 --- a/src/views/wms/saleprice/index.vue +++ b/src/views/wms/saleprice/index.vue @@ -37,11 +37,11 @@ @success="getList" :rules="SalepriceRules" :formAllSchemas="Saleprice.allSchemas" - searchTableTitle="物料基础信息" - :searchTableAllSchemas="ItemBasic.allSchemas" - :searchTablePage="ItembasicApi.getItembasicPage" + :searchTableParams="searchTableParams" :apiUpdate="SalepriceApi.updateSaleprice" :apiCreate="SalepriceApi.createSaleprice" + @searchTableSuccess="searchTableSuccess" + :isBusiness="false" /> @@ -55,8 +55,9 @@ import download from '@/utils/download' import * as SalepriceApi from '@/api/wms/saleprice' import * as ItembasicApi from '@/api/wms/itembasic' +import * as CustomerApi from '@/api/wms/customer' import BasicForm from '@/components/BasicForm/src/BasicForm.vue' -import { Saleprice, SalepriceRules, ItemBasic } from '@/utils/disposition/tableColumns' +import { Saleprice, SalepriceRules, ItemBasic, Customer } 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' @@ -67,6 +68,19 @@ defineOptions({ name: 'Saleprice' }) const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 +// 查询列表参数设置 +const searchTableParams = ref([{ + formField: 'customerCode', + searchTableTitle: '客户信息', + searchTableAllSchemas: Customer.allSchemas, + searchTablePage: CustomerApi.getCustomerPage +},{ + formField: 'itemCode', + searchTableTitle: '物料信息', + searchTableAllSchemas: ItemBasic.allSchemas, + searchTablePage: ItembasicApi.getItembasicPage +}]) + const { tableObject, tableMethods } = useTable({ getListApi: SalepriceApi.getSalepricePage // 分页接口 }) @@ -79,8 +93,7 @@ const HeadButttondata = [ defaultButtons.defaultAddBtn({hasPermi:'wms:saleprice:create'}), // 新增 defaultButtons.defaultImportBtn({hasPermi:'wms:saleprice:import'}), // 导入 defaultButtons.defaultExportBtn({hasPermi:'wms:saleprice:export'}), // 导出 - // defaultButtons.defaultFilterBtn(), // 筛选 - defaultButtons.defaultFreshBtn(null), // 刷新 + defaultButtons.defaultFreshBtn(null),//刷新 // { // label: '自定义扩展按钮', // name: 'zdy', @@ -129,6 +142,19 @@ const openForm = (type: string, row?: any) => { basicFormRef.value.open(type, row) } +// 查询页面返回 +const searchTableSuccess = (formField, searchField, val, formRef) => { + console.log(144, formField) + console.log(145, searchField) + console.log(146, val) + console.log(147, formRef) + nextTick(() => { + const setV = {} + setV[formField] = val[0][searchField] + formRef.setValues(setV) + }) +} + /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { diff --git a/src/views/wms/shift/index.vue b/src/views/wms/shift/index.vue index 7d9805745..d10ae70af 100644 --- a/src/views/wms/shift/index.vue +++ b/src/views/wms/shift/index.vue @@ -36,12 +36,11 @@ ref="basicFormRef" @success="getList" :rules="ShiftRules" - :formAllSchemas="Shift.allSchemas" - searchTableTitle="物料基础信息" + :formAllSchemas="Shift.allSchemas" :searchTableAllSchemas="ItemBasic.allSchemas" - :searchTablePage="ItembasicApi.getItembasicPage" :apiUpdate="ShiftApi.updateShift" :apiCreate="ShiftApi.createShift" + :isBusiness="false" /> @@ -54,7 +53,6 @@ diff --git a/src/views/wms/supplier/index.vue b/src/views/wms/supplier/index.vue index ff23f7d08..7235d3042 100644 --- a/src/views/wms/supplier/index.vue +++ b/src/views/wms/supplier/index.vue @@ -36,12 +36,11 @@ ref="basicFormRef" @success="getList" :rules="SupplierRules" - :formAllSchemas="Supplier.allSchemas" - searchTableTitle="物料基础信息" + :formAllSchemas="Supplier.allSchemas" :searchTableAllSchemas="ItemBasic.allSchemas" - :searchTablePage="ItembasicApi.getItembasicPage" :apiUpdate="SupplierApi.updateSupplier" :apiCreate="SupplierApi.createSupplier" + :isBusiness="false" /> @@ -54,7 +53,6 @@ diff --git a/src/views/wms/supplieritem/index.vue b/src/views/wms/supplieritem/index.vue index c55bb39b5..a93df5787 100644 --- a/src/views/wms/supplieritem/index.vue +++ b/src/views/wms/supplieritem/index.vue @@ -36,12 +36,12 @@ ref="basicFormRef" @success="getList" :rules="SupplieritemRules" - :formAllSchemas="Supplieritem.allSchemas" - searchTableTitle="物料基础信息" - :searchTableAllSchemas="ItemBasic.allSchemas" - :searchTablePage="ItembasicApi.getItembasicPage" + :formAllSchemas="Supplieritem.allSchemas" + :searchTableParams="searchTableParams" :apiUpdate="SupplieritemApi.updateSupplieritem" :apiCreate="SupplieritemApi.createSupplieritem" + @searchTableSuccess="searchTableSuccess" + :isBusiness="false" /> @@ -55,8 +55,11 @@ import download from '@/utils/download' import * as SupplieritemApi from '@/api/wms/supplieritem' import * as ItembasicApi from '@/api/wms/itembasic' +import * as SupplierApi from '@/api/wms/supplier' +import * as LocationApi from '@/api/wms/location' +import * as WarehouseApi from '@/api/wms/warehouse' import BasicForm from '@/components/BasicForm/src/BasicForm.vue' -import { Supplieritem, SupplieritemRules, ItemBasic } from '@/utils/disposition/tableColumns' +import { Supplieritem, SupplieritemRules, ItemBasic, Supplier, Warehouse ,Location} 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' @@ -67,6 +70,29 @@ defineOptions({ name: 'Supplieritem' }) const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 +// 查询列表参数设置 +const searchTableParams = ref([{ + formField: 'supplierCode', + searchTableTitle: '供应商信息', + searchTableAllSchemas: Supplier.allSchemas, + searchTablePage: SupplierApi.getSupplierPage +},{ + formField: 'itemCode', + searchTableTitle: '物料信息', + searchTableAllSchemas: ItemBasic.allSchemas, + searchTablePage: ItembasicApi.getItembasicPage +},{ + formField: 'defaultWarehouseCode', + searchTableTitle: '仓库信息', + searchTableAllSchemas: Warehouse.allSchemas, + searchTablePage: WarehouseApi.getWarehousePage +},{ + formField: 'defaultLocationCode', + searchTableTitle: '库位信息', + searchTableAllSchemas: Location.allSchemas, + searchTablePage: LocationApi.getLocationPage +}]) + const { tableObject, tableMethods } = useTable({ getListApi: SupplieritemApi.getSupplieritemPage // 分页接口 }) @@ -79,8 +105,7 @@ const HeadButttondata = [ defaultButtons.defaultAddBtn({hasPermi:'wms:supplieritem:create'}), // 新增 defaultButtons.defaultImportBtn({hasPermi:'wms:supplieritem:import'}), // 导入 defaultButtons.defaultExportBtn({hasPermi:'wms:supplieritem:export'}), // 导出 - // defaultButtons.defaultFilterBtn(), // 筛选 - defaultButtons.defaultFreshBtn(null), // 刷新 + defaultButtons.defaultFreshBtn(null),//刷新 // { // label: '自定义扩展按钮', // name: 'zdy', @@ -129,6 +154,19 @@ const openForm = (type: string, row?: any) => { basicFormRef.value.open(type, row) } +// 查询页面返回 +const searchTableSuccess = (formField, searchField, val, formRef) => { + console.log(144, formField) + console.log(145, searchField) + console.log(146, val) + console.log(147, formRef) + nextTick(() => { + const setV = {} + setV[formField] = val[0][searchField] + formRef.setValues(setV) + }) +} + /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { diff --git a/src/views/wms/systemcalendar/SystemcalendarForm.vue b/src/views/wms/systemcalendar/SystemcalendarForm.vue deleted file mode 100644 index e85bb40e2..000000000 --- a/src/views/wms/systemcalendar/SystemcalendarForm.vue +++ /dev/null @@ -1,168 +0,0 @@ - - diff --git a/src/views/wms/systemcalendar/index.vue b/src/views/wms/systemcalendar/index.vue index 7f977f8dd..93640f4af 100644 --- a/src/views/wms/systemcalendar/index.vue +++ b/src/views/wms/systemcalendar/index.vue @@ -36,12 +36,11 @@ ref="basicFormRef" @success="getList" :rules="SystemcalendarRules" - :formAllSchemas="Systemcalendar.allSchemas" - searchTableTitle="物料基础信息" + :formAllSchemas="Systemcalendar.allSchemas" :searchTableAllSchemas="ItemBasic.allSchemas" - :searchTablePage="ItembasicApi.getItembasicPage" :apiUpdate="SystemcalendarApi.updateSystemcalendar" :apiCreate="SystemcalendarApi.createSystemcalendar" + :isBusiness="false" /> @@ -54,7 +53,6 @@ diff --git a/src/views/wms/warehouse/index.vue b/src/views/wms/warehouse/index.vue index 5bdd6ac25..5d26791a1 100644 --- a/src/views/wms/warehouse/index.vue +++ b/src/views/wms/warehouse/index.vue @@ -36,12 +36,10 @@ ref="basicFormRef" @success="getList" :rules="WarehouseRules" - :formAllSchemas="Warehouse.allSchemas" - searchTableTitle="物料基础信息" - :searchTableAllSchemas="ItemBasic.allSchemas" - :searchTablePage="ItembasicApi.getItembasicPage" + :formAllSchemas="Warehouse.allSchemas" :apiUpdate="WarehouseApi.updateWarehouse" :apiCreate="WarehouseApi.createWarehouse" + :isBusiness="false" /> @@ -54,9 +52,8 @@ diff --git a/src/views/wms/workshop/index.vue b/src/views/wms/workshop/index.vue index e7f8c8263..ee8999633 100644 --- a/src/views/wms/workshop/index.vue +++ b/src/views/wms/workshop/index.vue @@ -36,12 +36,10 @@ ref="basicFormRef" @success="getList" :rules="WorkshopRules" - :formAllSchemas="Workshop.allSchemas" - searchTableTitle="物料基础信息" - :searchTableAllSchemas="ItemBasic.allSchemas" - :searchTablePage="ItembasicApi.getItembasicPage" + :formAllSchemas="Workshop.allSchemas" :apiUpdate="WorkshopApi.updateWorkshop" :apiCreate="WorkshopApi.createWorkshop" + :isBusiness="false" /> @@ -54,9 +52,8 @@ diff --git a/src/views/wms/workstation/index.vue b/src/views/wms/workstation/index.vue index 5551a5fee..770b5ede8 100644 --- a/src/views/wms/workstation/index.vue +++ b/src/views/wms/workstation/index.vue @@ -36,12 +36,12 @@ ref="basicFormRef" @success="getList" :rules="WorkstationRules" - :formAllSchemas="Workstation.allSchemas" - searchTableTitle="物料基础信息" - :searchTableAllSchemas="ItemBasic.allSchemas" - :searchTablePage="ItembasicApi.getItembasicPage" + :formAllSchemas="Workstation.allSchemas" + :searchTableParams="searchTableParams" :apiUpdate="WorkstationApi.updateWorkstation" :apiCreate="WorkstationApi.createWorkstation" + @searchTableSuccess="searchTableSuccess" + :isBusiness="false" /> @@ -54,9 +54,11 @@